From: Debian Qt/KDE Maintainers Date: Fri, 5 Jul 2024 07:43:37 +0000 (+0300) Subject: fix build with libxml2 version 2.12.0 X-Git-Tag: archive/raspbian/5.212.0_alpha4-39+rpi1^2~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4cd7a16d9d903d47c1a113108469b0bfea39ab42;p=qtwebkit-opensource-src.git fix build with libxml2 version 2.12.0 Origin: upstream, https://commits.webkit.org/270977@main Last-Update: 2024-01-22 Gbp-Pq: Name libxml2_2.12.diff --- diff --git a/Source/WebCore/xml/XSLTProcessor.h b/Source/WebCore/xml/XSLTProcessor.h index cffd1c45..88094c02 100644 --- a/Source/WebCore/xml/XSLTProcessor.h +++ b/Source/WebCore/xml/XSLTProcessor.h @@ -64,7 +64,11 @@ public: 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 8587b006..bd54afaf 100644 --- a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp +++ b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp @@ -78,7 +78,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)