From 49182e5deeb891151b059ca10a05c23a0dc7a77b Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Sat, 13 Apr 2024 21:59:13 +0700 Subject: libraries/webkit2gtk4.1: Updated for version 2.44.1. Signed-off-by: Willy Sudiarto Raharjo --- libraries/webkit2gtk4.1/timer.patch | 35 ------------------------ libraries/webkit2gtk4.1/webkit2gtk4.1.SlackBuild | 5 +--- libraries/webkit2gtk4.1/webkit2gtk4.1.info | 4 +-- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 libraries/webkit2gtk4.1/timer.patch (limited to 'libraries') diff --git a/libraries/webkit2gtk4.1/timer.patch b/libraries/webkit2gtk4.1/timer.patch deleted file mode 100644 index ec876b9b1f..0000000000 --- a/libraries/webkit2gtk4.1/timer.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 -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; - 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"); diff --git a/libraries/webkit2gtk4.1/webkit2gtk4.1.SlackBuild b/libraries/webkit2gtk4.1/webkit2gtk4.1.SlackBuild index 31c7b2863c..59f324de96 100644 --- a/libraries/webkit2gtk4.1/webkit2gtk4.1.SlackBuild +++ b/libraries/webkit2gtk4.1/webkit2gtk4.1.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=webkit2gtk4.1 SRCNAM=webkitgtk -VERSION=${VERSION:-2.44.0} +VERSION=${VERSION:-2.44.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,9 +80,6 @@ find -L . \ patch -p1 < $CWD/unhide-deprecated-api.patch patch -p1 < $CWD/3d5373575695b293b8559155431d0079a6153aff.patch -# https://git.alpinelinux.org/aports/commit/?id=6ac1a60697be269de429404a602aaeb44ffe1149 -patch -p1 < $CWD/timer.patch - mkdir -p build cd build cmake -DPORT=GTK \ diff --git a/libraries/webkit2gtk4.1/webkit2gtk4.1.info b/libraries/webkit2gtk4.1/webkit2gtk4.1.info index 302e109270..24acc4a7a3 100644 --- a/libraries/webkit2gtk4.1/webkit2gtk4.1.info +++ b/libraries/webkit2gtk4.1/webkit2gtk4.1.info @@ -1,7 +1,7 @@ PRGNAM="webkit2gtk4.1" -VERSION="2.44.0" +VERSION="2.44.1" HOMEPAGE="https://www.webkitgtk.org/" -DOWNLOAD="https://www.webkitgtk.org/releases/webkitgtk-2.44.0.tar.xz" +DOWNLOAD="https://www.webkitgtk.org/releases/webkitgtk-2.44.1.tar.xz" MD5SUM="20fef6a9122fc46f66f2f8550d5f08c6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -- cgit v1.2.3-65-gdbad