From 32c5bdb95db2a0e7a13ddfaaad7a9bebbb38e851 Mon Sep 17 00:00:00 2001 From: Debian Qt/KDE Maintainers Date: Thu, 9 Jan 2025 14:39:01 +0300 Subject: [PATCH] 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 --- 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 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) -- 2.30.2