diff --git a/revert-271175.patch b/revert-271175.patch deleted file mode 100644 index 4ceee18..0000000 --- a/revert-271175.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 - -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/webkit2gtk3.changes b/webkit2gtk3.changes index 29c9a24..14ee372 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Sep 9 20:12:42 UTC 2024 - Bjørn Lie + +- Update to version 2.44.4: + + Add quirk to allow totale.rosettastone.com to load properly. + + Fix webkit_web_resource_get_data() not working properly in some + sites. + + Fix not being able to jump-to-source in Web Inspector canvas + traces. + + Fix not being able to scroll list of WebGL shader programs in + the Web Inspector. + + Fix linker relocation errors on Debug/RelWithDebInfo builds. + + Fix crashes when built with Clang with Link-Time Optimization + (LTO). + + Fix several crashes and rendering issues. +- Drop revert-271175.patch: Fixed upstream. +- Enable LTO again, pass define _lto_cflags for only select targets + ------------------------------------------------------------------- Sun Sep 1 16:30:22 UTC 2024 - Bjørn Lie diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 5fb1fe7..5156ee3 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -73,10 +73,13 @@ ExclusiveArch: do-not-build %define _with_backtrace 1 %endif +# Disable LTO on select targets +%ifarch %{ix86} ppc64le +%global _lto_cflags %{nil} +%endif + Name: webkit2%{_gtknamesuffix} -### FIXME ### Drop the disabling of LTO on next release/versionbump -%define _lto_cflags %{nil} -Version: 2.44.3 +Version: 2.44.4 Release: 0 Summary: Library for rendering web content, GTK+ Port License: BSD-3-Clause AND LGPL-2.0-or-later @@ -91,8 +94,6 @@ Source99: webkit2gtk3.keyring Patch0: reproducibility.patch # PATCH-FIX-UPSTREAM webkit2gtk3-disable-dmabuf-nvidia.patch boo#1216778 mgorse@suse.com -- disable the DMABuf renderer for NVIDIA proprietary drivers. Patch2: webkit2gtk3-disable-dmabuf-nvidia.patch -# PATCH-FIX-UPSTREAM revert-271175.patch -- This reverts commit 279c9d7, it broke wasm. -Patch3: revert-271175.patch BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGL-devel diff --git a/webkitgtk-2.44.3.tar.xz b/webkitgtk-2.44.3.tar.xz deleted file mode 100644 index fe7a6b1..0000000 --- a/webkitgtk-2.44.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54 -size 37250176 diff --git a/webkitgtk-2.44.3.tar.xz.asc b/webkitgtk-2.44.3.tar.xz.asc deleted file mode 100644 index 30b955f..0000000 --- a/webkitgtk-2.44.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------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/webkitgtk-2.44.4.tar.xz b/webkitgtk-2.44.4.tar.xz new file mode 100644 index 0000000..c580147 --- /dev/null +++ b/webkitgtk-2.44.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ce4ec1b78413035037aba8326b31ed72696626b7bea7bace5e46ac0d8cbe796 +size 35858056 diff --git a/webkitgtk-2.44.4.tar.xz.asc b/webkitgtk-2.44.4.tar.xz.asc new file mode 100644 index 0000000..e6e419b --- /dev/null +++ b/webkitgtk-2.44.4.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCZt6j0AAKCRCRxVnb5MkS +O8uuAJ4hLC/UXFDJsanfXyaQ6/y3hf684ACdEdyKE/nxBYL9dQEzL/50xEBsl5o= +=aQH7 +-----END PGP SIGNATURE-----