commit 59267fa41366dbd2654323f6f8bce9e83930e5fc
Author: Jan Palus <at...@pld-linux.org>
Date: Sat Jan 18 10:22:38 2025 +0100
upstream patch to fix build with icu 76
gtk-webkit4.spec | 10 ++++++----
icu76.patch | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 4 deletions(-)
---
diff --git a/gtk-webkit4.spec b/gtk-webkit4.spec
index c2d3d93..e06c0ea 100644
--- a/gtk-webkit4.spec
+++ b/gtk-webkit4.spec
@@ -33,6 +33,7 @@ Patch0: x32.patch
Patch1: %{name}-icu59.patch
Patch2: parallel-gir.patch
Patch3: %{name}-driver-version-suffix.patch
+Patch4: icu76.patch
URL: https://webkitgtk.org/
BuildRequires: /usr/bin/ld.gold
BuildRequires: EGL-devel
@@ -306,10 +307,11 @@ Dokumentacja API portu WebKitu do GTK 4.
%prep
%setup -q -n webkitgtk-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
%build
%if %{with lowmem}
diff --git a/icu76.patch b/icu76.patch
new file mode 100644
index 0000000..a3d4310
--- /dev/null
+++ b/icu76.patch
@@ -0,0 +1,36 @@
+From aa29001ade54425699e1345ce41bbd227dba805c Mon Sep 17 00:00:00 2001
+From: Don Olmstead <don.olmst...@sony.com>
+Date: Sat, 26 Oct 2024 08:27:01 -0700
+Subject: [PATCH] Cherry-pick 285727@main (63f7badbada0).
+ https://bugs.webkit.org/show_bug.cgi?id=282120
+
+ 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
+
+Canonical link: https://commits.webkit.org/282416.378@webkitglib/2.46
+---
+ Source/WTF/wtf/Platform.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 23070df2937ba..51a8dce97755e 100644
+--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit4.git/commitdiff/59267fa41366dbd2654323f6f8bce9e83930e5fc
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
