CVS commit: pkgsrc/www/webkit-gtk

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan 27 17:28:11 UTC 2024

Modified Files:
        pkgsrc/www/webkit-gtk: distinfo
Added Files:
        pkgsrc/www/webkit-gtk/patches: patch-Source_WebCore_xml_XSLTProcessor.h
            patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp

Log Message:
webkit-gtk: fix build with libxml2 2.12


To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_xml_XSLTProcessor.h \
    pkgsrc/www/webkit-gtk/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/www/webkit-gtk/distinfo
diff -u pkgsrc/www/webkit-gtk/distinfo:1.173 pkgsrc/www/webkit-gtk/distinfo:1.174
--- pkgsrc/www/webkit-gtk/distinfo:1.173        Sun Oct 23 07:33:51 2022
+++ pkgsrc/www/webkit-gtk/distinfo      Sat Jan 27 17:28:11 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.173 2022/10/23 07:33:51 mcf Exp $
+$NetBSD: distinfo,v 1.174 2024/01/27 17:28:11 wiz Exp $
 
 BLAKE2s (webkitgtk-2.36.8.tar.xz) = 277ba5935bda3e3867083b4c736499d974b9c733dbd05bf574510857dde481a1
 SHA512 (webkitgtk-2.36.8.tar.xz) = 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036
@@ -31,6 +31,8 @@ SHA1 (patch-Source_WebCore_platform_netw
 SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573786b34fe1e3d85edf1e1e
 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
 SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = 3a4d9415e7d3ac78a948b9e7eb5e0377575835c3
+SHA1 (patch-Source_WebCore_xml_XSLTProcessor.h) = cce0bdced0626b2301b3aa2646ad1d2d444d647f
+SHA1 (patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp) = c8b96312a5cd107065d505909d67ad5a7dd1f980
 SHA1 (patch-Source_WebKit_CMakeLists.txt) = 86d11b8a1142a1ab267e412873cca4f8924aaae8
 SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 14dfbee895aa7c70bf3b61b4dbb5bccd96d9583a
 SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 61d2b4942b83d3f3c1b642d122f109ba90bbff9d

Added files:

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_xml_XSLTProcessor.h
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_xml_XSLTProcessor.h:1.1
--- /dev/null   Sat Jan 27 17:28:11 2024
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_xml_XSLTProcessor.h      Sat Jan 27 17:28:11 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_WebCore_xml_XSLTProcessor.h,v 1.1 2024/01/27 17:28:11 wiz Exp $
+
+Fix build with libxml2 2.12.
+
+--- Source/WebCore/xml/XSLTProcessor.h.orig    2024-01-27 17:15:35.512091087 +0000
++++ Source/WebCore/xml/XSLTProcessor.h
+@@ -61,7 +61,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/www/webkit-gtk/patches/patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp:1.1
--- /dev/null   Sat Jan 27 17:28:11 2024
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp     Sat Jan 27 17:28:11 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_WebCore_xml_XSLTProcessorLibxslt.cpp,v 1.1 2024/01/27 17:28:11 wiz Exp $
+
+Fix build with libxml2 2.12.
+
+--- Source/WebCore/xml/XSLTProcessorLibxslt.cpp.orig   2024-01-27 17:15:52.019994538 +0000
++++ Source/WebCore/xml/XSLTProcessorLibxslt.cpp
+@@ -61,7 +61,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)