summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2024-11-23 11:00:59 -0800
committerKhem Raj <raj.khem@gmail.com>2024-11-23 18:36:10 -0800
commit114921b761268f6b5a5a9d5c3298562aa59475d8 (patch)
treefba6e5581e451167f25606e7870aebd9ae3082d2
parent7f3fb9e8863b1700c03d252e06b14709e5bca0b0 (diff)
downloadmeta-openembedded-114921b761268f6b5a5a9d5c3298562aa59475d8.tar.gz
webkitgtk3: Fix build with ICU-76+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Support-ICU-76.1-build.patch36
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Support-ICU-76.1-build.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Support-ICU-76.1-build.patch
new file mode 100644
index 0000000000..31535e7ae2
--- /dev/null
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Support-ICU-76.1-build.patch
@@ -0,0 +1,36 @@
1From 57b80aa00be614218552fda67b2bf8d535b4f4cf 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-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb
index 01eefe13de..3eaade5399 100644
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb
@@ -17,6 +17,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \
17 file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ 17 file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \
18 file://0001-Fix-build-issues-with-latest-Clang.patch \ 18 file://0001-Fix-build-issues-with-latest-Clang.patch \
19 file://fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch \ 19 file://fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch \
20 file://0001-Support-ICU-76.1-build.patch \
20 " 21 "
21SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54" 22SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54"
22 23