summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/webkitgtk/webkitgtk3/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/webkitgtk/webkitgtk3/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch')
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch
new file mode 100644
index 000000000..0f6b9a633
--- /dev/null
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch
@@ -0,0 +1,36 @@
1From 2922af379dc70b4b1a63b01d67179eb431f03ac4 Mon Sep 17 00:00:00 2001
2From: Michael Catanzaro <mcatanzaro@redhat.com>
3Date: Mon, 18 Mar 2024 11:14:54 -0700
4Subject: [PATCH] REGRESSION(274077@main): failure to build on i586 (and likely
5 other 32bit arches): static assertion failed: Timer should stay small
6 https://bugs.webkit.org/show_bug.cgi?id=271108
7
8Unreviewed build fix. This changes SameSizeOfTimer to ensure it matches
9the size of Timer on 32-bit platforms.
10
11* Source/WebCore/platform/Timer.cpp:
12
13Canonical link: https://commits.webkit.org/276282@main
14
15Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/2922af379dc70b4b1a63b01d67179eb431f03ac4]
16---
17 Source/WebCore/platform/Timer.cpp | 6 +++++-
18 1 file changed, 5 insertions(+), 1 deletion(-)
19
20diff --git a/Source/WebCore/platform/Timer.cpp b/Source/WebCore/platform/Timer.cpp
21index 4f7c0f5c39ca9..0f3734cca2474 100644
22--- a/Source/WebCore/platform/Timer.cpp
23+++ b/Source/WebCore/platform/Timer.cpp
24@@ -263,7 +263,11 @@ struct SameSizeAsTimer {
25
26 WeakPtr<TimerAlignment> timerAlignment;
27 double times[2];
28- void* pointers[3];
29+ void* pointers[2];
30+#if CPU(ADDRESS32)
31+ uint8_t bitfields;
32+#endif
33+ void* pointer;
34 };
35
36 static_assert(sizeof(Timer) == sizeof(SameSizeAsTimer), "Timer should stay small");