CVS commit: pkgsrc/x11/qt5-qtwebkit

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan 27 18:06:36 UTC 2024

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: distinfo
Added Files:
        pkgsrc/x11/qt5-qtwebkit/patches:
            patch-Source_WebCore_xml_XSLTProcessor.h
            patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp

Log Message:
qt5-qtwebkit: fix build with libxml2


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_xml_XSLTProcessor.h \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.31 pkgsrc/x11/qt5-qtwebkit/distinfo:1.32
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.31       Wed Jul 19 20:16:19 2023
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Sat Jan 27 18:06:36 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2023/07/19 20:16:19 adam Exp $
+$NetBSD: distinfo,v 1.32 2024/01/27 18:06:36 wiz Exp $
 
 BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c
 SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
@@ -31,6 +31,8 @@ SHA1 (patch-Source_WebCore_platform_text
 SHA1 (patch-Source_WebCore_platform_text_icu_UTextProvider.h) = fb0885eb9db3001ddd8df90059cdb47dbfd79fe3
 SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp) = 29b414e1ae18a0786f31d80143f665d6d68bcbe3
 SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp) = b175e1973a2019d746fda174dfc5708a3ca57d9b
+SHA1 (patch-Source_WebCore_xml_XSLTProcessor.h) = 57f9d38a3ccab03c6dbc1c20d2cef4b598af36dc
+SHA1 (patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp) = ce3e86db666bdcca94c1bea3ffff0bb7d1f9c75e
 SHA1 (patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = d18013d0e07d7ad7e9d84cb6ef2d418d9bba4c7e
 SHA1 (patch-Source_WebKit_qt_declarative_CMakeLists.txt) = bda5cb2751027aab161ae54f46b8f9103532fb13
 SHA1 (patch-Source_WebKit_qt_declarative_experimental_CMakeLists.txt) = b95ac623f36018e3f2cc55a2988e97ef3f713159

Added files:

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_xml_XSLTProcessor.h
diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_xml_XSLTProcessor.h:1.1
--- /dev/null   Sat Jan 27 18:06:36 2024
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_xml_XSLTProcessor.h    Sat Jan 27 18:06:36 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_WebCore_xml_XSLTProcessor.h,v 1.1 2024/01/27 18:06:36 wiz Exp $
+
+Fix build with libxml2 2.12.
+
+--- Source/WebCore/xml/XSLTProcessor.h.orig    2020-03-04 17:16:37.000000000 +0000
++++ Source/WebCore/xml/XSLTProcessor.h
+@@ -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
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp
diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp:1.1
--- /dev/null   Sat Jan 27 18:06:36 2024
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp   Sat Jan 27 18:06:36 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp,v 1.1 2024/01/27 18:06:36 wiz Exp $
+
+Fix build with libxml2 2.12.
+
+--- Source/WebCore/xml/XSLTProcessorLibxslt.cpp.orig   2020-03-04 17:16:37.000000000 +0000
++++ Source/WebCore/xml/XSLTProcessorLibxslt.cpp
+@@ -78,7 +78,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)
+ {
+     PageConsoleClient* console = static_cast<PageConsoleClient*>(userData);
+     if (!console)