From a6b5f5d3ed520503ef84a6f39c670f4fd4b41db0 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Sun, 4 Jun 2023 16:57:29 +0200 Subject: 28.3: Number patches consecutively MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich Müller --- emacs/28.3/02_all_webkit-4.1.patch | 26 ++++++++++++++++++++++++++ emacs/28.3/03_all_webkit-4.1.patch | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) create mode 100644 emacs/28.3/02_all_webkit-4.1.patch delete mode 100644 emacs/28.3/03_all_webkit-4.1.patch diff --git a/emacs/28.3/02_all_webkit-4.1.patch b/emacs/28.3/02_all_webkit-4.1.patch new file mode 100644 index 0000000..950fd78 --- /dev/null +++ b/emacs/28.3/02_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 +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 diff --git a/emacs/28.3/03_all_webkit-4.1.patch b/emacs/28.3/03_all_webkit-4.1.patch deleted file mode 100644 index 950fd78..0000000 --- a/emacs/28.3/03_all_webkit-4.1.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 -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 -- cgit v1.2.3-65-gdbad