From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Ulrich =?UTF-8?Q?M=C3=BCller?= Newsgroups: gmane.emacs.bugs Subject: bug#61387: 30.0.50; Support webkit2gtk-4.1 Date: Fri, 10 Feb 2023 06:27:11 +0100 Message-ID: References: <83zg9nkkym.fsf@gnu.org> <83sffelubg.fsf@gnu.org> <87wn4q2pq6.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="481"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) Cc: Eli Zaretskii , 61387@debbugs.gnu.org To: Po Lu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Feb 10 06:28:30 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pQLxV-000ATJ-Mh for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 10 Feb 2023 06:28:29 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQLx7-00073y-5d; Fri, 10 Feb 2023 00:28:05 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pQLx5-00073j-IP for bug-gnu-emacs@gnu.org; Fri, 10 Feb 2023 00:28:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQLx5-0001tt-4Z for bug-gnu-emacs@gnu.org; Fri, 10 Feb 2023 00:28:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQLx3-0004ex-Oj for bug-gnu-emacs@gnu.org; Fri, 10 Feb 2023 00:28:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Ulrich =?UTF-8?Q?M=C3=BCller?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 10 Feb 2023 05:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61387 X-GNU-PR-Package: emacs Original-Received: via spool by 61387-submit@debbugs.gnu.org id=B61387.167600684317865 (code B ref 61387); Fri, 10 Feb 2023 05:28:01 +0000 Original-Received: (at 61387) by debbugs.gnu.org; 10 Feb 2023 05:27:23 +0000 Original-Received: from localhost ([127.0.0.1]:34110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQLwR-0004e4-FS for submit@debbugs.gnu.org; Fri, 10 Feb 2023 00:27:23 -0500 Original-Received: from woodpecker.gentoo.org ([140.211.166.183]:43798 helo=smtp.gentoo.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQLwP-0004dn-9d for 61387@debbugs.gnu.org; Fri, 10 Feb 2023 00:27:21 -0500 In-Reply-To: <87wn4q2pq6.fsf@yahoo.com> (Po Lu's message of "Fri, 10 Feb 2023 10:56:01 +0800") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:255272 Archived-At: >>>>> 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?= 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