From: Yogita Urade Date: Wed, 12 Feb 2025 11:06:29 +0000 (+0000) Subject: webkitgtk: upgrade 2.46.5 -> 2.46.6 X-Git-Tag: yocto-5.2~482 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=289e09c1a090d06146406886d4763dd22203c231;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git webkitgtk: upgrade 2.46.5 -> 2.46.6 Includes fix for CVE-2025-24143, CVE-2025-24150, CVE-2025-24158 and CVE-2025-24162 Drop 0001-Support-ICU-76.1-build.patch fix is part of upgrade. Changelog: ========== - Fix a crash when enabling Skia CPU rendering. - Fix several crashes and rendering issues. Signed-off-by: Yogita Urade Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch deleted file mode 100644 index 24f484e5e3b..00000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8b0ff0f2e2882f200f1c21ec76fa679444cb1c43 Mon Sep 17 00:00:00 2001 -From: Jason Schonberg -Date: Wed, 20 Nov 2024 11:05:52 -0500 -Subject: [PATCH] Support ICU 76.1 build - -https://bugs.webkit.org/show_bug.cgi?id=282120 - -Reviewed by Yusuke Suzuki. - -In ICU 76.1 an additional macro `U_SHOW_CPLUSPLUS_HEADER_API` was added to -control visibility of the C++ API within ICU. Set this value to `0` since WebKit -wants to only use the C API. - -* Source/WTF/wtf/Platform.h: - -Canonical link: https://commits.webkit.org/285727@main - -Upstream-Status: Backport [ from webkitgtk-2.47.1 https://github.com/WebKit/WebKit/commit/63f7badbada070ebaadd318b2801818ecf7e7ea0 ] - -Signed-off-by: Jason Schonberg ---- - Source/WTF/wtf/Platform.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 23070df2..51a8dce9 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -115,6 +115,7 @@ - /* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */ - #define U_HIDE_DEPRECATED_API 1 - #define U_SHOW_CPLUSPLUS_API 0 -+#define U_SHOW_CPLUSPLUS_HEADER_API 0 - #ifdef __cplusplus - #define UCHAR_TYPE char16_t - #endif diff --git a/meta/recipes-sato/webkit/webkitgtk_2.46.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.46.6.bb similarity index 98% rename from meta/recipes-sato/webkit/webkitgtk_2.46.5.bb rename to meta/recipes-sato/webkit/webkitgtk_2.46.6.bb index 8c6ffdc8a73..d1f24bbbf70 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.46.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.46.6.bb @@ -15,11 +15,10 @@ 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://0001-Support-ICU-76.1-build.patch \ file://bmalloc-fix.patch \ file://sys_futex.patch \ " -SRC_URI[sha256sum] = "bad4020bb0cfb3e740df3082c2d9cbf67cf4095596588a56aecdde6702137805" +SRC_URI[sha256sum] = "f2b31de693220ba9bab76ce6ddfe5b0bfab2515cb2b0a70f3c54d4050766c32b" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen