commit a48fbdfae1a97c7c91d821d1e5622b61a31e45b7
Author: Jan Palus <at...@pld-linux.org>
Date: Tue Nov 28 01:33:57 2023 +0100
fix build with libxml2 >= 2.12
libxml2.12.patch | 36 ++++++++++++++++++++++++++++++++++++
qt6.spec | 2 ++
2 files changed, 38 insertions(+)
---
diff --git a/qt6.spec b/qt6.spec
index da3a390..56dffa5 100644
--- a/qt6.spec
+++ b/qt6.spec
@@ -122,6 +122,7 @@ Patch4: x32.patch
Patch5: qtwebengine-cmake-build-type.patch
Patch6: libxkbcommon1.6.patch
Patch7: ffmpeg-binutils.patch
+Patch8: libxml2.12.patch
URL: https://www.qt.io/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: EGL-devel
@@ -3647,6 +3648,7 @@ narzędzia.
%patch5 -p1
%patch6 -p1 -d qtbase
%patch7 -p1 -d qtwebengine/src/3rdparty
+%patch8 -p1 -d qtwebengine
%{__sed} -i -e 's,usr/X11R6/,usr/,g' qtbase/mkspecs/linux-g++-64/qmake.conf
diff --git a/libxml2.12.patch b/libxml2.12.patch
new file mode 100644
index 0000000..0e93868
--- /dev/null
+++ b/libxml2.12.patch
@@ -0,0 +1,36 @@
+---
qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h.orig
2023-11-20 17:08:07.000000000 +0100
++++
qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
2023-11-28 00:01:08.206020832 +0100
+@@ -30,6 +30,7 @@
+ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
+
+ #include <libxml/parserInternals.h>
++#include <libxml/xmlversion.h>
+ #include <libxslt/documents.h>
+
+ namespace blink {
+@@ -77,7 +78,11 @@
+
+ void reset();
+
++#if defined(LIBXML_VERSION) && LIBXML_VERSION >= 21200
++ static void ParseErrorFunc(void* user_data, const xmlError*);
++#else
+ static void ParseErrorFunc(void* user_data, xmlError*);
++#endif
+ static void GenericErrorFunc(void* user_data, const char* msg, ...);
+
+ // Only for libXSLT callbacks
+---
qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig
2023-11-20 17:08:07.000000000 +0100
++++
qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
2023-11-28 00:12:15.789955472 +0100
+@@ -66,7 +66,11 @@
+ // It would be nice to do something with this error message.
+ }
+
++#if defined(LIBXML_VERSION) && LIBXML_VERSION >= 21200
++void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
++#else
+ void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
++#endif
+ FrameConsole* console = static_cast<FrameConsole*>(user_data);
+ if (!console)
+ return;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt6.git/commitdiff/ccb19b01ac9edd36ca3dd7cb1d2a73219b5c0adb
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
