]> git.eshelyaron.com Git - emacs.git/commitdiff
Disable xwidgets with recent webkitgtk versions (Bug#66068)
authorPeter Oliver <git@mavit.org.uk>
Wed, 4 Sep 2024 11:12:50 +0000 (12:12 +0100)
committerEshel Yaron <me@eshelyaron.com>
Mon, 23 Sep 2024 10:45:23 +0000 (12:45 +0200)
* configure.ac: Accept only webkit2gtk-4.* versions less than 2.41.92.

(cherry picked from commit b7f6cde419f862dbbf25a8192f5f31ac557b60b5)

configure.ac

index 990434b45ff632e5b4cfb837a9c506285e6f45aa..0540d18b1422b89736eb4b43831d21789d63543c 100644 (file)
@@ -4551,10 +4551,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