commit: 401e6c9f7882c77a9abbb33f08f1e6791086ab31 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Mon Nov 11 23:24:07 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 11 23:32:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=401e6c9f
net-libs/webkit-gtk: fix build against icu-76.1 Closes: https://bugs.gentoo.org/943213 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/39279 Signed-off-by: Sam James <sam <AT> gentoo.org> net-libs/webkit-gtk/files/2.44.4-fix-icu76.1.patch | 31 ++++++++++++++++++++++ net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild | 3 +++ net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild | 3 +++ net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild | 3 +++ net-libs/webkit-gtk/webkit-gtk-2.46.3-r410.ebuild | 3 +++ net-libs/webkit-gtk/webkit-gtk-2.46.3-r600.ebuild | 3 +++ net-libs/webkit-gtk/webkit-gtk-2.46.3.ebuild | 3 +++ 7 files changed, 49 insertions(+) diff --git a/net-libs/webkit-gtk/files/2.44.4-fix-icu76.1.patch b/net-libs/webkit-gtk/files/2.44.4-fix-icu76.1.patch new file mode 100644 index 000000000000..f60c1651a04f --- /dev/null +++ b/net-libs/webkit-gtk/files/2.44.4-fix-icu76.1.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/943213 +https://bugs.webkit.org/show_bug.cgi?id=282120 +https://github.com/WebKit/WebKit/commit/63f7badbada070ebaadd318b2801818ecf7e7ea0 +https://github.com/WebKit/WebKit/pull/35743 +https://unicode-org.atlassian.net/jira/software/c/projects/ICU/issues/ICU-22954 + +From 63f7badbada070ebaadd318b2801818ecf7e7ea0 Mon Sep 17 00:00:00 2001 +From: Don Olmstead <[email protected]> +Date: Sat, 26 Oct 2024 08:27:01 -0700 +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 +--- 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/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild index 77ed6220696d..af6e307d9688 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild @@ -147,6 +147,9 @@ src_prepare() { # Fix USE=-jumbo-build on all arches eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch + + # https://bugs.gentoo.org/943213 + eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild index 97b056b6ff61..7616ee5591fd 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild @@ -158,6 +158,9 @@ src_prepare() { # Fix USE=-jumbo-build on all arches eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch + + # https://bugs.gentoo.org/943213 + eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild index bf59ee2d2456..b464622a4586 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild @@ -145,6 +145,9 @@ src_prepare() { # Fix USE=-jumbo-build on all arches eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch + + # https://bugs.gentoo.org/943213 + eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.3-r410.ebuild index 2b20ac28e17d..bebba1c1ac51 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.46.3-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.46.3-r410.ebuild @@ -150,6 +150,9 @@ pkg_setup() { src_prepare() { cmake_src_prepare gnome2_src_prepare + + # https://bugs.gentoo.org/943213 + eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.3-r600.ebuild index 9943c5467da0..47d64a4da39e 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.46.3-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.46.3-r600.ebuild @@ -161,6 +161,9 @@ pkg_setup() { src_prepare() { cmake_src_prepare gnome2_src_prepare + + # https://bugs.gentoo.org/943213 + eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.3.ebuild index c7591b6bc2df..d3b68f9e5291 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.46.3.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.46.3.ebuild @@ -150,6 +150,9 @@ pkg_setup() { src_prepare() { cmake_src_prepare gnome2_src_prepare + + # https://bugs.gentoo.org/943213 + eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch } src_configure() {
