emacs/28.3/02_all_webkit-4.1.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26

Migrate from net-libs/webkit-gtk:4 to :4.1
Backported from emacs-29 branch
https://bugs.gentoo.org/893670

commit 7287b7b53a17f9b2d1b474466106806a9d57af47
Author: Ulrich Müller <ulm@gentoo.org>
Date:   Thu Feb 9 10:58:48 2023 +0100

    Support webkit2gtk-4.1

--- emacs-28.2/configure.ac
+++ emacs-28.2/configure.ac
@@ -2784,8 +2784,12 @@
 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"
   elif test "${NS_IMPL_COCOA}" = "yes"; then