Message ID | 20250319081610.3536475-1-raj.khem@gmail.com |
---|---|
State | Accepted, archived |
Commit | a80e06186e919c72b352103e87a9921073d81213 |
Headers | show |
Series | [v3,01/27] webkitgtk: 2.46.6 -> 2.48.0 | expand |
Hi Khem, I appreciate this patch series is a work in progress and evolving but it is creating a headache for those trying to help merge patches. The problem is that we have bits of this series already going through testing/review. We now have a v3 and no idea which bits of it have changed. The logical thing for us to do is throw away what we've done and start again. If you could give an idea of what has changed that would help. Cheers, Richard
On Wed, Mar 19, 2025 at 2:40 AM Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > > Hi Khem, > > I appreciate this patch series is a work in progress and evolving but > it is creating a headache for those trying to help merge patches. > > The problem is that we have bits of this series already going through > testing/review. We now have a v3 and no idea which bits of it have > changed. The logical thing for us to do is throw away what we've done > and start again. If you could give an idea of what has changed that > would help. > Yeah, I was trying to hurry a bit and pulling many strings together, sending patches upstream, addressing that feedback where needed and also ensuring test combinations are working, probably a cover letter would have been better v2 - Address feedback from Mathieu and Alex except ncurses and man-db patch, fix webkit to work with clang-20 v3 - man-db fix is enhanced to address root cause which is musl specific and had to do more sadly, address ncurses issue The good thing is the changes are done now. I do see some parts of these changes are already merged so I will send the remaining in v4 after rebase. > Cheers, > > Richard > >
On Wed, 2025-03-19 at 09:07 -0700, Khem Raj wrote: > On Wed, Mar 19, 2025 at 2:40 AM Richard Purdie > <richard.purdie@linuxfoundation.org> wrote: > > > > Hi Khem, > > > > I appreciate this patch series is a work in progress and evolving but > > it is creating a headache for those trying to help merge patches. > > > > The problem is that we have bits of this series already going through > > testing/review. We now have a v3 and no idea which bits of it have > > changed. The logical thing for us to do is throw away what we've done > > and start again. If you could give an idea of what has changed that > > would help. > > > > Yeah, I was trying to hurry a bit and pulling many strings together, > sending patches upstream, addressing that feedback where needed and > also ensuring > test combinations are working, probably a cover letter would have been better > > v2 - Address feedback from Mathieu and Alex except ncurses and man-db > patch, fix webkit to work with clang-20 > v3 - man-db fix is enhanced to address root cause which is musl > specific and had to do more sadly, address ncurses issue > > The good thing is the changes are done now. I do see some parts of > these changes are already merged so I will send the remaining in v4 > after rebase. Sounds good thanks. I did go through and tried to isolate the bits which hadn't changed and had been tested. I've upgraded dbus-glib, could you check and see if the new version needs gcc 15 fixes or not please? I also merged fixes for the libmatchbox and psplash recipes so my patches should replace yours there. Resending what is left is the best way forward once those are resolved. Cheers, Richard
On Wed, Mar 19, 2025 at 9:11 AM Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > > On Wed, 2025-03-19 at 09:07 -0700, Khem Raj wrote: > > On Wed, Mar 19, 2025 at 2:40 AM Richard Purdie > > <richard.purdie@linuxfoundation.org> wrote: > > > > > > Hi Khem, > > > > > > I appreciate this patch series is a work in progress and evolving but > > > it is creating a headache for those trying to help merge patches. > > > > > > The problem is that we have bits of this series already going through > > > testing/review. We now have a v3 and no idea which bits of it have > > > changed. The logical thing for us to do is throw away what we've done > > > and start again. If you could give an idea of what has changed that > > > would help. > > > > > > > Yeah, I was trying to hurry a bit and pulling many strings together, > > sending patches upstream, addressing that feedback where needed and > > also ensuring > > test combinations are working, probably a cover letter would have been better > > > > v2 - Address feedback from Mathieu and Alex except ncurses and man-db > > patch, fix webkit to work with clang-20 > > v3 - man-db fix is enhanced to address root cause which is musl > > specific and had to do more sadly, address ncurses issue > > > > The good thing is the changes are done now. I do see some parts of > > these changes are already merged so I will send the remaining in v4 > > after rebase. > > Sounds good thanks. I did go through and tried to isolate the bits > which hadn't changed and had been tested. > > I've upgraded dbus-glib, could you check and see if the new version > needs gcc 15 fixes or not please? yeah will factor that into v4 > > I also merged fixes for the libmatchbox and psplash recipes so my > patches should replace yours there. > I also see you have bluez5 fix in master-next as well, I will drop that one too in v4 > Resending what is left is the best way forward once those are resolved. > > Cheers, > > Richard > >
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 \