diff --git a/x11-packages/webkit2gtk-4.1/build.sh b/x11-packages/webkit2gtk-4.1/build.sh
index 8734173479..eb63b86912 100644
--- a/x11-packages/webkit2gtk-4.1/build.sh
+++ b/x11-packages/webkit2gtk-4.1/build.sh
@@ -29,6 +29,15 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DUSE_AVIF=OFF
"
+termux_step_post_get_source() {
+ # Version guard
+ local ver_e=${TERMUX_PKG_VERSION#*:}
+ local ver_x=$(. $TERMUX_SCRIPTDIR/x11-packages/webkitgtk-6.0/build.sh; echo ${TERMUX_PKG_VERSION#*:})
+ if [ "${ver_e}" != "${ver_x}" ]; then
+ termux_error_exit "Version mismatch between webkit2gtk-4.1 and webkitgtk-6.0."
+ fi
+}
+
termux_step_pre_configure() {
TERMUX_PKG_VERSION=. termux_setup_gir
diff --git a/x11-packages/webkitgtk-6.0/build.sh b/x11-packages/webkitgtk-6.0/build.sh
index a56198927b..944c3e5e63 100644
--- a/x11-packages/webkitgtk-6.0/build.sh
+++ b/x11-packages/webkitgtk-6.0/build.sh
@@ -2,15 +2,21 @@ TERMUX_PKG_HOMEPAGE=https://webkitgtk.org
TERMUX_PKG_DESCRIPTION="A full-featured port of the WebKit rendering engine"
TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.40.3
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_VERSION="2.42.4"
TERMUX_PKG_SRCURL=https://webkitgtk.org/releases/webkitgtk-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=cc0aa83f40dbc64c1c6ae42ec6b85af4be2a9dbf524cfcb95f89a367fb5098dd
+TERMUX_PKG_SHA256=52288b30bda22373442cecb86f9c9a569ad8d4769a1f97b352290ed92a67ed86
TERMUX_PKG_DEPENDS="enchant, fontconfig, freetype, glib, gst-plugins-bad, gst-plugins-base, gst-plugins-good, gstreamer, gtk4, harfbuzz, harfbuzz-icu, libc++, libcairo, libgcrypt, libhyphen, libicu, libjpeg-turbo, libpng, libsoup3, libtasn1, libwebp, libxml2, libx11, libxcomposite, libxdamage, libxslt, libxt, littlecms, openjpeg, pango, woff2, zlib"
TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, xorgproto"
TERMUX_PKG_DISABLE_GIR=false
termux_step_post_get_source() {
+ # Version guard
+ local ver_e=${TERMUX_PKG_VERSION#*:}
+ local ver_x=$(. $TERMUX_SCRIPTDIR/x11-packages/webkit2gtk-4.1/build.sh; echo ${TERMUX_PKG_VERSION#*:})
+ if [ "${ver_e}" != "${ver_x}" ]; then
+ termux_error_exit "Version mismatch between webkit2gtk-4.1 and webkitgtk-6.0."
+ fi
+
local p
for p in $TERMUX_SCRIPTDIR/x11-packages/webkit2gtk-4.1/*.patch; do
echo "Applying $(basename "${p}")"
@@ -31,8 +37,12 @@ termux_step_pre_configure() {
termux_setup_gir
+ # Workaround for https://github.com/android/ndk/issues/1973
+ [ "$TERMUX_ARCH" == "arm" ] && sed -i '/#define MUST_TAIL_CALL \[\[clang::musttail]]/d' Source/WTF/wtf/Compiler.h
+
CPPFLAGS+=" -DHAVE_MISSING_STD_FILESYSTEM_PATH_CONSTRUCTOR"
CPPFLAGS+=" -DCMS_NO_REGISTER_KEYWORD"
+ CPPFLAGS+=" -I${TERMUX_PREFIX}/lib/gstreamer-1.0/include"
}
termux_step_post_massage() {
diff --git a/x11-packages/webkitgtk-6.0/gir/2.40.3/JavaScriptCore-6.0.xml b/x11-packages/webkitgtk-6.0/gir/2.42.4/JavaScriptCore-6.0.xml
similarity index 100%
rename from x11-packages/webkitgtk-6.0/gir/2.40.3/JavaScriptCore-6.0.xml
rename to x11-packages/webkitgtk-6.0/gir/2.42.4/JavaScriptCore-6.0.xml
diff --git a/x11-packages/webkitgtk-6.0/gir/2.40.3/WebKit-6.0.xml b/x11-packages/webkitgtk-6.0/gir/2.42.4/WebKit-6.0.xml
similarity index 97%
rename from x11-packages/webkitgtk-6.0/gir/2.40.3/WebKit-6.0.xml
rename to x11-packages/webkitgtk-6.0/gir/2.42.4/WebKit-6.0.xml
index 766c7a6ede..99386c384d 100644
--- a/x11-packages/webkitgtk-6.0/gir/2.40.3/WebKit-6.0.xml
+++ b/x11-packages/webkitgtk-6.0/gir/2.42.4/WebKit-6.0.xml
@@ -115,6 +115,15 @@
+
+
+
+
+
+
+
+
+
@@ -269,6 +278,9 @@
+
+
+
@@ -320,6 +332,8 @@
+
+
@@ -424,7 +438,7 @@
-
+
@@ -515,6 +529,8 @@
+
+
diff --git a/x11-packages/webkitgtk-6.0/gir/2.40.3/WebKitWebProcessExtension-6.0.xml b/x11-packages/webkitgtk-6.0/gir/2.42.4/WebKitWebProcessExtension-6.0.xml
similarity index 100%
rename from x11-packages/webkitgtk-6.0/gir/2.40.3/WebKitWebProcessExtension-6.0.xml
rename to x11-packages/webkitgtk-6.0/gir/2.42.4/WebKitWebProcessExtension-6.0.xml