aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2023-07-30 10:08:21 +0200
committerUlrich Müller <ulm@gentoo.org>2023-07-30 10:08:21 +0200
commit259ae0c90a68b4819b9d308c182cdec4ccd5df20 (patch)
tree57575efe6be944da8ec2ad7754055bd21a1ddcf3
parent29.1: Fix modeline problems (diff)
downloademacs-patches-259ae0c90a68b4819b9d308c182cdec4ccd5df20.tar.gz
emacs-patches-259ae0c90a68b4819b9d308c182cdec4ccd5df20.tar.bz2
emacs-patches-259ae0c90a68b4819b9d308c182cdec4ccd5df20.zip
Remove 28.3 patchset
Emacs 28.3 was not released. Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--emacs/28.3/01_all_libseccomp.patch15
-rw-r--r--emacs/28.3/02_all_webkit-4.1.patch26
-rw-r--r--emacs/28.3/03_all_copyright-test.patch20
-rw-r--r--emacs/28.3/04_all_tramp-version.patch58
-rw-r--r--emacs/28.3/05_all_dbusbind.patch50
5 files changed, 0 insertions, 169 deletions
diff --git a/emacs/28.3/01_all_libseccomp.patch b/emacs/28.3/01_all_libseccomp.patch
deleted file mode 100644
index ecbbba0..0000000
--- a/emacs/28.3/01_all_libseccomp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-libseccomp is detected by configure but doesn't appear to have any
-effect on the installed image. For now, disable it unconditionally.
-https://bugs.gentoo.org/857906
-
---- emacs-28.2/configure.ac
-+++ emacs-28.2/configure.ac
-@@ -4373,7 +4373,7 @@
- ]])])
- AC_SUBST([HAVE_SECCOMP])
-
--EMACS_CHECK_MODULES([LIBSECCOMP], [libseccomp >= 2.5.2])
-+HAVE_LIBSECCOMP=no
- AC_SUBST([HAVE_LIBSECCOMP])
- AC_SUBST([LIBSECCOMP_LIBS])
- AC_SUBST([LIBSECCOMP_CFLAGS])
diff --git a/emacs/28.3/02_all_webkit-4.1.patch b/emacs/28.3/02_all_webkit-4.1.patch
deleted file mode 100644
index 950fd78..0000000
--- a/emacs/28.3/02_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 <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
diff --git a/emacs/28.3/03_all_copyright-test.patch b/emacs/28.3/03_all_copyright-test.patch
deleted file mode 100644
index 32a64c3..0000000
--- a/emacs/28.3/03_all_copyright-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Disable failing copyright tests
-
---- a/test/lisp/emacs-lisp/copyright-tests.el
-+++ b/test/lisp/emacs-lisp/copyright-tests.el
-@@ -51,6 +51,7 @@
- (with-copyright-test (car test) (cdr test))))
-
- (ert-deftest test-end-chop ()
-+ :tags '(:unstable)
- (should
- (equal
- (with-temp-buffer
-@@ -62,6 +63,7 @@
- "Copyright 2006, 2007, 2008, 2022 Foo Bar\n\n")))
-
- (ert-deftest test-correct-notice ()
-+ :tags '(:unstable)
- (should (equal
- (with-temp-buffer
- (dotimes (_ 2)
diff --git a/emacs/28.3/04_all_tramp-version.patch b/emacs/28.3/04_all_tramp-version.patch
deleted file mode 100644
index 757f7ac..0000000
--- a/emacs/28.3/04_all_tramp-version.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Adapt Tramp versions
-Patch from emacs-28 branch
-
-commit dec958258b133b4c21224c594da433919d852800
-Author: Michael Albinus <michael.albinus@gmx.de>
-Date: Fri Feb 24 19:42:27 2023 +0100
-
- Adapt Tramp versions. Do not merge
-
---- a/doc/misc/trampver.texi
-+++ b/doc/misc/trampver.texi
-@@ -8,7 +8,7 @@
- @c In the Tramp GIT, the version numbers are auto-frobbed from
- @c tramp.el, and the bug report address is auto-frobbed from
- @c configure.ac.
--@set trampver 2.5.4-pre
-+@set trampver 2.5.4
- @set trampurl https://www.gnu.org/software/tramp/
- @set tramp-bug-report-address tramp-devel@@gnu.org
- @set emacsver 25.1
---- a/lisp/net/trampver.el
-+++ b/lisp/net/trampver.el
-@@ -7,7 +7,7 @@
- ;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
- ;; Keywords: comm, processes
- ;; Package: tramp
--;; Version: 2.5.4-pre
-+;; Version: 2.5.4
- ;; Package-Requires: ((emacs "25.1"))
- ;; Package-Type: multi
- ;; URL: https://www.gnu.org/software/tramp/
-@@ -40,7 +40,7 @@
- ;; ./configure" to change them.
-
- ;;;###tramp-autoload
--(defconst tramp-version "2.5.4-pre"
-+(defconst tramp-version "2.5.4"
- "This version of Tramp.")
-
- ;;;###tramp-autoload
-@@ -78,7 +78,7 @@
- ;; Check for Emacs version.
- (let ((x (if (not (string-lessp emacs-version "25.1"))
- "ok"
-- (format "Tramp 2.5.4-pre is not fit for %s"
-+ (format "Tramp 2.5.4 is not fit for %s"
- (replace-regexp-in-string "\n" "" (emacs-version))))))
- (unless (string-equal "ok" x) (error "%s" x)))
-
-@@ -104,7 +104,7 @@
- ("2.3.3" . "26.1") ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2")
- ("2.3.5.26.3" . "26.3")
- ("2.4.3.27.1" . "27.1") ("2.4.5.27.2" . "27.2")
-- ("2.5.2.28.1" . "28.1") ("2.5.3.28.2" . "28.2")))
-+ ("2.5.2.28.1" . "28.1") ("2.5.3.28.2" . "28.2") ("2.5.4" . "28.3")))
-
- (add-hook 'tramp-unload-hook
- (lambda ()
diff --git a/emacs/28.3/05_all_dbusbind.patch b/emacs/28.3/05_all_dbusbind.patch
deleted file mode 100644
index 994ec12..0000000
--- a/emacs/28.3/05_all_dbusbind.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Fix D-Bus session bus issue when running as a daemon
-Patch backported from emacs-29 branch
-https://bugs.gentoo.org/908438
-
-commit 1383efe01d0ee8ba3ea8da5ab41b07f5672191bf
-Author: Michael Albinus <michael.albinus@gmx.de>
-Date: Mon Jun 12 12:45:38 2023 +0200
-
- Fix setting $DBUS_SESSION_BUS_ADDRESS after Emacs has started
-
---- emacs-28.2/doc/misc/dbus.texi
-+++ emacs-28.2/doc/misc/dbus.texi
-@@ -1853,8 +1853,24 @@
- corresponding bus. For the system and session buses, this function is
- called when loading @file{dbus.el}, there is no need to call it again.
-
--The function returns the number of connections this Emacs session has
--established to the @var{bus} under the same unique name
-+If Emacs was invoked when there was no D-Bus session bus available
-+yet, you can set the environment variable
-+@env{DBUS_SESSION_BUS_ADDRESS} once the session bus daemon is running
-+and offering the address. Calling @code{dbus-init-bus} initializes
-+the connection to the session bus.
-+
-+@lisp
-+(setenv "DBUS_SESSION_BUS_ADDRESS" "unix:path=/run/user/1000/bus")
-+
-+@result{} "unix:path=/run/user/1000/bus"
-+
-+(dbus-init-bus :session)
-+
-+@result{} 2
-+@end lisp
-+
-+@code{dbus-init-bus} returns the number of connections this Emacs
-+session has established to the @var{bus} under the same unique name
- (@pxref{dbus-get-unique-name}). It depends on the libraries Emacs is
- linked with, and on the environment Emacs is running. For example, if
- Emacs is linked with the GTK+ toolkit, and it runs in a GTK+-aware
---- emacs-28.2/src/dbusbind.c
-+++ emacs-28.2/src/dbusbind.c
-@@ -276,7 +276,7 @@
-
- #define XD_DBUS_VALIDATE_BUS_ADDRESS(bus) \
- do { \
-- char const *session_bus_address = getenv ("DBUS_SESSION_BUS_ADDRESS"); \
-+ char const *session_bus_address = egetenv ("DBUS_SESSION_BUS_ADDRESS"); \
- if (STRINGP (bus)) \
- { \
- DBusAddressEntry **entries; \