webkitgtk: 2.42.2 -> 2.42.3

webkitgtk/.footprint

@@ -233,11 +233,11 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit2-4.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-4.0.so -> libjavascriptcoregtk-4.0.so.18
-lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18 -> libjavascriptcoregtk-4.0.so.18.23.11
--rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18.23.11
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18 -> libjavascriptcoregtk-4.0.so.18.23.12
+-rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18.23.12
 lrwxrwxrwx	root/root	usr/lib/libwebkit2gtk-4.0.so -> libwebkit2gtk-4.0.so.37
-lrwxrwxrwx	root/root	usr/lib/libwebkit2gtk-4.0.so.37 -> libwebkit2gtk-4.0.so.37.67.5
--rwxr-xr-x	root/root	usr/lib/libwebkit2gtk-4.0.so.37.67.5
+lrwxrwxrwx	root/root	usr/lib/libwebkit2gtk-4.0.so.37 -> libwebkit2gtk-4.0.so.37.67.6
+-rwxr-xr-x	root/root	usr/lib/libwebkit2gtk-4.0.so.37.67.6
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/javascriptcoregtk-4.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/webkit2gtk-4.0.pc

webkitgtk/.signature

@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/R+1DNlhqyVkzAc3fGVZTuto78bUhJR8W3YEeqalPryyFu10Oe3jf2H9T5TWvdjjp6ruSd3NXxVOVYklVhzR6wY=
-SHA256 (Pkgfile) = d3c954e979bb79756ffd0c2701a279ce4b095537e2f71976cdf43aee22bb5f8b
-SHA256 (.footprint) = 92462d5d8238221b062db5b6391fd1afcdadc78b645b53835910b44bd478883f
-SHA256 (webkitgtk-2.42.2.tar.xz) = 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118
-SHA256 (1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch) = c286efbff5b3693a155040eb6d81cd7096e75276cd632ae0c83d059f03b9bd9f
+RWSE3ohX2g5d/YP96AHBLHziCwPdztuQKZZqexGowRJHGOEtsQKzmXNoQH+jxkbZXUinoJ1TRylHI8hkEZAgOmuQmUNe7HeUSQM=
+SHA256 (Pkgfile) = 599a223b7a5cacf449de4bf4e3c9c72699ff5a155670928f91545bffacc5ea4c
+SHA256 (.footprint) = 4b994927683d4022705af6e394517ea7b0fe3f9ef6cd67c7476d85fb7482323b
+SHA256 (webkitgtk-2.42.3.tar.xz) = 0a1a4630045628b3a6fe95da72dc47852cff20d66be1ac6fd0d669c88c13d8e2

webkitgtk/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch

@@ -1,56 +0,0 @@
-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)

webkitgtk/Pkgfile

@@ -5,10 +5,9 @@
 # Optional: bubblewrap enchant geoclue gst-plugins-bad libavif libmanette libnotify openjpeg2 wpebackend-fdo xdg-dbus-proxy
 
 name=webkitgtk
-version=2.42.2
-release=2
-source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz
-  1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch)
+version=2.42.3
+release=1
+source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz)
 
 build() {
   # fail the build if dependencies are not met
@@ -28,8 +27,6 @@ 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 \