<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/915fbf4e3d488321c05f7ff2123282979bb9af46">https://github.com/macports/macports-ports/commit/915fbf4e3d488321c05f7ff2123282979bb9af46</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 915fbf4e3d4 webkit2-gtk: fix build with libxml2 2.12+
</span>915fbf4e3d4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 915fbf4e3d488321c05f7ff2123282979bb9af46
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Feb 29 20:27:24 2024 -0800
<span style='display:block; white-space:pre;color:#404040;'> webkit2-gtk: fix build with libxml2 2.12+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> see: https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b
</span>---
www/webkit2-gtk/Portfile | 4 ++
...patch-webkit2-gtk-fixes-for-libxml2-2.12.0.diff | 56 ++++++++++++++++++++++
2 files changed, 60 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/Portfile b/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 171523c4a1d..15c572a3c40 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,6 +117,10 @@ patchfiles-append patch-webkit2gtk-specify-installed-dylibs.diff
</span> # Backport https://github.com/WebKit/WebKit/commit/b83958928838b8a997c12a8de06f89377df0a903
patchfiles-append patch-icu-68-true-false.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# API changed with libxml2 2.12+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-webkit2-gtk-fixes-for-libxml2-2.12.0.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Reduce compilation warnings
configure.cppflags-append \
-Wno-deprecated-declarations
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-webkit2-gtk-fixes-for-libxml2-2.12.0.diff b/www/webkit2-gtk/files/patch-webkit2-gtk-fixes-for-libxml2-2.12.0.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..940cfd4dfce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-webkit2-gtk-fixes-for-libxml2-2.12.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1bad176b2496579d760852c80cff3ad9fb7c3a4b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Adrian Perez de Castro <aperez@igalia.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 20 Nov 2023 07:42:30 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Build fails with libxml2 version 2.12.0 due to API change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://bugs.webkit.org/show_bug.cgi?id=265128
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed by Philippe Normand.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Starting with libxml2 2.12.0, the API has changed the const-ness of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xmlError pointers, which results in a build error due to a mismatched
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+type in the parsing error callback. This papers over the difference by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+using preprocessor conditionals.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Source/WebCore/xml/XSLTProcessor.h: Use const when building against
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libxml2 2.12.0 or newer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* Source/WebCore/xml/XSLTProcessorLibxslt.cpp:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(WebCore::XSLTProcessor::parseErrorFunc): Ditto.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Canonical link: https://commits.webkit.org/270977@main
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Source/WebCore/xml/XSLTProcessor.h | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Source/WebCore/xml/XSLTProcessorLibxslt.cpp | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 8 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebCore/xml/XSLTProcessor.h Source/WebCore/xml/XSLTProcessor.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 21bb45b5cbe16..5cf20557918fa 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/xml/XSLTProcessor.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/xml/XSLTProcessor.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,11 @@ class XSLTProcessor : public RefCounted<XSLTProcessor> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void reset();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if LIBXML_VERSION >= 21200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static void parseErrorFunc(void* userData, const xmlError*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void parseErrorFunc(void* userData, xmlError*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void genericErrorFunc(void* userData, const char* msg, ...);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Only for libXSLT callbacks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebCore/xml/XSLTProcessorLibxslt.cpp Source/WebCore/xml/XSLTProcessorLibxslt.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a65691087e3c5..9f6b363dfc6c9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/xml/XSLTProcessorLibxslt.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/xml/XSLTProcessorLibxslt.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,11 @@ void XSLTProcessor::genericErrorFunc(void*, const char*, ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // It would be nice to do something with this error message.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if LIBXML_VERSION >= 21200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PageConsoleClient* console = static_cast<PageConsoleClient*>(userData);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!console)
</span>\ No newline at end of file
</pre><pre style='margin:0'>
</pre>