[packages/wpe-webkit1.1] - rel 2, usptream fix for icu 76 copied from wpe-webkit package

baggins baggins at pld-linux.org
Fri Jan 31 10:21:50 CET 2025


commit a025da8d496295d3ffce7e88dd8f249b0d4b7b08
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Jan 31 10:11:40 2025 +0100

    - rel 2, usptream fix for icu 76 copied from wpe-webkit package

 icu76.patch        | 36 ++++++++++++++++++++++++++++++++++++
 wpe-webkit1.1.spec |  4 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)
---
diff --git a/wpe-webkit1.1.spec b/wpe-webkit1.1.spec
index a0412d9..0ca6fa8 100644
--- a/wpe-webkit1.1.spec
+++ b/wpe-webkit1.1.spec
@@ -23,7 +23,7 @@ Summary(pl.UTF-8):	Port osadzalnego komponentu WWW WebKit do WPE z obsługą HTT
 Name:		wpe-webkit1.1
 # NOTE: 2.44.x is stable, 2.45.x devel
 Version:	2.46.1
-Release:	1
+Release:	2
 License:	BSD-like
 Group:		X11/Libraries
 Source0:	https://wpewebkit.org/releases/wpewebkit-%{version}.tar.xz
@@ -31,6 +31,7 @@ Source0:	https://wpewebkit.org/releases/wpewebkit-%{version}.tar.xz
 Patch0:		wpe-webkit-x32.patch
 Patch2:		wpe-webkit-driver-version-suffix.patch
 Patch3:		parallel-gir.patch
+Patch4:		icu76.patch
 URL:		https://wpewebkit.org/
 BuildRequires:	/usr/bin/ld.gold
 BuildRequires:	EGL-devel
@@ -233,6 +234,7 @@ Dokumentacja API portu WebKitu do WPE z obsługą HTTP/2.
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -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.olmstead at sony.com>
+Date: Sat, 26 Oct 2024 08:27:01 -0700
+Subject: [PATCH] Cherry-pick 285727 at 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/wpe-webkit1.1.git/commitdiff/a025da8d496295d3ffce7e88dd8f249b0d4b7b08



More information about the pld-cvs-commit mailing list