diff mbox series

[meta-oe,V2] webkitgtk3: upgrade 2.42.4 -> 2.42.5

Message ID 1708612095-7256-1-git-send-email-wangmy@fujitsu.com
State Accepted, archived
Headers show
Series [meta-oe,V2] webkitgtk3: upgrade 2.42.4 -> 2.42.5 | expand

Commit Message

Mingyu Wang (Fujitsu) Feb. 22, 2024, 2:28 p.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

Add 01-Fix-build-error.patch to fix build error.

Changelog:
=========
- Fix webkit_web_context_allow_tls_certificate_for_host to handle IPv6 URIs produced by SoupURI.
- Ignore stops with offset zero before last one when rendering gradients with cairo.
- Write bwrapinfo.json to disk for xdg-desktop-portal.
- Fix gamepads detection by correctly handling focused window in GTK4.
- Fix several crashes and rendering issues.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../webkitgtk3/0001-Fix-build-error.patch     | 33 +++++++++++++++++++
 ...kitgtk3_2.42.4.bb => webkitgtk3_2.42.5.bb} |  3 +-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-error.patch
 rename meta-oe/recipes-support/webkitgtk/{webkitgtk3_2.42.4.bb => webkitgtk3_2.42.5.bb} (98%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-error.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-error.patch
new file mode 100644
index 000000000..6cbd10c05
--- /dev/null
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-error.patch
@@ -0,0 +1,33 @@ 
+From ff00bb783bf1d921e38dcefaa2b709a41d6a3ff8 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@fujitsu.com>
+Date: Thu, 22 Feb 2024 03:14:57 +0000
+Subject: [PATCH] Fix build error.
+
+Error message:
+LowLevelInterpreter.cpp:339:21: error: 't6' was not declared in this scope
+LowLevelInterpreter.cpp:340:21: error: 't7' was not declared in this scope
+
+Upstream-Status: Backport
+[https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff]
+
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
+---
+ Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+index 5064ead6..9a2e2653 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
+     UNUSED_VARIABLE(t2);
+     UNUSED_VARIABLE(t3);
+     UNUSED_VARIABLE(t5);
+-    UNUSED_VARIABLE(t6);
+-    UNUSED_VARIABLE(t7);
+ 
+     struct StackPointerScope {
+         StackPointerScope(CLoopStack& stack)
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.4.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.5.bb
similarity index 98%
rename from meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.4.bb
rename to meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.5.bb
index 3c6b7db81..9999bc162 100644
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.4.bb
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.5.bb
@@ -14,8 +14,9 @@  SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \
            file://reproducibility.patch \
            file://0d3344e17d258106617b0e6d783d073b188a2548.patch \
            file://no-musttail-arm.patch \
+           file://0001-Fix-build-error.patch \
            "
-SRC_URI[sha256sum] = "52288b30bda22373442cecb86f9c9a569ad8d4769a1f97b352290ed92a67ed86"
+SRC_URI[sha256sum] = "b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen