From a80e06186e919c72b352103e87a9921073d81213 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 19 Mar 2025 01:15:29 -0700 Subject: [PATCH] webkitgtk: 2.46.6 -> 2.48.0 Upgrade webkitgtk from 2.46.6 to 2.48.0: * remove backported patch bmalloc-fix.patch * update context of no-musttail-arm.patch * add PACKAGECONFIG speech Signed-off-by: Kai Kang Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../webkit/webkitgtk/bmalloc-fix.patch | 36 ------------------- .../webkit/webkitgtk/no-musttail-arm.patch | 14 +++++--- ...ebkitgtk_2.46.6.bb => webkitgtk_2.48.0.bb} | 4 +-- 3 files changed, 11 insertions(+), 43 deletions(-) delete mode 100644 meta/recipes-sato/webkit/webkitgtk/bmalloc-fix.patch rename meta/recipes-sato/webkit/{webkitgtk_2.46.6.bb => webkitgtk_2.48.0.bb} (97%) diff --git a/meta/recipes-sato/webkit/webkitgtk/bmalloc-fix.patch b/meta/recipes-sato/webkit/webkitgtk/bmalloc-fix.patch deleted file mode 100644 index 37e0fdcbbdc..00000000000 --- a/meta/recipes-sato/webkit/webkitgtk/bmalloc-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6ab7d3f7d8d0d8e1ab401d0fb13f60bbc64279a2 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Thu, 7 Nov 2024 11:54:30 -0800 -Subject: [PATCH] bmalloc: Build problem in bmalloc when X11/X.h is in the same - namespace https://bugs.webkit.org/show_bug.cgi?id=282693 - -This avoids a build problem when the X11/X.h is included, -which defines Success to '0'. - -Reviewed by Fujii Hironori. - -* Source/bmalloc/bmalloc/EligibilityResult.h: - -Canonical link: https://commits.webkit.org/286295@main -Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/6ab7d3f7d8d0d8e1ab401d0fb13f60bbc64279a2] -Signed-off-by: Alexander Kanavin ---- - Source/bmalloc/bmalloc/EligibilityResult.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/Source/bmalloc/bmalloc/EligibilityResult.h b/Source/bmalloc/bmalloc/EligibilityResult.h -index ead7dbb52c07a..48f9e5bfe8a80 100644 ---- a/Source/bmalloc/bmalloc/EligibilityResult.h -+++ b/Source/bmalloc/bmalloc/EligibilityResult.h -@@ -29,6 +29,11 @@ - - #if !BUSE(LIBPAS) - -+/* avoid conflict with symbol from X11 headers */ -+#ifdef Success -+#undef Success -+#endif -+ - namespace bmalloc { - - enum class EligibilityKind { diff --git a/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch b/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch index c98d8b7727b..367e6b8342a 100644 --- a/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch +++ b/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch @@ -11,20 +11,24 @@ this code is new in webkit 2.42[2] thats why we do not see the crash in older we Upstream-Status: Inappropriate [work around to avoid clang compiler crash] Signed-off-by: Khem Raj + +Update context for webkitgtk 2.48.0. + +Signed-off-by: Kai Kang --- Source/WTF/wtf/Compiler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h -index c01ed849..b69b1527 100644 +index 16e416d..68dd9a0 100644 --- a/Source/WTF/wtf/Compiler.h +++ b/Source/WTF/wtf/Compiler.h -@@ -290,7 +290,7 @@ +@@ -293,7 +293,7 @@ #if COMPILER(CLANG) #if __SIZEOF_POINTER__ == 8 #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute) --#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) -+#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(__arm__) +-#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32) ++#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32) && !defined(__arm__) #define MUST_TAIL_CALL [[clang::musttail]] - #endif + #define HAVE_MUST_TAIL_CALL 1 #endif diff --git a/meta/recipes-sato/webkit/webkitgtk_2.46.6.bb b/meta/recipes-sato/webkit/webkitgtk_2.48.0.bb similarity index 97% rename from meta/recipes-sato/webkit/webkitgtk_2.46.6.bb rename to meta/recipes-sato/webkit/webkitgtk_2.48.0.bb index d1f24bbbf70..cb4e09662f7 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.46.6.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.48.0.bb @@ -15,10 +15,9 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ file://no-musttail-arm.patch \ file://t6-not-declared.patch \ - file://bmalloc-fix.patch \ file://sys_futex.patch \ " -SRC_URI[sha256sum] = "f2b31de693220ba9bab76ce6ddfe5b0bfab2515cb2b0a70f3c54d4050766c32b" +SRC_URI[sha256sum] = "94904a55cf12d44a4e36ceadafff02d46da73d76be9b4769f34cbfdf0eebf88e" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen @@ -81,6 +80,7 @@ PACKAGECONFIG[jpegxl] = "-DUSE_JPEGXL=ON,-DUSE_JPEGXL=OFF,libjxl" PACKAGECONFIG[backtrace] = "-DUSE_LIBBACKTRACE=ON,-DUSE_LIBBACKTRACE=OFF,libbacktrace" PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette" PACKAGECONFIG[sysprof-capture] = "-DUSE_SYSTEM_SYSPROF_CAPTURE=YES,-DUSE_SYSTEM_SYSPROF_CAPTURE=NO,sysprof" +PACKAGECONFIG[speech] = "-DENABLE_SPEECH_SYNTHESIS=ON,-DENABLE_SPEECH_SYNTHESIS=OFF,flite" EXTRA_OECMAKE = " \ -DPORT=GTK \ -- 2.47.3