From 654b15087de3d9f7134f5f14237eaa1f3aaf8b7d Mon Sep 17 00:00:00 2001 From: David Beauchamp Date: Mon, 9 Sep 2024 11:29:15 -0400 Subject: [PATCH] extra/webkitgtk-6.0 to 2.44.4-1 --- extra/webkitgtk-6.0/.SRCINFO | 15 ++++---- extra/webkitgtk-6.0/PKGBUILD | 19 ++++------ extra/webkitgtk-6.0/revert-271175.patch | 47 ------------------------- 3 files changed, 12 insertions(+), 69 deletions(-) delete mode 100644 extra/webkitgtk-6.0/revert-271175.patch diff --git a/extra/webkitgtk-6.0/.SRCINFO b/extra/webkitgtk-6.0/.SRCINFO index 13fb2aa04..956069039 100644 --- a/extra/webkitgtk-6.0/.SRCINFO +++ b/extra/webkitgtk-6.0/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = webkitgtk-6.0 pkgdesc = Web content engine for GTK - pkgver = 2.44.3 - pkgrel = 3 + pkgver = 2.44.4 + pkgrel = 1 url = https://webkitgtk.org arch = x86_64 license = AFL-2.0 OR GPL-2.0-or-later @@ -90,17 +90,14 @@ pkgbase = webkitgtk-6.0 depends = xdg-dbus-proxy depends = zlib options = !lto - source = https://webkitgtk.org/releases/webkitgtk-2.44.3.tar.xz - source = https://webkitgtk.org/releases/webkitgtk-2.44.3.tar.xz.asc - source = revert-271175.patch + source = https://webkitgtk.org/releases/webkitgtk-2.44.4.tar.xz + source = https://webkitgtk.org/releases/webkitgtk-2.44.4.tar.xz.asc validpgpkeys = 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B validpgpkeys = 013A0127AC9C65B34FFA62526C1009B693975393 - sha256sums = dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54 + sha256sums = 2ce4ec1b78413035037aba8326b31ed72696626b7bea7bace5e46ac0d8cbe796 sha256sums = SKIP - sha256sums = 640b392081d913f5522aec83e32213983f35603d28fceecc9bff3f33e59468a7 - b2sums = 70ee02b2d5828907d7659db903f5dbc4db628af47e421db1b105163a5cec902be19f740e752179e7cda3e605af232150bb1fb37efd2382d7d4f2454fd3f8bccc + b2sums = 9e3d016bfb2b4e80d2ebeda95e75f8ec8b909b41b17a879d3e1119ed66e3bf4d590a22ed814bb1572dac8d8a8838bb37b5ab1372121b276e02ee8925f6c5b00c b2sums = SKIP - b2sums = 4e894df99d764cc24094b9dfb653c59d31848cee7640d606c5e8175b4eddec8eee0b5f48795d7fea61246d7ff8aa5ea70ef8a6e42085d7cdea0f670549074b55 pkgname = webkitgtk-6.0 optdepends = geoclue: Geolocation support diff --git a/extra/webkitgtk-6.0/PKGBUILD b/extra/webkitgtk-6.0/PKGBUILD index 6b95c5998..31a123b0c 100644 --- a/extra/webkitgtk-6.0/PKGBUILD +++ b/extra/webkitgtk-6.0/PKGBUILD @@ -10,8 +10,8 @@ pkgname=( webkitgtk-6.0 webkitgtk-6.0-docs ) -pkgver=2.44.3 -pkgrel=3 +pkgver=2.44.4 +pkgrel=1 pkgdesc="Web content engine for GTK" url="https://webkitgtk.org" arch=(x86_64) @@ -114,14 +114,11 @@ options=( ) source=( $url/releases/webkitgtk-$pkgver.tar.xz{,.asc} - revert-271175.patch ) -sha256sums=('dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54' - 'SKIP' - '640b392081d913f5522aec83e32213983f35603d28fceecc9bff3f33e59468a7') -b2sums=('70ee02b2d5828907d7659db903f5dbc4db628af47e421db1b105163a5cec902be19f740e752179e7cda3e605af232150bb1fb37efd2382d7d4f2454fd3f8bccc' - 'SKIP' - '4e894df99d764cc24094b9dfb653c59d31848cee7640d606c5e8175b4eddec8eee0b5f48795d7fea61246d7ff8aa5ea70ef8a6e42085d7cdea0f670549074b55') +sha256sums=('2ce4ec1b78413035037aba8326b31ed72696626b7bea7bace5e46ac0d8cbe796' + 'SKIP') +b2sums=('9e3d016bfb2b4e80d2ebeda95e75f8ec8b909b41b17a879d3e1119ed66e3bf4d590a22ed814bb1572dac8d8a8838bb37b5ab1372121b276e02ee8925f6c5b00c' + 'SKIP') validpgpkeys=( # https://www.webkitgtk.org/verifying.html 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B # Adrián Pérez de Castro @@ -131,10 +128,6 @@ validpgpkeys=( prepare() { cd webkitgtk-$pkgver - # https://bugs.webkit.org/show_bug.cgi?id=278113 - # https://github.com/WebKit/WebKit/commit/9140ce712aa87091613874d802787ab476be0e39 - patch -Np1 -i ../revert-271175.patch - if [[ $CARCH == "armv7h" ]]; then sed -i '/#define WTF_CPU_ARM_NEON 1/d' Source/WTF/wtf/PlatformCPU.h fi diff --git a/extra/webkitgtk-6.0/revert-271175.patch b/extra/webkitgtk-6.0/revert-271175.patch deleted file mode 100644 index 0e4368571..000000000 --- a/extra/webkitgtk-6.0/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);