From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B0157158042 for ; Mon, 11 Nov 2024 23:33:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A81B4E07EA; Mon, 11 Nov 2024 23:33:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90399E07EA for ; Mon, 11 Nov 2024 23:33:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A329C335D1C for ; Mon, 11 Nov 2024 23:33:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B92861626 for ; Mon, 11 Nov 2024 23:33:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1731367976.401e6c9f7882c77a9abbb33f08f1e6791086ab31.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/webkit-gtk/files/2.44.4-fix-icu76.1.patch net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild net-libs/webkit-gtk/webkit-gtk-2.46.3-r410.ebuild net-libs/webkit-gtk/webkit-gtk-2.46.3-r600.ebuild net-libs/webkit-gtk/webkit-gtk-2.46.3.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 401e6c9f7882c77a9abbb33f08f1e6791086ab31 X-VCS-Branch: master Date: Mon, 11 Nov 2024 23:33:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a921db2b-5511-4669-b266-8aba96677272 X-Archives-Hash: c5abb3cdf1289dfbfb2d7b489fa475f5 commit: 401e6c9f7882c77a9abbb33f08f1e6791086ab31 Author: Alfred Wingate protonmail com> AuthorDate: Mon Nov 11 23:24:07 2024 +0000 Commit: Sam James gentoo 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 protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/39279 Signed-off-by: Sam James 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 +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() {