aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Oliver2024-09-04 12:12:50 +0100
committerEli Zaretskii2024-09-21 11:58:42 +0300
commitb7f6cde419f862dbbf25a8192f5f31ac557b60b5 (patch)
treec8018566bf81f3a31a3fb248fc39ea7d64deb428
parenta6dafbc2bc559295485c72bdfc317dda8a0a9bf5 (diff)
downloademacs-b7f6cde419f862dbbf25a8192f5f31ac557b60b5.tar.gz
emacs-b7f6cde419f862dbbf25a8192f5f31ac557b60b5.zip
Disable xwidgets with recent webkitgtk versions (Bug#66068)
* configure.ac: Accept only webkit2gtk-4.* versions less than 2.41.92.
-rw-r--r--configure.ac5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 5eaa1c7f962..6473f4bbc9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4458,10 +4458,11 @@ XWIDGETS_OBJ=
4458if test "$with_xwidgets" != "no"; then 4458if test "$with_xwidgets" != "no"; then
4459 if test "$USE_GTK_TOOLKIT" = "GTK3" && test "$window_system" != "none"; then 4459 if test "$USE_GTK_TOOLKIT" = "GTK3" && test "$window_system" != "none"; then
4460 WEBKIT_REQUIRED=2.12 4460 WEBKIT_REQUIRED=2.12
4461 WEBKIT_MODULES="webkit2gtk-4.1 >= $WEBKIT_REQUIRED" 4461 WEBKIT_BROKEN=2.41.92
4462 WEBKIT_MODULES="webkit2gtk-4.1 >= $WEBKIT_REQUIRED webkit2gtk-4.1 < $WEBKIT_BROKEN"
4462 EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES]) 4463 EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
4463 if test "$HAVE_WEBKIT" = "no"; then 4464 if test "$HAVE_WEBKIT" = "no"; then
4464 WEBKIT_MODULES="webkit2gtk-4.0 >= $WEBKIT_REQUIRED" 4465 WEBKIT_MODULES="webkit2gtk-4.0 >= $WEBKIT_REQUIRED webkit2gtk-4.0 < $WEBKIT_BROKEN"
4465 EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES]) 4466 EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
4466 fi 4467 fi
4467 HAVE_XWIDGETS=$HAVE_WEBKIT 4468 HAVE_XWIDGETS=$HAVE_WEBKIT