[packages/gtk-webkit4] - added timer-size-assert patch to fix 32-bit builds
qboosh
qboosh at pld-linux.org
Fri Apr 5 18:56:58 CEST 2024
commit 5f76c832ef70906497938ee02e168e01f5132d35
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Apr 5 18:32:28 2024 +0200
- added timer-size-assert patch to fix 32-bit builds
gtk-webkit4.spec | 2 ++
webkit-timer-size-assert.patch | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+)
---
diff --git a/gtk-webkit4.spec b/gtk-webkit4.spec
index 51be6d3..2796173 100644
--- a/gtk-webkit4.spec
+++ b/gtk-webkit4.spec
@@ -33,6 +33,7 @@ Patch0: x32.patch
Patch1: %{name}-icu59.patch
Patch2: parallel-gir.patch
Patch3: %{name}-driver-version-suffix.patch
+Patch4: webkit-timer-size-assert.patch
URL: https://webkitgtk.org/
BuildRequires: /usr/bin/ld.gold
BuildRequires: EGL-devel
@@ -317,6 +318,7 @@ Dokumentacja API portu WebKitu do GTK 4.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%if %{with lowmem}
diff --git a/webkit-timer-size-assert.patch b/webkit-timer-size-assert.patch
new file mode 100644
index 0000000..70975b3
--- /dev/null
+++ b/webkit-timer-size-assert.patch
@@ -0,0 +1,34 @@
+From 2922af379dc70b4b1a63b01d67179eb431f03ac4 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro at redhat.com>
+Date: Mon, 18 Mar 2024 11:14:54 -0700
+Subject: [PATCH] REGRESSION(274077 at 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");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit4.git/commitdiff/5f76c832ef70906497938ee02e168e01f5132d35
More information about the pld-cvs-commit
mailing list