summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYogita Urade <yogita.urade@windriver.com>2025-02-12 11:06:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-02-18 11:56:04 +0000
commit4dbdf179ba4bf1902409dd37a1ec9729bb4d8fa9 (patch)
tree2d139871ed24e8cac7fbb2ed0aa099e1a298d21d /meta
parent76e071a79b8f0e2ce9010725297db4b01fd9ec62 (diff)
downloadpoky-4dbdf179ba4bf1902409dd37a1ec9729bb4d8fa9.tar.gz
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. (From OE-Core rev: 289e09c1a090d06146406886d4763dd22203c231) Signed-off-by: Yogita Urade <yogita.urade@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch36
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.46.6.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.46.5.bb)3
2 files changed, 1 insertions, 38 deletions
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 24f484e5e3..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 8b0ff0f2e2882f200f1c21ec76fa679444cb1c43 Mon Sep 17 00:00:00 2001
2From: Jason Schonberg <schonm@gmail.com>
3Date: Wed, 20 Nov 2024 11:05:52 -0500
4Subject: [PATCH] Support ICU 76.1 build
5
6https://bugs.webkit.org/show_bug.cgi?id=282120
7
8Reviewed by Yusuke Suzuki.
9
10In ICU 76.1 an additional macro `U_SHOW_CPLUSPLUS_HEADER_API` was added to
11control visibility of the C++ API within ICU. Set this value to `0` since WebKit
12wants to only use the C API.
13
14* Source/WTF/wtf/Platform.h:
15
16Canonical link: https://commits.webkit.org/285727@main
17
18Upstream-Status: Backport [ from webkitgtk-2.47.1 https://github.com/WebKit/WebKit/commit/63f7badbada070ebaadd318b2801818ecf7e7ea0 ]
19
20Signed-off-by: Jason Schonberg <schonm@gmail.com>
21---
22 Source/WTF/wtf/Platform.h | 1 +
23 1 file changed, 1 insertion(+)
24
25diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
26index 23070df2..51a8dce9 100644
27--- a/Source/WTF/wtf/Platform.h
28+++ b/Source/WTF/wtf/Platform.h
29@@ -115,6 +115,7 @@
30 /* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */
31 #define U_HIDE_DEPRECATED_API 1
32 #define U_SHOW_CPLUSPLUS_API 0
33+#define U_SHOW_CPLUSPLUS_HEADER_API 0
34 #ifdef __cplusplus
35 #define UCHAR_TYPE char16_t
36 #endif
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.46.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.46.6.bb
index 8c6ffdc8a7..d1f24bbbf7 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 \
15 file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ 15 file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \
16 file://no-musttail-arm.patch \ 16 file://no-musttail-arm.patch \
17 file://t6-not-declared.patch \ 17 file://t6-not-declared.patch \
18 file://0001-Support-ICU-76.1-build.patch \
19 file://bmalloc-fix.patch \ 18 file://bmalloc-fix.patch \
20 file://sys_futex.patch \ 19 file://sys_futex.patch \
21 " 20 "
22SRC_URI[sha256sum] = "bad4020bb0cfb3e740df3082c2d9cbf67cf4095596588a56aecdde6702137805" 21SRC_URI[sha256sum] = "f2b31de693220ba9bab76ce6ddfe5b0bfab2515cb2b0a70f3c54d4050766c32b"
23 22
24inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen 23inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
25 24