summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2024-04-11 15:03:36 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-23 13:33:46 +0100
commitc129c47cf9fa119005ea6e3946ebdee0da1db7e0 (patch)
treeac0e9096e6e84b33ccfb1462f82e3fcb9981fdd4
parent05107ec5e4b81315d53efef23f2a570d520ee4c7 (diff)
downloadopenembedded-core-contrib-c129c47cf9fa119005ea6e3946ebdee0da1db7e0.tar.gz
webkitgtk: 2.44.0 -> 2.44.1
Update webkitgtk from 2.44.0 to the first bug fix release in the stable 2.44 series 2.44.1. * remove backported patch What's new in the WebKitGTK 2.44.1 release? =========================================== - Fix handling of lifetime of web view child dialogs in GTK4. - Do not schedule layer flushes when drawing area size is empty. - Fix videos with alpha when using the DMA-BUF sink. - Fix the build with USE_GBM=OFF. - Fix the build in 32bit platforms - Fix several crashes and rendering issues. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch38
-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 @@
-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
-
-Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/2922af379dc70b4b1a63b01d67179eb431f03ac4]
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- 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/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 \
file://no-musttail-arm.patch \
file://t6-not-declared.patch \
file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \
- file://2922af379dc70b4b1a63b01d67179eb431f03ac4.patch \
"
-SRC_URI[sha256sum] = "c66530e41ba59b1edba4ee89ef20b2188e273bed0497e95084729e3cfbe30c87"
+SRC_URI[sha256sum] = "425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561"
inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen