[packages/wpe-webkit1.1] - updated to 2.46.6; add -DNDEBUG not being in effect in current cmake macro

qboosh qboosh at pld-linux.org
Sat Mar 8 08:25:46 CET 2025


commit ce3fd84b1e7a1f3bc7ca547398d5f2f6b09bd12a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 8 07:08:20 2025 +0100

    - updated to 2.46.6; add -DNDEBUG not being in effect in current cmake macro

 icu76.patch        | 36 ------------------------------------
 wpe-webkit1.1.spec | 12 ++++--------
 2 files changed, 4 insertions(+), 44 deletions(-)
---
diff --git a/wpe-webkit1.1.spec b/wpe-webkit1.1.spec
index a32c5ea..fc58c6e 100644
--- a/wpe-webkit1.1.spec
+++ b/wpe-webkit1.1.spec
@@ -22,16 +22,15 @@ Summary:	Port of WebKit embeddable web component to WPE with HTTP/2 support
 Summary(pl.UTF-8):	Port osadzalnego komponentu WWW WebKit do WPE z obsługą HTTP/2
 Name:		wpe-webkit1.1
 # NOTE: 2.44.x is stable, 2.45.x devel
-Version:	2.46.1
-Release:	2
+Version:	2.46.6
+Release:	1
 License:	BSD-like
 Group:		X11/Libraries
 Source0:	https://wpewebkit.org/releases/wpewebkit-%{version}.tar.xz
-# Source0-md5:	eec67852662a3498680f72041120fc11
+# Source0-md5:	7a649e1795e24dc7b0aaf2371b04f1d7
 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
@@ -234,12 +233,9 @@ Dokumentacja API portu WebKitu do WPE z obsługą HTTP/2.
 %patch -P0 -p1
 %patch -P2 -p1
 %patch -P3 -p1
-%patch -P4 -p1
 
 %build
-%if %{with lowmem}
-CXXFLAGS="%{rpmcxxflags} -DNDEBUG --param ggc-min-expand=20 --param ggc-min-heapsize=65536"
-%endif
+CXXFLAGS="%{rpmcxxflags} -DNDEBUG %{?with_lowmem:--param ggc-min-expand=20 --param ggc-min-heapsize=65536}"
 for kind in %{?with_api_1_1:soup3-1.1} %{?with_api_2_0:soup3-2.0} ; do
 %cmake -B build-${kind} \
 	-DENABLE_GEOLOCATION=ON \
diff --git a/icu76.patch b/icu76.patch
deleted file mode 100644
index a3d4310..0000000
--- a/icu76.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/ce3fd84b1e7a1f3bc7ca547398d5f2f6b09bd12a



More information about the pld-cvs-commit mailing list