diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-03-21 10:05:21 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-03-21 21:38:04 +0700 |
| commit | e383697007a55d55574c538385e8fa05e6d9f386 (patch) | |
| tree | 82a8d23f09d3726e0a849dae003cd11bb6c1b93f /libraries | |
| parent | a3ce0e15187d1bd41856529b4f3e93417f6d82b9 (diff) | |
libraries/webkit2gtk: Fix build on x86.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/webkit2gtk/timer.patch | 35 | ||||
| -rw-r--r-- | libraries/webkit2gtk/webkit2gtk.SlackBuild | 3 |
2 files changed, 38 insertions, 0 deletions
diff --git a/libraries/webkit2gtk/timer.patch b/libraries/webkit2gtk/timer.patch new file mode 100644 index 0000000000000..ec876b9b1f44c --- /dev/null +++ b/libraries/webkit2gtk/timer.patch @@ -0,0 +1,35 @@ +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"); diff --git a/libraries/webkit2gtk/webkit2gtk.SlackBuild b/libraries/webkit2gtk/webkit2gtk.SlackBuild index 9551016e3b473..18d064ddc5819 100644 --- a/libraries/webkit2gtk/webkit2gtk.SlackBuild +++ b/libraries/webkit2gtk/webkit2gtk.SlackBuild @@ -80,6 +80,9 @@ 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 \ |