diff --git a/.gitignore b/.gitignore index 65e46c7..86703c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/webkitgtk-2.42.5.tar.xz +SOURCES/webkitgtk-2.44.3.tar.xz SOURCES/webkitgtk-keys.gpg diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index 69b99c4..6be6046 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1,2 +1,2 @@ -c3ffb2beaac56f1089029f2254482f48d9e3db37 SOURCES/webkitgtk-2.42.5.tar.xz -cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg +c9bcb2097d8f774b2c64ca650a4f8a6365ff54f6 SOURCES/webkitgtk-2.44.3.tar.xz +04b10b8a486542c4551269c20b18b5c1c6cb4f94 SOURCES/webkitgtk-keys.gpg diff --git a/SOURCES/fix-wasm.patch b/SOURCES/fix-wasm.patch new file mode 100644 index 0000000..386ea63 --- /dev/null +++ b/SOURCES/fix-wasm.patch @@ -0,0 +1,48 @@ +From 9140ce712aa87091613874d802787ab476be0e39 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Wed, 14 Aug 2024 14:58:05 -0500 +Subject: [PATCH] Revert "Cherry-pick 272448.770@safari-7618-branch + (6d311cd7fefc). https://bugs.webkit.org/show_bug.cgi?id=271175" + https://bugs.webkit.org/show_bug.cgi?id=278113 + +This reverts commit 279c9d7963182cc35cf4e0bfebe87df2d83eaef8. + +This broke wasm, and I don't know how to fix it. + +Canonical link: https://commits.webkit.org/274313.373@webkitglib/2.44 +--- + .../stress/many-calls-results-on-stack.js | 39 ------------------- + Source/JavaScriptCore/wasm/WasmBBQJIT.cpp | 19 --------- + 2 files changed, 58 deletions(-) + delete mode 100644 JSTests/wasm/stress/many-calls-results-on-stack.js + +diff --git a/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp b/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp +index 9049865e8ce7..3f142cf5e90f 100644 +--- a/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp ++++ b/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp +@@ -3958,25 +3958,6 @@ void BBQJIT::returnValuesFromCall(Vector& results, const FunctionSigna + ASSERT(m_validFPRs.contains(returnLocation.asFPR(), Width::Width128)); + m_fprSet.add(returnLocation.asFPR(), Width::Width128); + } +- } else { +- ASSERT(returnLocation.isStackArgument()); +- // FIXME: Ideally, we would leave these values where they are but a subsequent call could clobber them before they are used. +- // That said, stack results are very rare so this isn't too painful. +- // Even if we did leave them where they are, we'd need to flush them to their canonical location at the next branch otherwise +- // we could have something like (assume no result regs for simplicity): +- // call (result i32 i32) $foo +- // if (result i32) // Stack: i32(StackArgument:8) i32(StackArgument:0) +- // // Stack: i32(StackArgument:8) +- // else +- // call (result i32 i32) $bar // Stack: i32(StackArgument:8) we have to flush the stack argument to make room for the result of bar +- // drop // Stack: i32(Stack:X) i32(StackArgument:8) i32(StackArgument:0) +- // drop // Stack: i32(Stack:X) i32(StackArgument:8) +- // end +- // return // Stack i32(*Conflicting locations*) +- +- Location canonicalLocation = canonicalSlot(result); +- emitMoveMemory(result.type(), returnLocation, canonicalLocation); +- returnLocation = canonicalLocation; + } + } + bind(result, returnLocation); diff --git a/SOURCES/i686-build.patch b/SOURCES/i686-build.patch deleted file mode 100644 index 1b5ec0d..0000000 --- a/SOURCES/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/webkitgtk-2.42.5.tar.xz.asc b/SOURCES/webkitgtk-2.42.5.tar.xz.asc deleted file mode 100644 index 86d9831..0000000 --- a/SOURCES/webkitgtk-2.42.5.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCZcCvFAAKCRDz0yLQ7EWC -w1FoAJ9+JY5XpvsElI4nSgXhLk3k6O7L5QCeNx1Hj5iFlSDQY17oYfa4FyMEI9I= -=NxQN ------END PGP SIGNATURE----- diff --git a/SOURCES/webkitgtk-2.44.3.tar.xz.asc b/SOURCES/webkitgtk-2.44.3.tar.xz.asc new file mode 100644 index 0000000..d98e35b --- /dev/null +++ b/SOURCES/webkitgtk-2.44.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAma7BpQACgkQbBAJtpOX +U5PeIxAAhv6cl4WsiFyPuNQdzik1GdxtSuFxpBW9SokOxFPn4zW/sMIkke20q1et +RhGwKskkuOEgavV/2grC07d8peFbsse6zTeerZECRaB+Saj7ZOWoZQoDbCTxWjzi +yoxsziwIJA4LDdhqxV8TRSCl3bLy+uFQkUfNX1JJot9bMze+9lUjxJ/hAglCUjP8 +WIJdQ1mE+cJguBHJMfdZbDINLywRjesaLXAvTCmpnn3mn0GXMbCQM+W+GCybwhMB +1dl8eFEfcvAhUe85mHJNW3WmYRzvquTMuFuLzU8b1U1/6+LQc+IOXAZEpkP9ztSn +VItLwPnHJ/4g5KY+gUonMxZ1LMhTwiu/ga41Yez0sZftkC6tgIPIldaTY/tjeNLh +C5GnMSyRTJ7d2ywLJSdzCIGkwhOJ7oHArGxbpzCWft3rrU8SbvQd3dGOMip1iniN +ewdMyoqZQgzN51BRUklhjoBCaUkcVbgYr6qfLZiU42kR4RWgrTx/s//naCM4peQe +8vGeRlF9zpsGw3ivCJBNjqk9SrqcPQ2i52lgKs28DkVy13duuQwKEMa+/Tv7eH60 +wNdKSRjeA81DLZkuyX5yJOEJ1pru1HiS4sdP112dPb1HajVhOehZJc7a8b9ohOH5 +go2lIxnJjZOXRHM/JwtTcLKsnfna1m6yzNGdOHNcLKPJodHcpXY= +=jHOh +-----END PGP SIGNATURE----- diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index 86ed8b5..07980bd 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -11,8 +11,8 @@ %endif Name: webkit2gtk3 -Version: 2.42.5 -Release: 1%{?dist} +Version: 2.44.3 +Release: 2%{?dist} Summary: GTK Web content engine library License: LGPLv2 @@ -21,11 +21,11 @@ Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc # Use the keys from https://webkitgtk.org/verifying.html # $ gpg --import aperez.key carlosgc.key -# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg +# $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg Source2: webkitgtk-keys.gpg -# https://bugs.webkit.org/show_bug.cgi?id=268739 -Patch: i686-build.patch +# https://bugs.webkit.org/show_bug.cgi?id=278113 +Patch0: fix-wasm.patch BuildRequires: bison BuildRequires: bubblewrap @@ -40,6 +40,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 +72,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 +91,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 +213,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 +297,23 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir %changelog +* Thu Aug 15 2024 Michael Catanzaro - 2.44.3-2 +- Add patch to fix WebAssembly + Resolves: RHEL-32578 + +* Tue Aug 13 2024 Michael Catanzaro - 2.44.3-1 +- Update to 2.44.3 + Resolves: RHEL-32578 + +* Thu May 16 2024 Michael Catanzaro - 2.44.2-1 +- Update to 2.44.2 + Resolves: RHEL-32578 + +* 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