CVS commit: pkgsrc/x11/qt5-qtwebengine

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Mon Feb 12 00:52:49 UTC 2024

Modified Files:
        pkgsrc/x11/qt5-qtwebengine: distinfo
Added Files:
        pkgsrc/x11/qt5-qtwebengine/patches:
            patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor.h
            patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc

Log Message:
qt5-qtwebengine: re-add patches for libxml2

this version of patches allows for both pre and post 2.12 as qtwebengine
will use its own (older) version of libxml2 unless pkgsrc version has
been built with icu option.  PR pkg/57907


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/qt5-qtwebengine/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor.h \
    pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc

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-qtwebengine/distinfo
diff -u pkgsrc/x11/qt5-qtwebengine/distinfo:1.21 pkgsrc/x11/qt5-qtwebengine/distinfo:1.22
--- pkgsrc/x11/qt5-qtwebengine/distinfo:1.21    Wed Feb  7 18:13:51 2024
+++ pkgsrc/x11/qt5-qtwebengine/distinfo Mon Feb 12 00:52:49 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2024/02/07 18:13:51 wiz Exp $
+$NetBSD: distinfo,v 1.22 2024/02/12 00:52:49 markd Exp $
 
 BLAKE2s (qtwebengine-everywhere-opensource-src-5.15.12.tar.xz) = f3f13f6b52697c09e2ff2683667108da280348d9d853249ae5097920a02aa333
 SHA512 (qtwebengine-everywhere-opensource-src-5.15.12.tar.xz) = 84ebdab10ea3138671c0612cc558dd3257264410d2776719c34d41b8f846424183742abc7185fa61c7bb3d35d471ab2341d064eec57b92c34e30325dbc3eff63
@@ -601,6 +601,8 @@ SHA1 (patch-src_3rdparty_chromium_third_
 SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc) = 56e8ccad2afc2816817b783de71683eda9691a25
 SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc) = 66c03d64d1ed36c91bf1895bdc9ced6e6edc2056
 SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc) = 9dfc46d97549891722e678f14271ef19b0ec80ea
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor.h) = 0e5d9734f23b28584050527700bb30f047c0ea00
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc) = 24f6cc1c1b016900d66f4a482a206423830966be
 SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_web__audio__device__factory.cc) = 9600a0cde019fa643f6f313ae26ead384c149802
 SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc) = db9b64ed2ebd100cc2fa0fa80a0503f96171d668
 SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn) = 2bd42053fc24ba9b3dbd966691ea9f2a1a64e5d9

Added files:

Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor.h
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor.h:1.3
--- /dev/null   Mon Feb 12 00:52:49 2024
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor.h       Mon Feb 12 00:52:49 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor.h,v 1.3 2024/02/12 00:52:49 markd Exp $
+
+build with libxml-2.12
+
+--- src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h.orig    2022-12-08 15:31:50.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
+@@ -79,7 +79,11 @@ class XSLTProcessor final : public Scrip
+ 
+   void reset();
+ 
++#if 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
Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc:1.3
--- /dev/null   Mon Feb 12 00:52:49 2024
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc     Mon Feb 12 00:52:49 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc,v 1.3 2024/02/12 00:52:49 markd Exp $
+
+build with libxml-2.12
+
+--- src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig   2022-12-08 15:31:50.000000000 +0000
++++ src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
+@@ -60,7 +60,11 @@ void XSLTProcessor::GenericErrorFunc(voi
+   // It would be nice to do something with this error message.
+ }
+ 
++#if 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;