All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 01/24] webkitgtk: 2.46.6 -> 2.48.0
@ 2025-03-18  4:38 Khem Raj
  2025-03-18  4:38 ` [PATCH 02/24] webkitgtk: Add packageconfig for assertions Khem Raj
                   ` (22 more replies)
  0 siblings, 23 replies; 40+ messages in thread
From: Khem Raj @ 2025-03-18  4:38 UTC (permalink / raw)
  To: openembedded-core; +Cc: Kai Kang, Khem Raj

From: Kai Kang <kai.kang@windriver.com>

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 <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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 <wiz@gatalith.at>
-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 <alex@linutronix.de>
----
- 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 <raj.khem@gmail.com>
+
+Update context for webkitgtk 2.48.0.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
 ---
  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 \


^ permalink raw reply related	[flat|nested] 40+ messages in thread

end of thread, other threads:[~2025-03-19  8:20 UTC | newest]

Thread overview: 40+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-18  4:38 [PATCH 01/24] webkitgtk: 2.46.6 -> 2.48.0 Khem Raj
2025-03-18  4:38 ` [PATCH 02/24] webkitgtk: Add packageconfig for assertions Khem Raj
2025-03-18  4:38 ` [PATCH 03/24] webkitgtk: Fix build with clang-20 Khem Raj
2025-03-18  4:38 ` [PATCH 04/24] libpam: add ptest cases back Khem Raj
2025-03-18  4:38 ` [PATCH 05/24] ncurses: Upgrade to v6_5_20250315 Khem Raj
2025-03-18  9:38   ` [OE-core] " Alexander Kanavin
2025-03-18 16:08     ` Khem Raj
2025-03-18 16:20       ` Alexander Kanavin
     [not found]       ` <182DF220561FBBD8.16918@lists.openembedded.org>
2025-03-18 16:31         ` Alexander Kanavin
2025-03-18  4:38 ` [PATCH 06/24] gdbm: Use C11 standard Khem Raj
2025-03-18  4:38 ` [PATCH 07/24] bluez: Fix build with GCC-15 Khem Raj
2025-03-18  4:38 ` [PATCH 08/24] readline: Fixed " Khem Raj
2025-03-18  4:56   ` Patchtest results for " patchtest
2025-03-18  9:39   ` [OE-core] " Alexander Kanavin
     [not found]   ` <182DDC388EFCF3D4.9747@lists.openembedded.org>
2025-03-18  9:51     ` Alexander Kanavin
2025-03-18 16:19       ` Khem Raj
2025-03-18  4:38 ` [PATCH 09/24] bash: Stick to C17 std Khem Raj
2025-03-18  4:38 ` [PATCH 10/24] tcp-wrappers: Stick to C17 standard Khem Raj
2025-03-18  4:38 ` [PATCH 11/24] libsndfile1: Include <stdbool.h> instead of redefining bool true and false Khem Raj
2025-03-18  4:56   ` Patchtest results for " patchtest
2025-03-18  4:38 ` [PATCH 12/24] e2fsprogs: Fix build failure with gcc 15 Khem Raj
2025-03-18  4:38 ` [PATCH 13/24] man-db: Add missing rdep for col utility Khem Raj
2025-03-18 15:47   ` [OE-core] " Mathieu Dubois-Briand
2025-03-19  8:19     ` Khem Raj
2025-03-18  4:38 ` [PATCH 14/24] dbus-glib: Fix build with GCC 15 Khem Raj
2025-03-18  4:38 ` [PATCH 15/24] libmatchbox: Fix build with gcc-15 Khem Raj
2025-03-18  4:56   ` Patchtest results for " patchtest
2025-03-18  4:38 ` [PATCH 16/24] ppp: Fix build when shadow is enabled Khem Raj
2025-03-18  4:38 ` [PATCH 17/24] unzip: Fix build with GCC-15 Khem Raj
2025-03-18  4:56   ` Patchtest results for " patchtest
2025-03-18  4:38 ` [PATCH 18/24] makedumpfile: " Khem Raj
2025-03-18  4:38 ` [PATCH 19/24] cpio: Pin to use C17 std Khem Raj
2025-03-18  4:38 ` [PATCH 20/24] expect: Fix build with GCC 15 Khem Raj
2025-03-18  4:38 ` [PATCH 21/24] cronie: Resolve build failure with GCC15 Khem Raj
2025-03-18  4:38 ` [PATCH 22/24] time: Fix build with GCC 15 Khem Raj
2025-03-18 13:12   ` [OE-core] " Mathieu Dubois-Briand
2025-03-19  8:20     ` Khem Raj
2025-03-18  4:38 ` [PATCH 23/24] psplash: " Khem Raj
2025-03-18  4:56   ` Patchtest results for " patchtest
2025-03-18  4:38 ` [PATCH 24/24] at: Remove mktime signature from posixtm.c Khem Raj

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.