From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/
Date: Mon, 11 Nov 2024 23:33:42 +0000 (UTC) [thread overview]
Message-ID: <1731367976.401e6c9f7882c77a9abbb33f08f1e6791086ab31.sam@gentoo> (raw)
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 <don.olmstead@sony.com>
+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() {
next reply other threads:[~2024-11-11 23:33 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-11 23:33 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-05 4:45 [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ Sam James
2025-06-06 15:12 Michael Orlitzky
2024-10-27 12:47 Michael Orlitzky
2024-07-21 8:19 Pacho Ramos
2024-03-21 2:45 Sam James
2024-01-03 21:59 Mart Raudsepp
2023-12-24 15:54 Mart Raudsepp
2023-10-18 20:19 Mart Raudsepp
2023-05-30 17:16 Matt Turner
2023-05-18 14:41 Matt Turner
2023-04-05 23:21 Sam James
2023-04-02 0:57 Matt Turner
2023-03-30 16:38 Sam James
2022-12-04 19:42 Matt Turner
2022-09-13 17:56 Matt Turner
2022-04-20 2:33 Matt Turner
2022-01-10 23:48 Mart Raudsepp
2022-01-02 22:46 Mart Raudsepp
2021-08-04 22:36 Matt Turner
2021-02-20 9:44 Mart Raudsepp
2020-07-30 21:18 Mart Raudsepp
2020-05-12 15:53 Mart Raudsepp
2020-05-09 20:40 Mart Raudsepp
2020-02-17 21:54 Mart Raudsepp
2020-02-05 13:06 Mart Raudsepp
2020-01-02 16:47 Mart Raudsepp
2018-08-16 21:33 Mart Raudsepp
2017-06-01 13:30 Mart Raudsepp
2017-05-10 10:40 Mart Raudsepp
2017-04-08 22:00 Mart Raudsepp
2016-07-03 15:38 Pacho Ramos
2016-05-29 10:06 Pacho Ramos
2015-11-15 21:03 Pacho Ramos
2015-11-07 11:12 Pacho Ramos
2015-11-07 11:07 Pacho Ramos
2015-08-24 5:59 Jeroen Roovers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1731367976.401e6c9f7882c77a9abbb33f08f1e6791086ab31.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox