diff --git a/community/webkit2gtk-4.1/APKBUILD b/community/webkit2gtk-4.1/APKBUILD index be5615840bc93dbc2eafa7fbd088eae64b9dde4c..61f9d07f47e3258c856c369f26bd65e6e688e5d8 100644 --- a/community/webkit2gtk-4.1/APKBUILD +++ b/community/webkit2gtk-4.1/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jiri Horner <laeqten@gmail.com> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=webkit2gtk-4.1 -pkgver=2.44.0 +pkgver=2.44.1 pkgrel=0 pkgdesc="Portable web rendering engine WebKit for GTK+ - GTK+3 libsoup3 version" url="https://webkitgtk.org/" @@ -60,7 +60,6 @@ source="https://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz armv6kz.patch armv6-musttail.patch cloopfix.patch - x86-assert-timer-size.patch riscv64-no-wasm.patch " builddir="$srcdir/webkitgtk-$pkgver" @@ -167,10 +166,9 @@ package() { } sha512sums=" -fb40fe1002b368ce5b498d9f5bf76c1f275156d5ee3b17339b682fcb4ebfd711c8c337ae9dbe90382a72d2a04d49cff23133fc318ec74cd81ae9c5d01c206d2a webkitgtk-2.44.0.tar.xz +b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169 webkitgtk-2.44.1.tar.xz 8c89d4ac737a2bd6d970fec3ecb9d0b72d61ffb9a37d4b0b56bc0106914398a65319e940c593c0305fc40d6900aac2a8b4fc3bafc9a96062063d15abd1f5039d armv6kz.patch d3e3a20cf6f1447e15eec8636301fb5c4c12560e4a5d47707708425b0da8ab84e3b1a10f98c9ba4ed2e1a32a9c131055da14f8f74e8bde20d4269bf8313dc04d armv6-musttail.patch 49acf07095abb3c6114790b676f1fe4c1f6c4c4d66d2aed525e61291bd9857386749cc31a521e3f739758ed6d6b0e176a45543e7c58ca16c9c1b266222d362ed cloopfix.patch -3fb6e5fd0da85df07aa28628524c0f9f670aba1291e92f0cdcc7ebf335a34deed8d0f1f70cc84ec8f116334531d5c97fa3f21e0f1063af5743f5636be24ef08f x86-assert-timer-size.patch 61461d19f80108357d0469a855212308a49fb43f5a629d119f95492c3897444664cbe12beddc53d801878124a67e38b4a404d37d1ac9c0e5ce65d7586328b1d9 riscv64-no-wasm.patch " diff --git a/community/webkit2gtk-4.1/x86-assert-timer-size.patch b/community/webkit2gtk-4.1/x86-assert-timer-size.patch deleted file mode 100644 index ec876b9b1f44c94a57871f1d0f64e5770966b0a5..0000000000000000000000000000000000000000 --- a/community/webkit2gtk-4.1/x86-assert-timer-size.patch +++ /dev/null @@ -1,35 +0,0 @@ -Patch-Source: https://github.com/WebKit/WebKit/commit/2922af379dc70b4b1a63b01d67179eb431f03ac4 -From 2922af379dc70b4b1a63b01d67179eb431f03ac4 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@redhat.com> -Date: Mon, 18 Mar 2024 11:14:54 -0700 -Subject: [PATCH] REGRESSION(274077@main): failure to build on i586 (and likely - other 32bit arches): static assertion failed: Timer should stay small - https://bugs.webkit.org/show_bug.cgi?id=271108 - -Unreviewed build fix. This changes SameSizeOfTimer to ensure it matches -the size of Timer on 32-bit platforms. - -* Source/WebCore/platform/Timer.cpp: - -Canonical link: https://commits.webkit.org/276282@main ---- - Source/WebCore/platform/Timer.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Source/WebCore/platform/Timer.cpp b/Source/WebCore/platform/Timer.cpp -index 4f7c0f5c39ca9..0f3734cca2474 100644 ---- a/Source/WebCore/platform/Timer.cpp -+++ b/Source/WebCore/platform/Timer.cpp -@@ -263,7 +263,11 @@ struct SameSizeAsTimer { - - WeakPtr<TimerAlignment> timerAlignment; - double times[2]; -- void* pointers[3]; -+ void* pointers[2]; -+#if CPU(ADDRESS32) -+ uint8_t bitfields; -+#endif -+ void* pointer; - }; - - static_assert(sizeof(Timer) == sizeof(SameSizeAsTimer), "Timer should stay small");