From 1319a525abdecff80cc812ec95aabf916dee42c6 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Thu, 11 Apr 2024 12:06:21 -0500 Subject: [PATCH] Update to 2.44.1 Resolves: RHEL-32578 Resolves: RHEL-29637 --- .gitignore | 2 ++ i686-build.patch | 16 ---------------- sources | 4 ++-- webkit2gtk3.spec | 16 +++++++++------- 4 files changed, 13 insertions(+), 25 deletions(-) delete mode 100644 i686-build.patch diff --git a/.gitignore b/.gitignore index 6ed5931..f88e5d2 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,5 @@ /webkitgtk-2.42.4.tar.xz /webkitgtk-2.42.5.tar.xz /webkitgtk-2.42.5.tar.xz.asc +/webkitgtk-2.44.1.tar.xz +/webkitgtk-2.44.1.tar.xz.asc diff --git a/i686-build.patch b/i686-build.patch deleted file mode 100644 index 1b5ec0d..0000000 --- a/i686-build.patch +++ /dev/null @@ -1,16 +0,0 @@ -From: Alberto Garcia -Subject: Fix FTBFS in i386 -Bug: https://bugs.webkit.org/show_bug.cgi?id=268739 -Index: webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -=================================================================== ---- webkitgtk.orig/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -+++ webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpc - UNUSED_VARIABLE(t2); - UNUSED_VARIABLE(t3); - UNUSED_VARIABLE(t5); -- UNUSED_VARIABLE(t6); -- UNUSED_VARIABLE(t7); - - struct StackPointerScope { - StackPointerScope(CLoopStack& stack) diff --git a/sources b/sources index 5daca3a..f6daeb0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (webkitgtk-2.42.5.tar.xz) = 9b992b1156a87b503deec4640ee9383227c7341910f1b33b7cba03d32194b36aa61de6ae3e8a58c23adcab74e71b78d1c8d4124f32bffc4dd58d93931fb94ef0 -SHA512 (webkitgtk-2.42.5.tar.xz.asc) = 9de7c3f7c75319e7d9a37cdf4929e392adb770a65acfdbb48e4288af66e1f6ef7372379e0d08f952b9a184a324e27e73fd64c5b7635aeef785cc3c8bdf4775a7 +SHA512 (webkitgtk-2.44.1.tar.xz) = b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169 +SHA512 (webkitgtk-2.44.1.tar.xz.asc) = 2d2ab4a903ff3e8eeb128b2e7a182d073fc12e14d4b8f2668aaafc638f194e2fa3cf707c040f679f320636c1398dd11df2b6e2941dd3580b8032ea30b604c711 diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 86ed8b5..70ba597 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -11,7 +11,7 @@ %endif Name: webkit2gtk3 -Version: 2.42.5 +Version: 2.44.1 Release: 1%{?dist} Summary: GTK Web content engine library @@ -24,9 +24,6 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc # $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg Source2: webkitgtk-keys.gpg -# https://bugs.webkit.org/show_bug.cgi?id=268739 -Patch: i686-build.patch - BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake @@ -40,6 +37,7 @@ BuildRequires: hyphen-devel BuildRequires: libatomic BuildRequires: ninja-build BuildRequires: openssl-devel +BuildRequires: perl(bigint) BuildRequires: perl(English) BuildRequires: perl(FindBin) BuildRequires: perl(JSON::PP) @@ -71,7 +69,6 @@ BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libgcrypt) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libseccomp) @@ -91,8 +88,6 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(wpe-1.0) -BuildRequires: pkgconfig(wpebackend-fdo-1.0) BuildRequires: pkgconfig(xt) # These are hard requirements of WebKit's bubblewrap sandbox. @@ -215,11 +210,13 @@ rm -rf Source/ThirdParty/qunit/ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_JIT=OFF \ + -DUSE_GTK4=OFF \ -DUSE_SOUP2=ON \ -DUSE_AVIF=OFF \ -DENABLE_DOCUMENTATION=OFF \ -DUSE_GSTREAMER_TRANSCODER=OFF \ -DUSE_JPEGXL=OFF \ + -DUSE_LIBBACKTRACE=OFF \ %if !0%{?with_gamepad} -DENABLE_GAMEPAD=OFF \ %endif @@ -297,6 +294,11 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir %changelog +* Thu Apr 11 2024 Michael Catanzaro - 2.44.1-1 +- Update to 2.44.1 + Resolves: RHEL-32578 + Resolves: RHEL-29637 + * Mon Feb 05 2024 Michael Catanzaro - 2.42.5-1 - Update to 2.42.5 Resolves: RHEL-3960