From: Peter Oliver <git@mavit.org.uk>
Date: Wed, 4 Sep 2024 11:12:50 +0000 (+0100)
Subject: Disable xwidgets with recent webkitgtk versions (Bug#66068)
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~383
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b7f6cde419f862dbbf25a8192f5f31ac557b60b5;p=emacs.git

Disable xwidgets with recent webkitgtk versions (Bug#66068)

* configure.ac: Accept only webkit2gtk-4.* versions less than 2.41.92.
---

diff --git a/configure.ac b/configure.ac
index 5eaa1c7f962..6473f4bbc9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4458,10 +4458,11 @@ XWIDGETS_OBJ=
 if test "$with_xwidgets" != "no"; then
   if test "$USE_GTK_TOOLKIT" = "GTK3" && test "$window_system" != "none"; then
     WEBKIT_REQUIRED=2.12
-    WEBKIT_MODULES="webkit2gtk-4.1 >= $WEBKIT_REQUIRED"
+    WEBKIT_BROKEN=2.41.92
+    WEBKIT_MODULES="webkit2gtk-4.1 >= $WEBKIT_REQUIRED webkit2gtk-4.1 < $WEBKIT_BROKEN"
     EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
     if test "$HAVE_WEBKIT" = "no"; then
-      WEBKIT_MODULES="webkit2gtk-4.0 >= $WEBKIT_REQUIRED"
+      WEBKIT_MODULES="webkit2gtk-4.0 >= $WEBKIT_REQUIRED webkit2gtk-4.0 < $WEBKIT_BROKEN"
       EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
     fi
     HAVE_XWIDGETS=$HAVE_WEBKIT