bug#61387: 30.0.50; Support webkit2gtk-4.1

[Ulrich Müller]

>>>>> On Fri, 10 Feb 2023, Po Lu wrote:

> Please make the configure script detect WebKitGTK 4.1 by default, and
> fall back to 4.0.

> Not many systems will have both installed at the same time, and it is
> best for Emacs to use the newer version.

> People who want to use the older version can specify the cflags on the
> command line to configure.  There is no need for a ``--with-webkit2gtk''
> option, which is not very consistent with every other library we support.

>From be0951e9ddf7cf4d39b8b2328a46cd5cc31ba067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Thu, 9 Feb 2023 10:58:48 +0100
Subject: [PATCH] Support webkit2gtk-4.1

* configure.ac: Check for webkit2gtk API version 4.1 first, then
fall back to 4.0.
---
 configure.ac | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 645082c9746..bc7e61048c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3613,8 +3613,12 @@ 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.0 >= $WEBKIT_REQUIRED"
+    WEBKIT_MODULES="webkit2gtk-4.1 >= $WEBKIT_REQUIRED"
     EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
+    if test "$HAVE_WEBKIT" = "no"; then
+      WEBKIT_MODULES="webkit2gtk-4.0 >= $WEBKIT_REQUIRED"
+      EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
+    fi
     HAVE_XWIDGETS=$HAVE_WEBKIT
     XWIDGETS_OBJ="xwidget.o"
     if test "$HAVE_X_WINDOWS" = "yes" && test "${with_cairo}" = "no"; then
-- 
2.39.1