[packages/gtk-webkit] - patches to build with libicu 74+ and libxml2 2.12+

[qboosh]

commit be77d969aec83f95dcab99c093d3d3467644383e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Mar 10 18:47:37 2025 +0100

    - patches to build with libicu 74+ and libxml2 2.12+

 gtk-webkit-c++14.patch   | 18 ++++++++++++++++++
 gtk-webkit-libxml2.patch | 22 ++++++++++++++++++++++
 gtk-webkit.spec          | 36 ++++++++++++++++++++----------------
 3 files changed, 60 insertions(+), 16 deletions(-)
---
diff --git a/gtk-webkit.spec b/gtk-webkit.spec
index 424c300..d429bd7 100644
--- a/gtk-webkit.spec
+++ b/gtk-webkit.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without	introspection	# disable introspection
+%bcond_without	introspection	# GObject introspection
 #
 # it's not possible to build this with debuginfo on 32bit archs due to
 # memory constraints during linking
@@ -15,7 +15,7 @@ Version:	2.4.11
 Release:	14
 License:	BSD-like
 Group:		X11/Libraries
-Source0:	http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
+Source0:	https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 # Source0-md5:	24a25ccc30a7914ae50922aedf24b7bc
 Patch0:		x32.patch
 Patch1:		abs.patch
@@ -25,6 +25,8 @@ Patch4:		glib2.68.patch
 Patch5:		icu68.patch
 Patch6:		grammar.patch
 Patch7:		volatile.patch
+Patch8:		%{name}-c++14.patch
+Patch9:		%{name}-libxml2.patch
 URL:		http://webkitgtk.org/
 BuildRequires:	/usr/bin/ld.gold
 BuildRequires:	EGL-devel
@@ -47,7 +49,6 @@ BuildRequires:	glibc-misc
 BuildRequires:	gperf
 BuildRequires:	gstreamer-devel >= 1.0.3
 BuildRequires:	gstreamer-plugins-base-devel >= 1.0.3
-BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	gtk+2-devel >= 2:2.24.10
 BuildRequires:	gtk-doc >= 1.10
 BuildRequires:	harfbuzz-devel >= 0.9.7
@@ -57,7 +58,7 @@ BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libsecret-devel
 BuildRequires:	libsoup-devel >= 2.42.0
-BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-devel >= 6:7
 # libtool with -fuse-ld= gcc option support
 BuildRequires:	libtool >= 2:2.4.2-13
 BuildRequires:	libwebp-devel
@@ -114,7 +115,7 @@ Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel >= 1:2.36.0
 Requires:	gtk+2-devel >= 2:2.24.10
 Requires:	libsoup-devel >= 2.42.0
-Requires:	libstdc++-devel
+Requires:	libstdc++-devel >= 6:7
 
 %description devel
 Development files for WebKit for GTK+ 2.
@@ -124,14 +125,19 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
 
 %prep
 %setup -q -n webkitgtk-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
+%patch -P6 -p1
+%patch -P7 -p1
+%patch -P8 -p1
+%patch -P9 -p1
+
+# required by icu 76
+%{__sed} -i -e 's/-std=c++11/-std=c++17/' Source/autotools/SetupCompilerFlags.m4
 
 %build
 %{__libtoolize}
@@ -139,9 +145,7 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%if "%{cxx_version}" >= "4.9"
-CXXFLAGS="%{rpmcxxflags} -fno-delete-null-pointer-checks"
-%endif
+CXXFLAGS="%{rpmcxxflags} -fno-delete-null-pointer-checks -Wno-expansion-to-defined"
 %configure \
 %ifarch %{x8664}
 	LDFLAGS="%{rpmldflags} -fuse-ld=gold" \
diff --git a/gtk-webkit-c++14.patch b/gtk-webkit-c++14.patch
new file mode 100644
index 0000000..e2dbc86
--- /dev/null
+++ b/gtk-webkit-c++14.patch
@@ -0,0 +1,18 @@
+--- webkitgtk-2.4.11/Source/WTF/wtf/StdLibExtras.h.orig	2016-04-10 08:48:36.000000000 +0200
++++ webkitgtk-2.4.11/Source/WTF/wtf/StdLibExtras.h	2025-03-10 06:18:43.563476105 +0100
+@@ -321,6 +321,7 @@ namespace std {
+ }
+ #endif
+ 
++#if __cplusplus < 201402L
+ // This adds various C++14 features for versions of the STL that may not yet have them.
+ namespace std {
+ // MSVC 2013 supports std::make_unique already.
+@@ -391,6 +392,7 @@ namespace chrono_literals {
+ }
+ #endif
+ }
++#endif
+ 
+ using WTF::KB;
+ using WTF::MB;
diff --git a/gtk-webkit-libxml2.patch b/gtk-webkit-libxml2.patch
new file mode 100644
index 0000000..3f939ec
--- /dev/null
+++ b/gtk-webkit-libxml2.patch
@@ -0,0 +1,22 @@
+--- webkitgtk-2.4.11/Source/WebCore/xml/XSLTProcessor.h.orig	2016-04-10 08:48:37.000000000 +0200
++++ webkitgtk-2.4.11/Source/WebCore/xml/XSLTProcessor.h	2025-03-10 17:49:28.314567044 +0100
+@@ -64,7 +64,7 @@ public:
+ 
+     void reset();
+ 
+-    static void parseErrorFunc(void* userData, xmlError*);
++    static void parseErrorFunc(void* userData, const xmlError*);
+     static void genericErrorFunc(void* userData, const char* msg, ...);
+     
+     // Only for libXSLT callbacks
+--- webkitgtk-2.4.11/Source/WebCore/xml/XSLTProcessorLibxslt.cpp.orig	2016-04-10 08:48:37.000000000 +0200
++++ webkitgtk-2.4.11/Source/WebCore/xml/XSLTProcessorLibxslt.cpp	2025-03-10 17:50:13.763455506 +0100
+@@ -77,7 +77,7 @@ void XSLTProcessor::genericErrorFunc(voi
+     // It would be nice to do something with this error message.
+ }
+ 
+-void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error)
++void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error)
+ {
+     PageConsole* console = static_cast<PageConsole*>(userData);
+     if (!console)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit.git/commitdiff/be77d969aec83f95dcab99c093d3d3467644383e