webkitgtk-6.0:version from 2.41.4 to 2.41.5

Some small whitespace fixes and removal of unused variables. Also added
new libjxl dependency.

4 files changed, 18 insertions, 15 deletions

diff --git a/webkitgtk-6.0/.footprint b/webkitgtk-6.0/.footprint
index 3f0c06a..487d3dc 100644
--- a/webkitgtk-6.0/.footprint
+++ b/webkitgtk-6.0/.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.3
--rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-6.0.so.1.1.3
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-6.0.so.1 -> libjavascriptcoregtk-6.0.so.1.1.4
+-rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-6.0.so.1.1.4
 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.2.0
--rwxr-xr-x	root/root	usr/lib/libwebkitgtk-6.0.so.4.2.0
+lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-6.0.so.4 -> libwebkitgtk-6.0.so.4.2.1
+-rwxr-xr-x	root/root	usr/lib/libwebkitgtk-6.0.so.4.2.1
 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
diff --git a/webkitgtk-6.0/.md5sum b/webkitgtk-6.0/.md5sum
index f620199..08b91a5 100644
--- a/webkitgtk-6.0/.md5sum
+++ b/webkitgtk-6.0/.md5sum
@@ -1,2 +1,2 @@
 0b8c32b92dddd063c5fbaff3cec96e44  pipewire.patch
-f3d8c974ee510802dc67dab7860df1db  webkitgtk-2.41.4.tar.xz
+99105a984c4e7e4d7ba8aac7b644d8f0  webkitgtk-2.41.5.tar.xz
diff --git a/webkitgtk-6.0/.signature b/webkitgtk-6.0/.signature
index 5c27cd6..b3c4189 100644
--- a/webkitgtk-6.0/.signature
+++ b/webkitgtk-6.0/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/nullspoon-web.pub
-RWQWGh6g2RuV7tWgqzilyUGLYEhMDUkwtmoC1fdhoMc+W1srHqeuW+Bxo444HnViqOR5zIqGM62q4i4v+PCBTdXaTXUjwPyDHwI=
-SHA256 (Pkgfile) = 5591cf129508712531957188eabbc3f171e6fc755a9571f78615747eaf14df3f
-SHA256 (.footprint) = c750db9958f4a2a40e28b50887586bc3f8b44b09973bd0f4640866f76328bd48
-SHA256 (webkitgtk-2.41.4.tar.xz) = ad792d4acd4e8536cc0a652fd0303bfef93a7f8718d2b3d72db83e25f52777af
+RWQWGh6g2RuV7ivTSsr+PFeRRq8mQaLQyL8Gx34Tj7cnw2EcbV4JBg/GJPgrxlHQJq9doDklk3wW0HM/Uu+nqGjZ7UzxlJ+NjQU=
+SHA256 (Pkgfile) = 68131a0bb89396f671e2450f1c01a5a074493904e2c135023df56316ad216d8d
+SHA256 (.footprint) = 99e4a45d3697d27828d684551c7798922e9f8494861e997e8cc0bf0cdd4881ac
+SHA256 (webkitgtk-2.41.5.tar.xz) = b6289dfc1c46a0ff94fea3872dd2955f659a26a891af41796504c6ac87be7473
 SHA256 (pipewire.patch) = ca4a27c4edd3099d0c8b99ef91796feb00038d1daba0055328597c54e952e56b
diff --git a/webkitgtk-6.0/Pkgfile b/webkitgtk-6.0/Pkgfile
index a5b0c83..b5e960c 100644
--- a/webkitgtk-6.0/Pkgfile
+++ b/webkitgtk-6.0/Pkgfile
@@ -1,19 +1,22 @@
 # Description: Small, efficient and fast rendering engine for Web Browsers.
 # URL:         https://www.webkitgtk.org/
 # Maintainer:  Aaron Ball, nullspoon at oper dot io
-# Depends on:  gst-plugins-base gtk4 hyphen icu lcms2 libseccomp libsecret libsoup3 xorg-libxcomposite libwebp libxslt ruby woff2 xorg-libxt gi-docgen openjpeg2 libnotify enchant wpebackend-fdo unifdef libavif bubblewrap xdg-dbus-proxy
+# Depends on:  gst-plugins-base gtk4 hyphen icu lcms2 libseccomp libsecret libsoup3 xorg-libxcomposite libwebp libxslt ruby woff2 xorg-libxt gi-docgen openjpeg2 libnotify enchant wpebackend-fdo unifdef libavif bubblewrap xdg-dbus-proxy libjxl
 # Optional:
 
 name=webkitgtk-6.0
-#version=2.40.0  # Stable
-version=2.41.4   # Unstable
+#version=2.40.3  # Stable
+version=2.41.5   # Unstable
 release=1
 source=(https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz
         pipewire.patch)
 
 build() {
-	# fail the build if dependencies are not met
-	ls /usr/include/harfbuzz/hb-icu.h || (printf '\e[1;31m%-6s\e[m\n' "You need to install icu, then rebuild harfbuzz for webkitgtk to work, quitting..." ; exit 1)
+  # fail the build if dependencies are not met
+  if [ ! -f /usr/include/harfbuzz/hb-icu.h ]; then
+     printf '\e[1;31mYou need to install icu, then rebuild harfbuzz for webkitgtk to work, quitting...\e[m\n' >&2
+     return 1
+  fi
 
   # Bug: https://bugs.webkit.org/show_bug.cgi?id=239682
   # Fix: https://github.com/WebKit/WebKit/pull/5671
@@ -25,7 +28,7 @@ build() {
   export CFLAGS='-g1'
   export CXXFLAGS='-g1'
 
-	cmake -S webkitgtk-$version -B build -G Ninja ${PKGMK_WEBKITGTK} \
+	cmake -S webkitgtk-${version} -B build -G Ninja \
 		-D CMAKE_INSTALL_PREFIX:PATH=/usr \
 		-D CMAKE_INSTALL_LIBDIR:PATH=/usr/lib \
 		-D CMAKE_INSTALL_LIBEXECDIR:PATH=/usr/lib \