diff options
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.44.1.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.44.0.bb) | 3 |
2 files changed, 1 insertions, 40 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch b/meta/recipes-sato/webkit/webkitgtk/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch deleted file mode 100644 index 3067500447..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From 2922af379dc70b4b1a63b01d67179eb431f03ac4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Michael Catanzaro <mcatanzaro@redhat.com> | ||
| 3 | Date: Mon, 18 Mar 2024 11:14:54 -0700 | ||
| 4 | Subject: [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 | |||
| 8 | Unreviewed build fix. This changes SameSizeOfTimer to ensure it matches | ||
| 9 | the size of Timer on 32-bit platforms. | ||
| 10 | |||
| 11 | * Source/WebCore/platform/Timer.cpp: | ||
| 12 | |||
| 13 | Canonical link: https://commits.webkit.org/276282@main | ||
| 14 | |||
| 15 | Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/2922af379dc70b4b1a63b01d67179eb431f03ac4] | ||
| 16 | |||
| 17 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 18 | --- | ||
| 19 | Source/WebCore/platform/Timer.cpp | 6 +++++- | ||
| 20 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
| 21 | |||
| 22 | diff --git a/Source/WebCore/platform/Timer.cpp b/Source/WebCore/platform/Timer.cpp | ||
| 23 | index 4f7c0f5c39ca9..0f3734cca2474 100644 | ||
| 24 | --- a/Source/WebCore/platform/Timer.cpp | ||
| 25 | +++ b/Source/WebCore/platform/Timer.cpp | ||
| 26 | @@ -263,7 +263,11 @@ struct SameSizeAsTimer { | ||
| 27 | |||
| 28 | WeakPtr<TimerAlignment> timerAlignment; | ||
| 29 | double times[2]; | ||
| 30 | - void* pointers[3]; | ||
| 31 | + void* pointers[2]; | ||
| 32 | +#if CPU(ADDRESS32) | ||
| 33 | + uint8_t bitfields; | ||
| 34 | +#endif | ||
| 35 | + void* pointer; | ||
| 36 | }; | ||
| 37 | |||
| 38 | static_assert(sizeof(Timer) == sizeof(SameSizeAsTimer), "Timer should stay small"); | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.44.0.bb b/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb index 0819f6de0d..29e12bb8c5 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.44.0.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb | |||
| @@ -16,9 +16,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
| 16 | file://no-musttail-arm.patch \ | 16 | file://no-musttail-arm.patch \ |
| 17 | file://t6-not-declared.patch \ | 17 | file://t6-not-declared.patch \ |
| 18 | file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ | 18 | file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ |
| 19 | file://2922af379dc70b4b1a63b01d67179eb431f03ac4.patch \ | ||
| 20 | " | 19 | " |
| 21 | SRC_URI[sha256sum] = "c66530e41ba59b1edba4ee89ef20b2188e273bed0497e95084729e3cfbe30c87" | 20 | SRC_URI[sha256sum] = "425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561" |
| 22 | 21 | ||
| 23 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen | 22 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen |
| 24 | 23 | ||
