aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2023-02-12 11:25:35 +0100
committerUlrich Müller <ulm@gentoo.org>2023-02-12 11:25:35 +0100
commit3d5335a13ff2e9bce603c05937187f49705e4622 (patch)
treeb06c29e352142b36db3e4594084138e178f8f0cf
parentRemove 28.1 patchset (diff)
downloademacs-patches-3d5335a13ff2e9bce603c05937187f49705e4622.tar.gz
emacs-patches-3d5335a13ff2e9bce603c05937187f49705e4622.tar.bz2
emacs-patches-3d5335a13ff2e9bce603c05937187f49705e4622.zip
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--emacs/26.3/04_all_webkit-4.1.patch26
-rw-r--r--emacs/27.2/04_all_webkit-4.1.patch26
-rw-r--r--emacs/28.2/03_all_webkit-4.1.patch26
3 files changed, 78 insertions, 0 deletions
diff --git a/emacs/26.3/04_all_webkit-4.1.patch b/emacs/26.3/04_all_webkit-4.1.patch
new file mode 100644
index 0000000..9ac9d62
--- /dev/null
+++ b/emacs/26.3/04_all_webkit-4.1.patch
@@ -0,0 +1,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
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -2722,8 +2722,12 @@
+ AC_MSG_ERROR([xwidgets requested but gtk3 not used.])
+
+ 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
+ test $HAVE_XWIDGETS = yes ||
+ AC_MSG_ERROR([xwidgets requested but WebKitGTK+ not found.])
diff --git a/emacs/27.2/04_all_webkit-4.1.patch b/emacs/27.2/04_all_webkit-4.1.patch
new file mode 100644
index 0000000..27637ff
--- /dev/null
+++ b/emacs/27.2/04_all_webkit-4.1.patch
@@ -0,0 +1,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-27.2/configure.ac
++++ emacs-27.2/configure.ac
+@@ -2799,8 +2799,12 @@
+ AC_MSG_ERROR([xwidgets requested but gtk3 not used.])
+
+ 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
+ test $HAVE_XWIDGETS = yes ||
+ AC_MSG_ERROR([xwidgets requested but WebKitGTK+ not found.])
diff --git a/emacs/28.2/03_all_webkit-4.1.patch b/emacs/28.2/03_all_webkit-4.1.patch
new file mode 100644
index 0000000..950fd78
--- /dev/null
+++ b/emacs/28.2/03_all_webkit-4.1.patch
@@ -0,0 +1,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