commit ec1be99c423c22dcaf56dce55b634722c7d26092 Author: Tim Biermann <tbier@posteo.de> Date: Mon Nov 27 20:52:03 2023 +0100 webkitgtk: rebuilt with libxml2 2.12.0 diff --git a/webkitgtk/.signature b/webkitgtk/.signature index 15092b633..2f1966613 100644 --- a/webkitgtk/.signature +++ b/webkitgtk/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UFSwIEL1etlBhLI2JGGmjvLHIR7WtArpK0zbCgMvexrkufmOQUGEf7opB9Y8le0r/Pm/WAAoTEM4Iw7smvQxQw= -SHA256 (Pkgfile) = 75b774ecf2a299ab34ac92d07d7797d08d776674b84a70f127d68e4335bd4e4a +RWSE3ohX2g5d/R+1DNlhqyVkzAc3fGVZTuto78bUhJR8W3YEeqalPryyFu10Oe3jf2H9T5TWvdjjp6ruSd3NXxVOVYklVhzR6wY= +SHA256 (Pkgfile) = d3c954e979bb79756ffd0c2701a279ce4b095537e2f71976cdf43aee22bb5f8b SHA256 (.footprint) = 92462d5d8238221b062db5b6391fd1afcdadc78b645b53835910b44bd478883f SHA256 (webkitgtk-2.42.2.tar.xz) = 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118 +SHA256 (1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch) = c286efbff5b3693a155040eb6d81cd7096e75276cd632ae0c83d059f03b9bd9f diff --git a/webkitgtk/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch b/webkitgtk/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch new file mode 100644 index 000000000..0529514ff --- /dev/null +++ b/webkitgtk/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch @@ -0,0 +1,56 @@ +From 1bad176b2496579d760852c80cff3ad9fb7c3a4b Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro <aperez@igalia.com> +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<XSLTProcessor> { + + 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<PageConsoleClient*>(userData); + if (!console) diff --git a/webkitgtk/Pkgfile b/webkitgtk/Pkgfile index 658ac4d66..5b89de7ed 100644 --- a/webkitgtk/Pkgfile +++ b/webkitgtk/Pkgfile @@ -6,8 +6,9 @@ name=webkitgtk version=2.42.2 -release=1 -source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz) +release=2 +source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz + 1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch) build() { # fail the build if dependencies are not met @@ -27,6 +28,8 @@ build() { prt-get isinst libavif || PKGMK_WEBKITGTK+=' -DUSE_AVIF=OFF' prt-get isinst gst_plugins-bad || PKGMK_WEBKITGTK+=' -DUSE_GSTREAMER_TRANSCODER=OFF' + patch -Np1 -d webkitgtk-$version -i $SRC/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch + cmake -S webkitgtk-$version -B build -G Ninja ${PKGMK_WEBKITGTK} \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=/usr/lib \