CVS commit: pkgsrc/misc/libreoffice

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan 27 22:35:07 UTC 2024

Modified Files:
        pkgsrc/misc/libreoffice: distinfo
Added Files:
        pkgsrc/misc/libreoffice/patches:
            patch-filter_source_xsltfilter_LibXSLTTransformer.cxx
            patch-helpcompiler_source_HelpLinker.cxx
            patch-sax_source_fastparser_fastparser.cxx
            patch-unoxml_source_xpath_xpathapi.cxx

Log Message:
libreoffice: fix build with libxml2 2.12.


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-filter_source_xsltfilter_LibXSLTTransformer.cxx \
    pkgsrc/misc/libreoffice/patches/patch-helpcompiler_source_HelpLinker.cxx \
    pkgsrc/misc/libreoffice/patches/patch-sax_source_fastparser_fastparser.cxx \
    pkgsrc/misc/libreoffice/patches/patch-unoxml_source_xpath_xpathapi.cxx

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

Modified files:

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.147 pkgsrc/misc/libreoffice/distinfo:1.148
--- pkgsrc/misc/libreoffice/distinfo:1.147      Sun Dec 10 11:51:21 2023
+++ pkgsrc/misc/libreoffice/distinfo    Sat Jan 27 22:35:06 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.147 2023/12/10 11:51:21 ryoon Exp $
+$NetBSD: distinfo,v 1.148 2024/01/27 22:35:06 wiz Exp $
 
 BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71
 SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 
b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
@@ -179,12 +179,15 @@ SHA1 (patch-external_pdfium_pkgsrc.patch
 SHA1 (patch-external_skia_Library__skia.mk) = c2f76786b56bb13f488d953e66b72c7c9a1cff47
 SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = 73fb2231f8201ad29081dfd2c45fddb91f113bbb
 SHA1 (patch-external_skia_netbsd.patch.0) = 70d61c86d3e69e6dee1602bca8b860de4cc2405d
+SHA1 (patch-filter_source_xsltfilter_LibXSLTTransformer.cxx) = edd4a3232e382fbd16eb2a97fcb7f176390b8d25
+SHA1 (patch-helpcompiler_source_HelpLinker.cxx) = 6aa7dd83c136f02b1ebd2277dd3347cec3b77cda
 SHA1 (patch-i18npool_source_breakiterator_data_line.txt) = 0efa71868b804342837475e8eb85276cb5bd2993
 SHA1 (patch-i18nutil_source_utility_unicode.cxx) = d60f5b5089c4358f4081648466662753393e4990
 SHA1 (patch-include_svx_strings.hrc) = 995efd0ce93c5493d1df50ad28cbabed773dbc33
 SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = 46b6948287c8d2354d9b9fd2fab7d685580650ee
 SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e
 SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd
+SHA1 (patch-sax_source_fastparser_fastparser.cxx) = 334d273d3d95ffcdd2fca46b60e3420694536021
 SHA1 (patch-sc_source_core_tool_math.cxx) = 94ea14291d87ab7ad43a8f277738685e2743cb4a
 SHA1 (patch-slideshow_source_engine_box2dtools.cxx) = b59a872552754af29ce6208fd9dd3e25633c9fba
 SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc
@@ -192,6 +195,7 @@ SHA1 (patch-store_source_storbase.hxx) =
 SHA1 (patch-svx_source_dialog_charmap.cxx) = cd8c250ef6f6a410e02d3312b4c3a4aaec4601c9
 SHA1 (patch-sw_source_core_bastyp_calc.cxx) = 317f206500c88aea4a645a6f1dea8e0a837ad581
 SHA1 (patch-sw_source_uibase_config_usrpref.cxx) = 8f761c368e38435aea53bfcfcdc1f3aba0c73d03
+SHA1 (patch-unoxml_source_xpath_xpathapi.cxx) = 9154f1ee4d617b5948360c8db6f9ad15d01681d9
 SHA1 (patch-vcl_source_window_window2.cxx) = b5898d10a6f65ddb06ca3b86efe525078d8efa2a
 SHA1 (patch-vcl_unx_generic_app_geninst.cxx) = aa8f1a7e0fe2b6254a05e8370f1d12d25ba9795a
 SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-filter_source_xsltfilter_LibXSLTTransformer.cxx
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-filter_source_xsltfilter_LibXSLTTransformer.cxx:1.1
--- /dev/null   Sat Jan 27 22:35:07 2024
+++ pkgsrc/misc/libreoffice/patches/patch-filter_source_xsltfilter_LibXSLTTransformer.cxx       Sat Jan 27 22:35:07 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-filter_source_xsltfilter_LibXSLTTransformer.cxx,v 1.1 2024/01/27 22:35:07 wiz Exp $
+
+Fix build with libxml2 2.12.
+
+--- filter/source/xsltfilter/LibXSLTTransformer.cxx.orig       2024-01-27 21:33:18.356369086 +0000
++++ filter/source/xsltfilter/LibXSLTTransformer.cxx
+@@ -333,7 +333,7 @@ namespace XSLT
+         }
+         else
+         {
+-            xmlErrorPtr lastErr = xmlGetLastError();
++            const xmlError* lastErr = xmlGetLastError();
+             OUString msg;
+             if (lastErr)
+                 msg = OStringToOUString(lastErr->message, RTL_TEXTENCODING_UTF8);
Index: pkgsrc/misc/libreoffice/patches/patch-helpcompiler_source_HelpLinker.cxx
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-helpcompiler_source_HelpLinker.cxx:1.1
--- /dev/null   Sat Jan 27 22:35:07 2024
+++ pkgsrc/misc/libreoffice/patches/patch-helpcompiler_source_HelpLinker.cxx    Sat Jan 27 22:35:07 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-helpcompiler_source_HelpLinker.cxx,v 1.1 2024/01/27 22:35:07 wiz Exp $
+
+Fix build with libxml2 2.12.
+
+--- helpcompiler/source/HelpLinker.cxx.orig    2024-01-27 20:26:24.244726819 +0000
++++ helpcompiler/source/HelpLinker.cxx
+@@ -815,7 +815,7 @@ static const HelpProcessingException* Gp
+ 
+ extern "C" {
+ 
+-static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, xmlErrorPtr error)
++static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, const _xmlError* error)
+ {
+     std::string aErrorMsg = error->message;
+     std::string aXMLParsingFile;
Index: pkgsrc/misc/libreoffice/patches/patch-sax_source_fastparser_fastparser.cxx
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-sax_source_fastparser_fastparser.cxx:1.1
--- /dev/null   Sat Jan 27 22:35:07 2024
+++ pkgsrc/misc/libreoffice/patches/patch-sax_source_fastparser_fastparser.cxx  Sat Jan 27 22:35:07 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-sax_source_fastparser_fastparser.cxx,v 1.1 2024/01/27 22:35:07 wiz Exp $
+
+Fix build with libxml2 2.12.
+
+--- sax/source/fastparser/fastparser.cxx.orig  2024-01-27 20:14:24.030394982 +0000
++++ sax/source/fastparser/fastparser.cxx
+@@ -579,7 +579,7 @@ Event& Entity::getEvent( CallbackType aT
+ OUString lclGetErrorMessage( xmlParserCtxtPtr ctxt, std::u16string_view sSystemId, sal_Int32 nLine )
+ {
+     const char* pMessage;
+-    xmlErrorPtr error = xmlCtxtGetLastError( ctxt );
++    const xmlError* error = xmlCtxtGetLastError( ctxt );
+     if( error && error->message )
+         pMessage = error->message;
+     else
Index: pkgsrc/misc/libreoffice/patches/patch-unoxml_source_xpath_xpathapi.cxx
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-unoxml_source_xpath_xpathapi.cxx:1.1
--- /dev/null   Sat Jan 27 22:35:07 2024
+++ pkgsrc/misc/libreoffice/patches/patch-unoxml_source_xpath_xpathapi.cxx      Sat Jan 27 22:35:07 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-unoxml_source_xpath_xpathapi.cxx,v 1.1 2024/01/27 22:35:07 wiz Exp $
+
+Fix build with libxml2 2.12.
+
+--- unoxml/source/xpath/xpathapi.cxx.orig      2024-01-27 21:40:55.769672874 +0000
++++ unoxml/source/xpath/xpathapi.cxx
+@@ -217,7 +217,7 @@ namespace XPath
+         return selectSingleNode(contextNode, expr);
+     }
+ 
+-    static OUString make_error_message(xmlErrorPtr pError)
++    static OUString make_error_message(const xmlError* pError)
+     {
+         OUStringBuffer buf;
+         if (pError) {
+@@ -259,7 +259,7 @@ namespace XPath
+             SAL_WARN("unoxml", "libxml2 error: " << str);
+         }
+ 
+-        static void structured_error_func(void *, xmlErrorPtr error)
++        static void structured_error_func(void *, const xmlError* error)
+         {
+             SAL_WARN("unoxml", "libxml2 error: " << make_error_message(error));
+         }