From df29e1edfb763c6f990cfb6b9382b2f107cbc9aa Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 13:33:55 -0800 Subject: [PATCH 01/17] libxml2: update to 2.12.5. --- ...952bdb7a4364100f009043e94e1bf44c6197.patch | 85 +++++++++++++++++++ srcpkgs/libxml2/template | 8 +- 2 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/libxml2/patches/387a952bdb7a4364100f009043e94e1bf44c6197.patch diff --git a/srcpkgs/libxml2/patches/387a952bdb7a4364100f009043e94e1bf44c6197.patch b/srcpkgs/libxml2/patches/387a952bdb7a4364100f009043e94e1bf44c6197.patch new file mode 100644 index 00000000000000..50a6da45513f82 --- /dev/null +++ b/srcpkgs/libxml2/patches/387a952bdb7a4364100f009043e94e1bf44c6197.patch @@ -0,0 +1,85 @@ +From 387a952bdb7a4364100f009043e94e1bf44c6197 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Mon, 12 Feb 2024 16:45:16 +0100 +Subject: [PATCH] xmllint: Return error code if XPath returns empty nodeset + +Return an error code as before but make it possible to distinguish from +real errors. + +Fixes #690. +--- + doc/xmllint.xml | 11 ++++++++++- + xmllint.c | 24 +++++++++++++----------- + 2 files changed, 23 insertions(+), 12 deletions(-) + +diff --git a/doc/xmllint.xml b/doc/xmllint.xml +index b81da3aa7..8bc665216 100644 +--- a/doc/xmllint.xml ++++ b/doc/xmllint.xml +@@ -575,7 +575,9 @@ + result. In case of a nodeset result, each node in the + node set is serialized in full in the output. In case + of an empty node set the "XPath set is empty" result +- will be shown and an error exit code will be returned. ++ will be shown and exit code 11 will be returned.. ++ This feature is EXPERIMENTAL. Implementation details can ++ change without futher notice. + + + +@@ -945,6 +947,13 @@ + + + ++ ++ 11 ++ ++ XPath result is empty ++ ++ ++ + + + +diff --git a/xmllint.c b/xmllint.c +index 21dbe7d24..5c26c3fe8 100644 +--- a/xmllint.c ++++ b/xmllint.c +@@ -86,17 +86,18 @@ + #endif + + typedef enum { +- XMLLINT_RETURN_OK = 0, /* No error */ +- XMLLINT_ERR_UNCLASS = 1, /* Unclassified */ +- XMLLINT_ERR_DTD = 2, /* Error in DTD */ +- XMLLINT_ERR_VALID = 3, /* Validation error */ +- XMLLINT_ERR_RDFILE = 4, /* CtxtReadFile error */ +- XMLLINT_ERR_SCHEMACOMP = 5, /* Schema compilation */ +- XMLLINT_ERR_OUT = 6, /* Error writing output */ +- XMLLINT_ERR_SCHEMAPAT = 7, /* Error in schema pattern */ +- XMLLINT_ERR_RDREGIS = 8, /* Error in Reader registration */ +- XMLLINT_ERR_MEM = 9, /* Out of memory error */ +- XMLLINT_ERR_XPATH = 10 /* XPath evaluation error */ ++ XMLLINT_RETURN_OK = 0, /* No error */ ++ XMLLINT_ERR_UNCLASS = 1, /* Unclassified */ ++ XMLLINT_ERR_DTD = 2, /* Error in DTD */ ++ XMLLINT_ERR_VALID = 3, /* Validation error */ ++ XMLLINT_ERR_RDFILE = 4, /* CtxtReadFile error */ ++ XMLLINT_ERR_SCHEMACOMP = 5, /* Schema compilation */ ++ XMLLINT_ERR_OUT = 6, /* Error writing output */ ++ XMLLINT_ERR_SCHEMAPAT = 7, /* Error in schema pattern */ ++ XMLLINT_ERR_RDREGIS = 8, /* Error in Reader registration */ ++ XMLLINT_ERR_MEM = 9, /* Out of memory error */ ++ XMLLINT_ERR_XPATH = 10, /* XPath evaluation error */ ++ XMLLINT_ERR_XPATH_EMPTY = 11 /* XPath result is empty */ + } xmllintReturnCode; + #ifdef LIBXML_DEBUG_ENABLED + static int shell = 0; +@@ -2019,6 +2020,7 @@ static void doXPathDump(xmlXPathObjectPtr cur) { + xmlOutputBufferPtr buf; + + if ((cur->nodesetval == NULL) || (cur->nodesetval->nodeNr <= 0)) { ++ progresult = XMLLINT_ERR_XPATH_EMPTY; + if (!quiet) { + fprintf(stderr, "XPath set is empty\n"); + } diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index 7e05639eaaa1e2..270753e103cee1 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -1,8 +1,7 @@ # Template file for 'libxml2' pkgname=libxml2 -reverts="2.12.1_1" -version=2.11.4 -revision=6 +version=2.12.5 +revision=1 build_style=gnu-configure configure_args="--with-threads --with-history --with-icu --with-legacy --with-ftp --with-xptr-locs --enable-static" @@ -13,8 +12,9 @@ short_desc="Library providing XML and HTML support" maintainer="Enno Boland " license="MIT" homepage="https://gitlab.gnome.org/GNOME/libxml2" +changelog="https://gitlab.gnome.org/GNOME/libxml2/-/raw/master/NEWS" distfiles="${GNOME_SITE}/libxml2/${version%.*}/libxml2-${version}.tar.xz" -checksum=737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7 +checksum=a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21 python_version=3 CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver" From 6d535880a169896a3dd307ba70fa21298b78beb3 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 20:57:54 -0800 Subject: [PATCH 02/17] inkscape: fix build for libxml2 2.12 --- .../inkscape/patches/fix-libxml2-2.12.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/inkscape/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch b/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..dc5b0f53460c9a --- /dev/null +++ b/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch @@ -0,0 +1,33 @@ +From 694d8ae43d06efff21adebf377ce614d660b24cd Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Fri, 17 Nov 2023 22:30:42 +0100 +Subject: [PATCH] include missing header file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes build error: +``` +/build/inkscape/src/inkscape/src/object/uri.cpp: In constructor ‘Inkscape::URI::URI(const gchar*, const char*)’: +/build/inkscape/src/inkscape/src/object/uri.cpp:86:9: error: ‘xmlFree’ was not declared in this scope; did you mean ‘xmlFreeURI’? + 86 | xmlFree(full); +``` +--- + src/object/uri.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/object/uri.h b/src/object/uri.h +index 381adec58cf..d5b211fe2b2 100644 +--- a/src/object/uri.h ++++ b/src/object/uri.h +@@ -13,6 +13,7 @@ + #define INKSCAPE_URI_H + + #include ++#include + #include + #include + +-- +GitLab + From 74d7a5cd59be1325c468a38ab0c505f2dab9464b Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 20:58:21 -0800 Subject: [PATCH 03/17] rdrview: fix build for libxml2 2.12 --- .../rdrview/patches/fix-libxml2-2.12.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 srcpkgs/rdrview/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/rdrview/patches/fix-libxml2-2.12.patch b/srcpkgs/rdrview/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..eb8c8eb7709a87 --- /dev/null +++ b/srcpkgs/rdrview/patches/fix-libxml2-2.12.patch @@ -0,0 +1,26 @@ +From b5fdd379577e13d26784ffdeca3ecb02ff1d336e Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Sun, 18 Feb 2024 13:49:49 -0800 +Subject: [PATCH] Add missing include with libxml2 2.12+ + +libxml2 2.12 removed extra includes, which causes stdlib.h to not get implicitly +included anymore. + +The missing include results in a warning on gcc13 and below with the resulting +binary truncating the pointer to an integer, gcc14+ makes this a hard error. +--- + src/rdrview.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/rdrview.h b/src/rdrview.h +index 9365e7a..2eda156 100644 +--- a/src/rdrview.h ++++ b/src/rdrview.h +@@ -26,6 +26,7 @@ + #define RDRVIEW_H + + #include ++#include + #include + #include + #include From 777ea0f588ae46bfdf2e8c6d158d40d273eb1f2a Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 15:13:02 -0800 Subject: [PATCH 04/17] libgdal: update to 3.8.4. --- common/shlibs | 2 +- srcpkgs/libgdal/patches/10-atoll.patch | 34 -------------------------- srcpkgs/libgdal/template | 6 ++--- 3 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/libgdal/patches/10-atoll.patch diff --git a/common/shlibs b/common/shlibs index 3cf507d8ada879..f5b32693cae681 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2459,7 +2459,7 @@ libu2f-host.so.0 libu2f-host-1.1.10_5 libu2f-server.so.0 libu2f-server-1.1.0_9 libsqlcipher.so.0 sqlcipher-4.3.0_3 libgta.so.1 libgta-1.2.0_1 -libgdal.so.31 libgdal-3.5.3_1 +libgdal.so.34 libgdal-3.8.4_1 libosgViewer.so.161 osg-3.6.5_1 libosgShadow.so.161 osg-3.6.5_1 libosgParticle.so.161 osg-3.6.5_1 diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch deleted file mode 100644 index a114098612c522..00000000000000 --- a/srcpkgs/libgdal/patches/10-atoll.patch +++ /dev/null @@ -1,34 +0,0 @@ -Author: Holger Jaekel -Summary: musl atoll() doesn't return ERANGE in case of overflow ----- - ---- a/port/cpl_conv.cpp -+++ b/port/cpl_conv.cpp -@@ -1011,8 +1011,6 @@ - #endif - } - --#if defined(__MINGW32__) || defined(__sun__) -- - // mingw atoll() doesn't return ERANGE in case of overflow - static int CPLAtoGIntBigExHasOverflow(const char* pszString, GIntBig nVal) - { -@@ -1035,8 +1033,6 @@ - return strcmp(szBuffer, pszString) != 0; - } - --#endif -- - /************************************************************************/ - /* CPLAtoGIntBigEx() */ - /************************************************************************/ -@@ -1065,9 +1061,7 @@ - GIntBig nVal = atol(pszString); - #endif - if( errno == ERANGE --#if defined(__MINGW32__) || defined(__sun__) - || CPLAtoGIntBigExHasOverflow(pszString, nVal) --#endif - ) - { - if( pbOverflow ) diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index d5850fb768f669..93d916099045c0 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,7 +1,7 @@ # Template file for 'libgdal' pkgname=libgdal -version=3.5.3 -revision=12 +version=3.8.4 +revision=1 build_style=cmake build_helper=python3 configure_args="-DGDAL_USE_OPENCL=ON @@ -21,7 +21,7 @@ license="MIT" homepage="https://www.gdal.org" changelog="https://raw.githubusercontent.com/OSGeo/gdal/master/NEWS.md" distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz" -checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890 +checksum=0c53ced95d29474236487202709b49015854f8e02e35e44ed0f4f4e12a7966ce python_version=3 if [ -z "$CROSS_BUILD" ]; then From 4f0e9ccbeca1a32ace67d71fa0dd778e6efecea2 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 20:58:50 -0800 Subject: [PATCH 05/17] cegui: fix build for libxml2 2.12 --- srcpkgs/cegui/patches/fix-libxml2-2.12.patch | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 srcpkgs/cegui/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/cegui/patches/fix-libxml2-2.12.patch b/srcpkgs/cegui/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..f288ce9a66b098 --- /dev/null +++ b/srcpkgs/cegui/patches/fix-libxml2-2.12.patch @@ -0,0 +1,26 @@ +From 285ba5a2c0c435ed865c6e86afe314a822fd1e3f Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Sun, 18 Feb 2024 14:16:21 -0800 +Subject: [PATCH] Fix return type of xmlGetLastError for libxml2 2.12 + +https://gitlab.gnome.org/GNOME/libxml2/-/commit/45470611b047db78106dcb2fdbd4164163c15ab7 +--- + cegui/src/XMLParserModules/Libxml2/XMLParser.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +index 74a3dbddd..a408f9305 100644 +--- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp ++++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +@@ -109,7 +109,11 @@ void LibxmlParser::parseXML(XMLHandler& handler, + + if (!doc) + { ++#if LIBXML_VERSION >= 21200 ++ const xmlError* err = xmlGetLastError(); ++#else + xmlError* err = xmlGetLastError(); ++#endif + + throw GenericException( + String("xmlParseMemory failed in file: '") + From 2368a935a60a62c31932afbbae401717ea57fad6 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 19 Feb 2024 04:41:36 -0800 Subject: [PATCH 06/17] webkit2gtk: fix build for libxml2 2.12 --- .../webkit2gtk/patches/fix-libxml2-2.12.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 srcpkgs/webkit2gtk/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/webkit2gtk/patches/fix-libxml2-2.12.patch b/srcpkgs/webkit2gtk/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..0529514ffe0063 --- /dev/null +++ b/srcpkgs/webkit2gtk/patches/fix-libxml2-2.12.patch @@ -0,0 +1,56 @@ +From 1bad176b2496579d760852c80cff3ad9fb7c3a4b Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Mon, 20 Nov 2023 07:42:30 -0800 +Subject: [PATCH] Build fails with libxml2 version 2.12.0 due to API change + https://bugs.webkit.org/show_bug.cgi?id=265128 + +Reviewed by Philippe Normand. + +Starting with libxml2 2.12.0, the API has changed the const-ness of the +xmlError pointers, which results in a build error due to a mismatched +type in the parsing error callback. This papers over the difference by +using preprocessor conditionals. + +* Source/WebCore/xml/XSLTProcessor.h: Use const when building against + libxml2 2.12.0 or newer. +* Source/WebCore/xml/XSLTProcessorLibxslt.cpp: +(WebCore::XSLTProcessor::parseErrorFunc): Ditto. + +Canonical link: https://commits.webkit.org/270977@main +--- + Source/WebCore/xml/XSLTProcessor.h | 4 ++++ + Source/WebCore/xml/XSLTProcessorLibxslt.cpp | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/Source/WebCore/xml/XSLTProcessor.h b/Source/WebCore/xml/XSLTProcessor.h +index 21bb45b5cbe1..5cf20557918f 100644 +--- a/Source/WebCore/xml/XSLTProcessor.h ++++ b/Source/WebCore/xml/XSLTProcessor.h +@@ -61,7 +61,11 @@ class XSLTProcessor : public RefCounted { + + void reset(); + ++#if LIBXML_VERSION >= 21200 ++ static void parseErrorFunc(void* userData, const xmlError*); ++#else + static void parseErrorFunc(void* userData, xmlError*); ++#endif + static void genericErrorFunc(void* userData, const char* msg, ...); + + // Only for libXSLT callbacks +diff --git a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp +index a65691087e3c..9f6b363dfc6c 100644 +--- a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp ++++ b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp +@@ -59,7 +59,11 @@ void XSLTProcessor::genericErrorFunc(void*, const char*, ...) + // It would be nice to do something with this error message. + } + ++#if LIBXML_VERSION >= 21200 ++void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error) ++#else + void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error) ++#endif + { + PageConsoleClient* console = static_cast(userData); + if (!console) From acb196e951c4270950d3224a190b84a7ededdcf6 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 19 Feb 2024 04:57:49 -0800 Subject: [PATCH 07/17] xmlsec1: update to 1.3.3. Fixes build with libxml2 2.12. --- srcpkgs/xmlsec1/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template index a4d9792bd2d374..0dfb40b1f1161d 100644 --- a/srcpkgs/xmlsec1/template +++ b/srcpkgs/xmlsec1/template @@ -1,6 +1,6 @@ # Template file for 'xmlsec1' pkgname=xmlsec1 -version=1.3.2 +version=1.3.3 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -11,8 +11,8 @@ maintainer="Enno Boland " license="MIT" homepage="https://www.aleksey.com/xmlsec/" changelog="https://www.aleksey.com/xmlsec/news.html" -distfiles="https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz" -checksum=4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf +distfiles="https://github.com/lsh123/xmlsec/releases/download/${version}/xmlsec1-${version}.tar.gz" +checksum=ab5b9a9ffd6960f46f7466d9d91f174ec37e8c31989237ba6b9eacdd816464f2 post_install() { if [ "$CROSS_BUILD" ]; then From a37e121df793597a7b827819737899f749741319 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 19 Feb 2024 05:13:26 -0800 Subject: [PATCH 08/17] recoll: update to 1.37.4. --- srcpkgs/recoll/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/recoll/template b/srcpkgs/recoll/template index cbcc61e13cd0e3..7b33d23df03a59 100644 --- a/srcpkgs/recoll/template +++ b/srcpkgs/recoll/template @@ -1,7 +1,7 @@ # Template file for 'recoll' pkgname=recoll -version=1.32.7 -revision=3 +version=1.37.4 +revision=1 build_style=gnu-configure build_helper="qmake python3" configure_args="--enable-recollq --disable-python-chm --disable-x11mon @@ -9,10 +9,10 @@ configure_args="--enable-recollq --disable-python-chm --disable-x11mon hostmakedepends="pkg-config gettext-devel qt5-qmake qt5-host-tools which python3-setuptools" makedepends="libxslt-devel xapian-core-devel zlib-devel qt5-devel - python3-devel" + python3-devel aspell-devel" short_desc="Full text search tool based on Xapian backend" maintainer="Rui Abreu Ferreira " license="GPL-2.0-or-later" homepage="https://www.lesbonscomptes.com/recoll/" distfiles="https://www.lesbonscomptes.com/recoll/recoll-${version}.tar.gz" -checksum=ca08a6f4bb0b519bf915a062a9b7aadc4f343473cc1f07895708208d66337dba +checksum=3109d76a65bb2f887231b643994ed701c2efe6ba0771f8451b39e2f186c3b6ad From 044590b710a940f479c8f48519e5723d93750160 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 19 Feb 2024 05:18:02 -0800 Subject: [PATCH 09/17] squid: update to 6.7. --- srcpkgs/squid/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template index 1dff665cda342a..e73856d05a1b80 100644 --- a/srcpkgs/squid/template +++ b/srcpkgs/squid/template @@ -1,7 +1,7 @@ # Template file for 'squid' pkgname=squid -version=5.7 -revision=4 +version=6.7 +revision=1 build_style=gnu-configure configure_args=" --sysconfdir=/etc/squid @@ -52,9 +52,9 @@ short_desc="Caching proxy for the Web" maintainer="Toyam Cox " license="GPL-2.0-or-later" homepage="http://www.squid-cache.org/" -changelog="http://www.squid-cache.org/Versions/v5/changesets/" -distfiles="http://www.squid-cache.org/Versions/v5/squid-${version}.tar.xz" -checksum=6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81 +changelog="http://www.squid-cache.org/Versions/v${version%%.*}/changesets/" +distfiles="http://www.squid-cache.org/Versions/v${version%%.*}/squid-${version}.tar.xz" +checksum=e14daa4eae41925d1ae3f08e64439a6aaa3011bdced686628b8de697d5ab8428 system_accounts="squid" # squid-conf-tests requires a squid user in the system make_check=no From ecd31eb6bb914f386f955f2108081a3c28ed9346 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 19 Feb 2024 05:24:30 -0800 Subject: [PATCH 10/17] liferea: fix build for libxml2 2.12 --- .../liferea/patches/fix-libxml2-2.12.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 srcpkgs/liferea/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/liferea/patches/fix-libxml2-2.12.patch b/srcpkgs/liferea/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..abe1fb13766982 --- /dev/null +++ b/srcpkgs/liferea/patches/fix-libxml2-2.12.patch @@ -0,0 +1,28 @@ +From be8ef494586d9ef73c04ec4ca058a9a158ae3562 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sun, 31 Dec 2023 22:26:31 +0000 +Subject: [PATCH] src/node_type.h: add `#include ` for + `xmlNodePtr` type + +Without the change build fails on `libxml2-2.12.3` as: + + ../../src/node_type.h:62:64: error: unknown type name 'xmlNodePtr'; did you mean 'nodePtr'? + 62 | void (*export) (nodePtr node, xmlNodePtr cur, gboolean trusted); + | ^~~~~~~~~~ + | nodePtr +--- + src/node_type.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/node_type.h b/src/node_type.h +index fcd3e7223..a41ff52fc 100644 +--- a/src/node_type.h ++++ b/src/node_type.h +@@ -23,6 +23,7 @@ + + #include "node.h" + ++#include + #include + #include + From b69cec9b69680e791d70ad0a2eba729d635dc165 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 19 Feb 2024 05:31:24 -0800 Subject: [PATCH 11/17] gtkpod: fix build for libxml2 2.12 --- srcpkgs/gtkpod/patches/fix-libxml2-2.12.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 srcpkgs/gtkpod/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/gtkpod/patches/fix-libxml2-2.12.patch b/srcpkgs/gtkpod/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..58eab19153ee7f --- /dev/null +++ b/srcpkgs/gtkpod/patches/fix-libxml2-2.12.patch @@ -0,0 +1,12 @@ +Source: https://src.fedoraproject.org/rpms/gtkpod/blob/a3e1c785b5a43603ad46ef913b0644babbfc6a73/f/includes.patch + +--- a/libgtkpod/misc.c ++++ b/libgtkpod/misc.c +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include "charset.h" + #include "clientserver.h" + #include "misc.h" From 87dc5dad485dcefb8a6db30b91bcdc62ffc71d2a Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 19 Feb 2024 05:43:29 -0800 Subject: [PATCH 12/17] swiften: fix build for libxml2 2.12 --- srcpkgs/swiften/patches/fix-libxml2-2.12.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/swiften/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/swiften/patches/fix-libxml2-2.12.patch b/srcpkgs/swiften/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..3e3e4d16352060 --- /dev/null +++ b/srcpkgs/swiften/patches/fix-libxml2-2.12.patch @@ -0,0 +1,15 @@ +diff -rup Swiften/Parser/LibXMLParser.cpp.orig Swiften/Parser/LibXMLParser.cpp +--- a/Swiften/Parser/LibXMLParser.cpp ++++ b/Swiften/Parser/LibXMLParser.cpp +@@ -97,7 +97,11 @@ bool LibXMLParser::parse(const std::stri + if (xmlParseChunk(p->context_, data.c_str(), boost::numeric_cast(data.size()), false) == XML_ERR_OK) { + return true; + } ++#if LIBXML_VERSION >= 21200 ++ const xmlError* error = xmlCtxtGetLastError(p->context_); ++#else + xmlError* error = xmlCtxtGetLastError(p->context_); ++#endif + if (error->code == XML_WAR_NS_URI || error->code == XML_WAR_NS_URI_RELATIVE) { + xmlCtxtResetLastError(p->context_); + p->context_->errNo = XML_ERR_OK; From 9abab65127bf169dccb5f1d264983aa74d224715 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 19 Feb 2024 06:07:22 -0800 Subject: [PATCH 13/17] qt5-webengine: fix build for libxml2 2.12 --- .../patches/fix-libxml2-2.12.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 srcpkgs/qt5-webengine/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/qt5-webengine/patches/fix-libxml2-2.12.patch b/srcpkgs/qt5-webengine/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..f85ee4d01ff64f --- /dev/null +++ b/srcpkgs/qt5-webengine/patches/fix-libxml2-2.12.patch @@ -0,0 +1,34 @@ +Based on: https://github.com/chromium/chromium/commit/871f8ae9b65ce2679b0bc0be36902d65edf0c1e4 + +diff --git a/third_party/blink/renderer/core/xml/xslt_processor.h b/third_party/blink/renderer/core/xml/xslt_processor.h +index d53835e9675793e..2eaea31ed29b90f 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h ++++ b/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 +diff --git a/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc b/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc +index 133e0b3355d2f09..f424077089da87d 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc ++++ b/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(user_data); + if (!console) + return; From d61e2f76b983ea0e69f1203a682b549902860c0f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 19 Feb 2024 06:07:37 -0800 Subject: [PATCH 14/17] qt6-pdf: fix build for libxml2 2.12 --- .../qt6-pdf/patches/fix-libxml2-2.12.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 srcpkgs/qt6-pdf/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/qt6-pdf/patches/fix-libxml2-2.12.patch b/srcpkgs/qt6-pdf/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..f85ee4d01ff64f --- /dev/null +++ b/srcpkgs/qt6-pdf/patches/fix-libxml2-2.12.patch @@ -0,0 +1,34 @@ +Based on: https://github.com/chromium/chromium/commit/871f8ae9b65ce2679b0bc0be36902d65edf0c1e4 + +diff --git a/third_party/blink/renderer/core/xml/xslt_processor.h b/third_party/blink/renderer/core/xml/xslt_processor.h +index d53835e9675793e..2eaea31ed29b90f 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h ++++ b/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 +diff --git a/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc b/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc +index 133e0b3355d2f09..f424077089da87d 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc ++++ b/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(user_data); + if (!console) + return; From e685ba2788f04f6fd3d94dcbb670274f1995e8aa Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 19 Feb 2024 06:13:32 -0800 Subject: [PATCH 15/17] libmusicbrainz5: fix build for libxml2 2.12 --- .../patches/libxml2-2.12.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 srcpkgs/libmusicbrainz5/patches/libxml2-2.12.patch diff --git a/srcpkgs/libmusicbrainz5/patches/libxml2-2.12.patch b/srcpkgs/libmusicbrainz5/patches/libxml2-2.12.patch new file mode 100644 index 00000000000000..0a00d1bdc502d3 --- /dev/null +++ b/srcpkgs/libmusicbrainz5/patches/libxml2-2.12.patch @@ -0,0 +1,36 @@ +From 558c9ba0e6d702d5c877f75be98176f57abf1b02 Mon Sep 17 00:00:00 2001 +From: Christopher Degawa +Date: Sun, 8 Oct 2023 11:42:55 -0500 +Subject: [PATCH] libxml: constify the storage of xmlGetLastError() + +libxml2 recently made it a const return. +Since nothing is being modified of it, this should have no real effect +past satisfying the compiler. + +Signed-off-by: Christopher Degawa +--- + src/xmlParser.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/xmlParser.cc b/src/xmlParser.cc +index 53dec25..fee684c 100644 +--- a/src/xmlParser.cc ++++ b/src/xmlParser.cc +@@ -57,7 +57,7 @@ XMLNode *XMLRootNode::parseFile(const std::string &filename, XMLResults* results + + doc = xmlParseFile(filename.c_str()); + if ((doc == NULL) && (results != NULL)) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + results->message = error->message; + results->line = error->line; + results->code = error->code; +@@ -72,7 +72,7 @@ XMLNode *XMLRootNode::parseString(const std::string &xml, XMLResults* results) + + doc = xmlParseMemory(xml.c_str(), xml.length()); + if ((doc == NULL) && (results != NULL)) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + results->message = error->message; + results->line = error->line; + results->code = error->code; From 4380c925cc70ce2719aed2dbb5ea9882cb28a916 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 19 Feb 2024 06:27:42 -0800 Subject: [PATCH 16/17] osinfo-db-tools: fix build for libxml2 2.12 and gcc 14 --- .../patches/fix-libxml2-2.12.patch | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 srcpkgs/osinfo-db-tools/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/osinfo-db-tools/patches/fix-libxml2-2.12.patch b/srcpkgs/osinfo-db-tools/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..628005774327e9 --- /dev/null +++ b/srcpkgs/osinfo-db-tools/patches/fix-libxml2-2.12.patch @@ -0,0 +1,54 @@ +Not currently necessary, but will be with gcc 14 + +From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001 +From: Michal Privoznik +Date: Mon, 27 Nov 2023 15:04:43 +0100 +Subject: [PATCH] Make xmlError structs constant + +In libxml2 commits v2.12.0~14 and v2.12.0~77 the API changed so +that: + +1) xmlGetLastError() returns pointer to a constant xmlError + struct, and + +2) xmlSetStructuredErrorFunc() changed the signature of callback + (validate_structured_error_nop()), it too is passed pointer to + a constant xmlError struct. + +But of course, older libxml2 expects different callback +signature. Therefore, we need to typecast it anyway. + +Also, drop obviously incorrect @error annotation in +validate_structured_error_nop; the variable is used. + +Signed-off-by: Michal Privoznik +--- + tools/osinfo-db-validate.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c +index a721b4d..b1434a6 100644 +--- a/tools/osinfo-db-validate.c ++++ b/tools/osinfo-db-validate.c +@@ -35,7 +35,7 @@ static void validate_generic_error_nop(void *userData G_GNUC_UNUSED, + } + + static void validate_structured_error_nop(void *userData G_GNUC_UNUSED, +- xmlErrorPtr error G_GNUC_UNUSED) ++ const xmlError *error) + { + if (error->file) + g_printerr("%s:%d %s", error->file, error->line, error->message); +@@ -173,7 +173,8 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro + g_autofree gchar *schemapath = NULL; + + xmlSetGenericErrorFunc(NULL, validate_generic_error_nop); +- xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop); ++ /* Drop this typecast when >=libxml2-2.12.0 is required */ ++ xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) validate_structured_error_nop); + + schemapath = g_file_get_path(schema); + rngParser = xmlRelaxNGNewParserCtxt(schemapath); +-- +GitLab + From 37f053829d853097e0ec01cabcce2ec2d1b2ad3e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 19 Feb 2024 06:32:05 -0800 Subject: [PATCH 17/17] libreoffice: fix build for libxml2 2.12 --- .../patches/fix-libxml2-2.12.patch | 300 ++++++++++++++++++ 1 file changed, 300 insertions(+) create mode 100644 srcpkgs/libreoffice/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/libreoffice/patches/fix-libxml2-2.12.patch b/srcpkgs/libreoffice/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..d4c6083dd74589 --- /dev/null +++ b/srcpkgs/libreoffice/patches/fix-libxml2-2.12.patch @@ -0,0 +1,300 @@ +From c8f7408db73d2f2ccacb25a2b4fef8dfebdfc6cb Mon Sep 17 00:00:00 2001 +From: Miklos Vajna +Date: Mon, 27 Nov 2023 08:02:59 +0100 +Subject: [PATCH] tdf#158302 fix build against system-libxml-2.12 + +Seen in a fedora:40 container, using --with-system-libcmis, +--with-system-liblangtag and --with-system-xmlsec. + +Change-Id: I9d748d3dc0b70dbfdfcb6b99c9ce8440bda6f326 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159980 +Tested-by: Jenkins +Reviewed-by: Miklos Vajna +--- + drawinglayer/source/tools/primitive2dxmldump.cxx | 1 + + filter/source/xsltfilter/LibXSLTTransformer.cxx | 2 +- + helpcompiler/source/HelpLinker.cxx | 4 ++++ + include/xmloff/xmltoken.hxx | 2 +- + sax/source/fastparser/fastparser.cxx | 2 +- + sc/source/core/tool/interpr7.cxx | 1 + + sc/source/filter/xml/XMLExportDataPilot.cxx | 2 +- + sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 2 +- + sc/source/filter/xml/xmlfilti.cxx | 6 +++--- + unoxml/source/dom/attr.cxx | 1 + + unoxml/source/dom/document.cxx | 1 + + unoxml/source/dom/documentbuilder.cxx | 1 + + unoxml/source/dom/entity.cxx | 1 + + unoxml/source/xpath/xpathapi.cxx | 7 ++++++- + xmloff/source/core/xmltoken.cxx | 2 +- + xmloff/source/style/PageMasterStyleMap.cxx | 2 +- + xmlsecurity/inc/xmlsec-wrapper.h | 1 + + xmlsecurity/inc/xmlsec/saxhelper.hxx | 1 + + 18 files changed, 28 insertions(+), 11 deletions(-) + +diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx +index 76aefec902ead..f3b9ef1bc9193 100644 +--- a/drawinglayer/source/tools/primitive2dxmldump.cxx ++++ b/drawinglayer/source/tools/primitive2dxmldump.cxx +@@ -15,6 +15,7 @@ + + #include + #include ++#include + #include + + #include +diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx +index 1a7c34805f1b5..5e9a7c4bcd35e 100644 +--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx ++++ b/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); +diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx +index 3d52834dbe6bf..898a8b26392a9 100644 +--- a/helpcompiler/source/HelpLinker.cxx ++++ b/helpcompiler/source/HelpLinker.cxx +@@ -815,7 +815,11 @@ static const HelpProcessingException* GpXMLParsingException = nullptr; + + extern "C" { + ++#if LIBXML_VERSION >= 21200 ++static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, const xmlError* error) ++#else + static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, xmlErrorPtr error) ++#endif + { + std::string aErrorMsg = error->message; + std::string aXMLParsingFile; +diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx +index 4e64418417740..ba42fae4d035a 100644 +--- a/include/xmloff/xmltoken.hxx ++++ b/include/xmloff/xmltoken.hxx +@@ -744,7 +744,7 @@ namespace xmloff::token { + XML_EMBEDDED_VISIBLE_AREA, + XML_EMBOSSED, + XML_EMISSIVE_COLOR, +- XML_EMPTY, ++ XML_TOKEN_EMPTY, + XML_EMPTY_LINE_REFRESH, + XML_ENABLE_NUMBERING, + XML_ENABLED, +diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx +index ec8065016a12d..e0338e053cf05 100644 +--- a/sax/source/fastparser/fastparser.cxx ++++ b/sax/source/fastparser/fastparser.cxx +@@ -578,7 +578,7 @@ Event& Entity::getEvent( CallbackType aType ) + 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 +diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx +index 352c7cf70e45d..ecb4ea346396b 100644 +--- a/sc/source/core/tool/interpr7.cxx ++++ b/sc/source/core/tool/interpr7.cxx +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + using namespace com::sun::star; + +diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx +index da65bec0dab75..bd5f16d828ff7 100644 +--- a/sc/source/filter/xml/XMLExportDataPilot.cxx ++++ b/sc/source/filter/xml/XMLExportDataPilot.cxx +@@ -123,7 +123,7 @@ void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, boo + + if (aQueryEntry.IsQueryByEmpty()) + { +- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_EMPTY)); ++ rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_TOKEN_EMPTY)); + } + else if (aQueryEntry.IsQueryByNonEmpty()) + { +diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +index 6905e02d651bc..e4307065bd92f 100644 +--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx ++++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +@@ -376,7 +376,7 @@ class WriteDatabaseRange + case SC_EQUAL: + { + if (rEntry.IsQueryByEmpty()) +- return GetXMLToken(XML_EMPTY); ++ return GetXMLToken(XML_TOKEN_EMPTY); + else if (rEntry.IsQueryByNonEmpty()) + return GetXMLToken(XML_NOEMPTY); + +diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx +index 7585ce0c50fa1..61f7cfe4a3495 100644 +--- a/sc/source/filter/xml/xmlfilti.cxx ++++ b/sc/source/filter/xml/xmlfilti.cxx +@@ -370,7 +370,7 @@ void ScXMLConditionContext::GetOperator( + rEntry.eOp = SC_BOTPERC; + else if (IsXMLToken(aOpStr, XML_BOTTOM_VALUES)) + rEntry.eOp = SC_BOTVAL; +- else if (IsXMLToken(aOpStr, XML_EMPTY)) ++ else if (IsXMLToken(aOpStr, XML_TOKEN_EMPTY)) + rEntry.SetQueryByEmpty(); + else if (aOpStr == u">") + rEntry.eOp = SC_GREATER; +@@ -422,7 +422,7 @@ void SAL_CALL ScXMLConditionContext::endFastElement( sal_Int32 /*nElement*/ ) + if (maQueryItems.empty()) + { + ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); +- if (IsXMLToken(sOperator, XML_EMPTY)) ++ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY)) + return; + if (IsXMLToken(sDataType, XML_NUMBER)) + { +@@ -753,7 +753,7 @@ void SAL_CALL ScXMLDPConditionContext::endFastElement( sal_Int32 /*nElement*/ ) + else + aFilterField.eConnect = SC_AND; + pFilterContext->SetIsCaseSensitive(bIsCaseSensitive); +- if (IsXMLToken(sOperator, XML_EMPTY)) ++ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY)) + aFilterField.SetQueryByEmpty(); + else if (IsXMLToken(sOperator, XML_NOEMPTY)) + aFilterField.SetQueryByNonEmpty(); +diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx +index dd974d910edb1..d8d873cdf0555 100644 +--- a/unoxml/source/dom/attr.cxx ++++ b/unoxml/source/dom/attr.cxx +@@ -22,6 +22,7 @@ + #include + + #include ++#include + + #include + #include +diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx +index cb48bd1635f82..0825fc2cd7edd 100644 +--- a/unoxml/source/dom/document.cxx ++++ b/unoxml/source/dom/document.cxx +@@ -41,6 +41,7 @@ + #include + + #include ++#include + + #include + +diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx +index c3cd7663d2fc6..3898d58e4be4a 100644 +--- a/unoxml/source/dom/documentbuilder.cxx ++++ b/unoxml/source/dom/documentbuilder.cxx +@@ -22,6 +22,7 @@ + #include + + #include ++#include + + #include + +diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx +index ccc8a08724997..98909dfe8f123 100644 +--- a/unoxml/source/dom/entity.cxx ++++ b/unoxml/source/dom/entity.cxx +@@ -22,6 +22,7 @@ + #include + + #include ++#include + + using namespace css::uno; + using namespace css::xml::dom; +diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx +index a60083983882e..c2b7537831766 100644 +--- a/unoxml/source/xpath/xpathapi.cxx ++++ b/unoxml/source/xpath/xpathapi.cxx +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include + +@@ -217,7 +218,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 +260,11 @@ namespace XPath + SAL_WARN("unoxml", "libxml2 error: " << str); + } + ++#if LIBXML_VERSION >= 21200 ++ static void structured_error_func(void *, const xmlError* error) ++#else + static void structured_error_func(void *, xmlErrorPtr error) ++#endif + { + SAL_WARN("unoxml", "libxml2 error: " << make_error_message(error)); + } +diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx +index 6879f37db2950..e11dc0d161119 100644 +--- a/xmloff/source/core/xmltoken.cxx ++++ b/xmloff/source/core/xmltoken.cxx +@@ -756,7 +756,7 @@ namespace xmloff::token { + TOKEN( "embedded-visible-area", XML_EMBEDDED_VISIBLE_AREA ), + TOKEN( "embossed", XML_EMBOSSED ), + TOKEN( "emissive-color", XML_EMISSIVE_COLOR ), +- TOKEN( "empty", XML_EMPTY ), ++ TOKEN( "empty", XML_TOKEN_EMPTY ), + TOKEN( "empty-line-refresh", XML_EMPTY_LINE_REFRESH ), + TOKEN( "enable-numbering", XML_ENABLE_NUMBERING ), + TOKEN( "enabled", XML_ENABLED ), +diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx +index 7b2cab4751aa8..6f631289672b7 100644 +--- a/xmloff/source/style/PageMasterStyleMap.cxx ++++ b/xmloff/source/style/PageMasterStyleMap.cxx +@@ -157,7 +157,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = + PLMAP( PROP_FootnoteLineRelativeWidth, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_PERCENT8|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_WIDTH ), + PLMAP( PROP_FootnoteLineTextDistance, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_MEASURE|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_DISTANCE ), + PLMAP( PROP_FootnoteLineWeight, XML_NAMESPACE_STYLE, XML_FOOTNOTE_SEP, XML_TYPE_MEASURE16|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_WEIGHT ), +- PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ), ++ PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_TOKEN_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ), + PLMAP_EXT(PROP_GutterMargin, XML_NAMESPACE_LO_EXT, XML_MARGIN_GUTTER, XML_TYPE_MEASURE, CTF_PM_MARGINGUTTER), + + ////////////////////////////////////////////////////////////////////////// +diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h +index 7c6d267e8b739..3ad705400c52c 100644 +--- a/xmlsecurity/inc/xmlsec-wrapper.h ++++ b/xmlsecurity/inc/xmlsec-wrapper.h +@@ -23,6 +23,7 @@ + + #include + ++#include + #include + #include + #include +diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx +index a49ccef1894c6..a5863ffd0e2a0 100644 +--- a/xmlsecurity/inc/xmlsec/saxhelper.hxx ++++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx +@@ -23,6 +23,7 @@ + + #include + ++#include + #include + + #include