From 8494823ae6e143c901f2198f5ee442bb12222d30 Mon Sep 17 00:00:00 2001 From: David Beauchamp Date: Mon, 9 Sep 2024 11:28:17 -0400 Subject: [PATCH] extra/wpewebkit to 2.44.4-1 --- extra/wpewebkit/.SRCINFO | 15 ++++----- extra/wpewebkit/PKGBUILD | 19 ++++-------- extra/wpewebkit/revert-271175.patch | 47 ----------------------------- 3 files changed, 12 insertions(+), 69 deletions(-) delete mode 100644 extra/wpewebkit/revert-271175.patch diff --git a/extra/wpewebkit/.SRCINFO b/extra/wpewebkit/.SRCINFO index b6083a759..0e931b4b7 100644 --- a/extra/wpewebkit/.SRCINFO +++ b/extra/wpewebkit/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = wpewebkit pkgdesc = Embeddable web content engine - pkgver = 2.44.3 - pkgrel = 3 + pkgver = 2.44.4 + pkgrel = 1 url = https://wpewebkit.org arch = x86_64 license = AFL-2.0 OR GPL-2.0-or-later @@ -82,17 +82,14 @@ pkgbase = wpewebkit depends = xdg-dbus-proxy depends = zlib options = !lto - source = https://wpewebkit.org/releases/wpewebkit-2.44.3.tar.xz - source = https://wpewebkit.org/releases/wpewebkit-2.44.3.tar.xz.asc - source = revert-271175.patch + source = https://wpewebkit.org/releases/wpewebkit-2.44.4.tar.xz + source = https://wpewebkit.org/releases/wpewebkit-2.44.4.tar.xz.asc validpgpkeys = 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B validpgpkeys = 013A0127AC9C65B34FFA62526C1009B693975393 - sha256sums = 55c639879eaa5f070fb1c11fccb968cd85ca21680cc8cd0cd638135ca24433bb + sha256sums = cd6042c63a6f883cc1586e5cea94e846aaaee6a864c14988e8af4ef4f362ba3b sha256sums = SKIP - sha256sums = 640b392081d913f5522aec83e32213983f35603d28fceecc9bff3f33e59468a7 - b2sums = 9ec256150f34b2ca17517f5e5608b0b7e0ff34c6950d444dba2bbe7bb6415c5721a8173b9fa8eda0b3f749b3df4a7afd45aec27b7829cff09e0e9d75f62b55e9 + b2sums = 55cfdd08db3e6290fa17f1f94f14b349fb69b87446d86305f8bdcf952c72743fb645931378b2b505a85cd452beacaeaac642d340fb25ecfa280d39d931bc58cf b2sums = SKIP - b2sums = 4e894df99d764cc24094b9dfb653c59d31848cee7640d606c5e8175b4eddec8eee0b5f48795d7fea61246d7ff8aa5ea70ef8a6e42085d7cdea0f670549074b55 pkgname = wpewebkit depends = at-spi2-core diff --git a/extra/wpewebkit/PKGBUILD b/extra/wpewebkit/PKGBUILD index 2a24b53d4..be0ac0c22 100644 --- a/extra/wpewebkit/PKGBUILD +++ b/extra/wpewebkit/PKGBUILD @@ -8,8 +8,8 @@ pkgname=( wpewebkit wpewebkit-docs ) -pkgver=2.44.3 -pkgrel=3 +pkgver=2.44.4 +pkgrel=1 pkgdesc="Embeddable web content engine" url="https://wpewebkit.org" arch=(x86_64) @@ -104,14 +104,11 @@ options=( ) source=( $url/releases/wpewebkit-$pkgver.tar.xz{,.asc} - revert-271175.patch ) -sha256sums=('55c639879eaa5f070fb1c11fccb968cd85ca21680cc8cd0cd638135ca24433bb' - 'SKIP' - '640b392081d913f5522aec83e32213983f35603d28fceecc9bff3f33e59468a7') -b2sums=('9ec256150f34b2ca17517f5e5608b0b7e0ff34c6950d444dba2bbe7bb6415c5721a8173b9fa8eda0b3f749b3df4a7afd45aec27b7829cff09e0e9d75f62b55e9' - 'SKIP' - '4e894df99d764cc24094b9dfb653c59d31848cee7640d606c5e8175b4eddec8eee0b5f48795d7fea61246d7ff8aa5ea70ef8a6e42085d7cdea0f670549074b55') +sha256sums=('cd6042c63a6f883cc1586e5cea94e846aaaee6a864c14988e8af4ef4f362ba3b' + 'SKIP') +b2sums=('55cfdd08db3e6290fa17f1f94f14b349fb69b87446d86305f8bdcf952c72743fb645931378b2b505a85cd452beacaeaac642d340fb25ecfa280d39d931bc58cf' + 'SKIP') validpgpkeys=( # https://wpewebkit.org/release/verify/ 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B # Adrián Pérez de Castro @@ -120,10 +117,6 @@ validpgpkeys=( prepare() { cd wpewebkit-$pkgver - - # https://bugs.webkit.org/show_bug.cgi?id=278113 - # https://github.com/WebKit/WebKit/commit/9140ce712aa87091613874d802787ab476be0e39 - patch -Np1 -i ../revert-271175.patch } build() { diff --git a/extra/wpewebkit/revert-271175.patch b/extra/wpewebkit/revert-271175.patch deleted file mode 100644 index 0e4368571..000000000 --- a/extra/wpewebkit/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);