Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging / Packages / webkit2gtk
Commits: ba891a99 by Jan Alexander Steffens (heftig) at 2024-08-16T02:06:13+02:00 2.44.3-3: Add a patch for WASM Fixes: https://gitlab.archlinux.org/archlinux/packaging/packages/webkitgtk-6.0/-/issues/3 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + revert-271175.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = webkit2gtk pkgdesc = Web content engine for GTK pkgver = 2.44.3 - pkgrel = 2 + pkgrel = 3 url = https://webkitgtk.org arch = x86_64 license = AFL-2.0 OR GPL-2.0-or-later @@ -92,12 +92,15 @@ pkgbase = webkit2gtk 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 validpgpkeys = 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B validpgpkeys = 013A0127AC9C65B34FFA62526C1009B693975393 sha256sums = dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54 sha256sums = SKIP + sha256sums = 640b392081d913f5522aec83e32213983f35603d28fceecc9bff3f33e59468a7 b2sums = 70ee02b2d5828907d7659db903f5dbc4db628af47e421db1b105163a5cec902be19f740e752179e7cda3e605af232150bb1fb37efd2382d7d4f2454fd3f8bccc b2sums = SKIP + b2sums = 4e894df99d764cc24094b9dfb653c59d31848cee7640d606c5e8175b4eddec8eee0b5f48795d7fea61246d7ff8aa5ea70ef8a6e42085d7cdea0f670549074b55 pkgname = webkit2gtk optdepends = geoclue: Geolocation support ===================================== PKGBUILD ===================================== @@ -7,7 +7,7 @@ pkgname=( webkit2gtk-docs ) pkgver=2.44.3 -pkgrel=2 +pkgrel=3 pkgdesc="Web content engine for GTK" url="https://webkitgtk.org"; arch=(x86_64) @@ -110,11 +110,14 @@ options=( ) source=( $url/releases/webkitgtk-$pkgver.tar.xz{,.asc} + revert-271175.patch ) sha256sums=('dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54' - 'SKIP') + 'SKIP' + '640b392081d913f5522aec83e32213983f35603d28fceecc9bff3f33e59468a7') b2sums=('70ee02b2d5828907d7659db903f5dbc4db628af47e421db1b105163a5cec902be19f740e752179e7cda3e605af232150bb1fb37efd2382d7d4f2454fd3f8bccc' - 'SKIP') + 'SKIP' + '4e894df99d764cc24094b9dfb653c59d31848cee7640d606c5e8175b4eddec8eee0b5f48795d7fea61246d7ff8aa5ea70ef8a6e42085d7cdea0f670549074b55') validpgpkeys=( # https://www.webkitgtk.org/verifying.html 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B # Adrián Pérez de Castro <ape...@igalia.com> @@ -123,6 +126,10 @@ 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 } build() { ===================================== revert-271175.patch ===================================== @@ -0,0 +1,47 @@ +From 9140ce712aa87091613874d802787ab476be0e39 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanz...@redhat.com> +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<Value, N>& 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); View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/webkit2gtk/-/commit/ba891a990f63c2cde0d9b7c72e8fc1acf24e57e4 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/webkit2gtk/-/commit/ba891a990f63c2cde0d9b7c72e8fc1acf24e57e4 You're receiving this email because of your account on gitlab.archlinux.org.
