webkitgtk-60: 2.42.2 -> 2.42.3

webkitgtk-60/.footprint

@@ -103,11 +103,11 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit-6.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKitWebProcessExtension-6.0.typelib
 lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-6.0.so -> libjavascriptcoregtk-6.0.so.1
-lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-6.0.so.1 -> libjavascriptcoregtk-6.0.so.1.1.11
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-6.0.so.1 -> libjavascriptcoregtk-6.0.so.1.1.12
--rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-6.0.so.1.1.11
+-rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-6.0.so.1.1.12
 lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-6.0.so -> libwebkitgtk-6.0.so.4
-lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-6.0.so.4 -> libwebkitgtk-6.0.so.4.4.5
+lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-6.0.so.4 -> libwebkitgtk-6.0.so.4.4.6
--rwxr-xr-x	root/root	usr/lib/libwebkitgtk-6.0.so.4.4.5
+-rwxr-xr-x	root/root	usr/lib/libwebkitgtk-6.0.so.4.4.6
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/javascriptcoregtk-6.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/webkitgtk-6.0.pc

webkitgtk-60/.signature

@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/jmq.pub
-RWTTPlFarK9CxEqF8i5jiF7NqtjdRD8jwVqkNua9IneND3K2lCy7id573d5Q2Q1bKd5KKiBvEpHfCDWjS8WaAc+8AOn4Y6wNcQs=
+RWTTPlFarK9CxPBEv8NxGHg1XZW7IANF9LbNtqXpZgARR2HbUA9UFcGFoWxLIldxhf1laUMl6Kkj3WLbNM0S9cXL43U9F/ITmwI=
-SHA256 (Pkgfile) = ee0a24e466793bcf334ebc2606511e622f4490bf0234f0f8cfbf78fe3f33eab3
+SHA256 (Pkgfile) = 8d5517d6e7b3ed63be3b718bb153142919f7c1b2147f5fcb34be4042d3fe7ff8
-SHA256 (.footprint) = a284c7299c97bda7812829e51f3e9d22dd94e9572aa57f143dec01544d1e2f4e
+SHA256 (.footprint) = b87914020d41d3801e5967758a0a14ce00cbe34fa01468fb0957a9b199e29038
-SHA256 (webkitgtk-2.42.2.tar.xz) = 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118
+SHA256 (webkitgtk-2.42.3.tar.xz) = 0a1a4630045628b3a6fe95da72dc47852cff20d66be1ac6fd0d669c88c13d8e2
-SHA256 (1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch) = c286efbff5b3693a155040eb6d81cd7096e75276cd632ae0c83d059f03b9bd9f

webkitgtk-60/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-60/Pkgfile

@@ -5,19 +5,18 @@
 # Optional: enchant libjxl libnotify geoclue openjpeg2 xdg-dbus-proxy bubblewrap pipewire wpebackend-fdo libmanette
 
 name=webkitgtk-60
-version=2.42.2
+version=2.42.3
-release=2
+release=1
-source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz
+source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz)
-        1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch)
 
 build() {
   # fail the build if dependencies are not met
   [ -e /usr/include/harfbuzz/hb-icu.h ] || \
   { echo "Rebuild harfbuzz with icu present; otherwise webkitgtk will not work."; exit 1; }
 
-  for p in $SRC/*.patch; do
+  #for p in $SRC/*.patch; do
-    patch -Np1 -d webkitgtk-$version -i $p
+  #  patch -Np1 -d webkitgtk-$version -i $p
-  done
+  #done
 
   PKGMK_WEBKITGTK=(-G Ninja -D CMAKE_BUILD_TYPE=Release
     -Wno-dev -D CMAKE_INSTALL_PREFIX:PATH=/usr