diff --git a/emacs-24.1-ps-mule.patch b/emacs-24.1-ps-mule.patch index 03825cd..8d2883f 100644 --- a/emacs-24.1-ps-mule.patch +++ b/emacs-24.1-ps-mule.patch @@ -16,7 +16,7 @@ --- lisp/textmodes/ispell.el +++ lisp/textmodes/ispell.el 2016-09-19 09:01:56.930605125 +0000 -@@ -1524,10 +1524,18 @@ Protects against bogus binding of `enabl +@@ -1533,10 +1533,18 @@ Protects against bogus binding of `enabl nil ;; in pipe mode. Disable extended-char-mode (nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist) (assoc ispell-current-dictionary ispell-dictionary-alist))))) diff --git a/emacs-24.4-ps-bdf.patch b/emacs-24.4-ps-bdf.patch index 938932f..449ff4c 100644 --- a/emacs-24.4-ps-bdf.patch +++ b/emacs-24.4-ps-bdf.patch @@ -5,7 +5,7 @@ --- lisp/ldefs-boot.el +++ lisp/ldefs-boot.el 2023-08-01 06:47:17.809528438 +0000 -@@ -25468,9 +25468,9 @@ With prefix argument ARG, restart the Pr +@@ -25499,9 +25499,9 @@ With prefix argument ARG, restart the Pr ;;; Generated autoloads from ps-bdf.el diff --git a/emacs-25.2-ImageMagick7.patch b/emacs-25.2-ImageMagick7.patch index 7cce05a..4b1a1e9 100644 --- a/emacs-25.2-ImageMagick7.patch +++ b/emacs-25.2-ImageMagick7.patch @@ -7,7 +7,7 @@ Index: emacs-25.2/configure.ac --- emacs-29.1/configure.ac +++ emacs-29.1/configure.ac 2023-08-01 07:15:12.274827913 +0000 -@@ -2884,7 +2884,7 @@ if test "${HAVE_X11}" = "yes" || test "$ +@@ -2883,7 +2883,7 @@ if test "${HAVE_X11}" = "yes" || test "$ else ## 6.3.5 is the earliest version known to work; see Bug#17339. ## 6.8.2 makes Emacs crash; see Bug#13867. diff --git a/emacs-27.1-Xauthority4server.patch b/emacs-27.1-Xauthority4server.patch index d195d6d..77e6179 100644 --- a/emacs-27.1-Xauthority4server.patch +++ b/emacs-27.1-Xauthority4server.patch @@ -20,8 +20,8 @@ even if the Xauthority file is not the default expected by XCloseDisplay() # Emacs will exit with status 15 after having received SIGTERM, which --- lisp/server.el -+++ lisp/server.el 2023-08-01 08:08:52.491668562 +0000 -@@ -287,6 +287,11 @@ If nil, no instructions are displayed." ++++ lisp/server.el 2024-02-02 07:50:00.878231817 +0000 +@@ -289,6 +289,11 @@ If nil, no instructions are displayed." "The directory in which to place the server socket. If local sockets are not supported, this is nil.") @@ -33,7 +33,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay() (define-error 'server-running-external "External server running") (defun server-clients-with (property value) -@@ -617,6 +622,11 @@ If the key is not valid, signal an error +@@ -619,6 +624,11 @@ If the key is not valid, signal an error (let ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))) (expand-file-name server-name server-dir))) @@ -45,7 +45,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay() (defun server-stop (&optional noframe) "If this Emacs process has a server communication subprocess, stop it. If this actually stopped the server, return non-nil. If the -@@ -718,7 +728,8 @@ the `server-process' variable." +@@ -720,7 +730,8 @@ the `server-process' variable." (setq leave-dead t))) ;; Now any previous server is properly stopped. (unless leave-dead @@ -55,7 +55,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay() ;; Make sure there is a safe directory in which to place the socket. (server-ensure-safe-dir (file-name-directory server-file)) (with-file-modes ?\700 -@@ -760,6 +771,14 @@ the `server-process' variable." +@@ -762,6 +773,14 @@ the `server-process' variable." (unless server-process (error "Could not start server process")) (server-log "Started server") (process-put server-process :server-file server-file) @@ -70,7 +70,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay() (setq server-mode t) (push 'server-mode global-minor-modes) (when server-use-tcp -@@ -896,7 +915,7 @@ This handles splitting the command if it +@@ -898,7 +917,7 @@ This handles splitting the command if it (let ((frame (server-with-environment (process-get proc 'env) @@ -79,7 +79,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay() ;; For tgetent(3); list according to ncurses(3). "BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES" "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING" -@@ -1169,6 +1188,8 @@ The following commands are accepted by t +@@ -1171,6 +1190,8 @@ The following commands are accepted by t nowait ; t if emacsclient does not want to wait for us. frame ; Frame opened for the client (if any). display ; Open frame on this display. @@ -88,7 +88,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay() parent-id ; Window ID for XEmbed dontkill ; t if client should not be killed. commands -@@ -1309,6 +1330,16 @@ The following commands are accepted by t +@@ -1314,6 +1335,16 @@ The following commands are accepted by t ;; -env NAME=VALUE: An environment variable. ("-env" (let ((var (pop args-left))) @@ -105,7 +105,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay() ;; XXX Variables should be encoded as in getenv/setenv. (process-put proc 'env (cons var (process-get proc 'env))))) -@@ -1324,6 +1355,16 @@ The following commands are accepted by t +@@ -1329,6 +1360,16 @@ The following commands are accepted by t ;; Unknown command. (arg (error "Unknown command: %s" arg)))) diff --git a/emacs-27.1-pdftex.patch b/emacs-27.1-pdftex.patch index 084f45e..30a6dbe 100644 --- a/emacs-27.1-pdftex.patch +++ b/emacs-27.1-pdftex.patch @@ -11,7 +11,7 @@ 9 files changed, 15 insertions(+), 10 deletions(-) --- etc/refcards/Makefile -+++ etc/refcards/Makefile 2023-08-01 07:21:56.243423079 +0000 ++++ etc/refcards/Makefile 2024-02-02 07:47:53.132617523 +0000 @@ -231,12 +231,12 @@ pl-refcard.pdf: $(pl_refcard_deps) ! pdfmex --version > /dev/null 2> /dev/null; then \ echo "No mex format found."; false; \ @@ -29,7 +29,7 @@ pl-refcard.ps: pl-refcard.dvi dvips -t a4 -o $@ pl-refcard.dvi --- etc/refcards/cs-dired-ref.tex -+++ etc/refcards/cs-dired-ref.tex 2023-08-01 07:21:56.243423079 +0000 ++++ etc/refcards/cs-dired-ref.tex 2024-02-02 07:47:53.132617523 +0000 @@ -108,7 +108,8 @@ see the Emacs distribution, or {\tt http \font\eightbf=csbx8 \font\eightit=csti8 @@ -41,7 +41,7 @@ \textfont0=\eightrm \textfont1=\eightmi --- etc/refcards/cs-survival.tex -+++ etc/refcards/cs-survival.tex 2023-08-01 07:21:56.243423079 +0000 ++++ etc/refcards/cs-survival.tex 2024-02-02 07:47:53.132617523 +0000 @@ -84,7 +84,8 @@ \font\eightbf=csbx8 \font\eightit=csti8 @@ -53,23 +53,23 @@ \font\eightss=cmss8 \textfont0=\eightrm --- etc/refcards/fr-survival.tex -+++ etc/refcards/fr-survival.tex 2023-08-01 07:23:17.673930543 +0000 ++++ etc/refcards/fr-survival.tex 2024-02-02 07:48:34.823838922 +0000 @@ -1,4 +1,4 @@ -%&tex +% % Title: GNU Emacs Survival Card - % Copyright (C) 2000--2023 Free Software Foundation, Inc. + % Copyright (C) 2000--2024 Free Software Foundation, Inc. --- etc/refcards/pl-refcard.tex -+++ etc/refcards/pl-refcard.tex 2023-08-01 07:23:43.361459725 +0000 ++++ etc/refcards/pl-refcard.tex 2024-02-02 07:48:49.943556553 +0000 @@ -1,4 +1,4 @@ -%&mex +% % Reference Card for GNU Emacs - % Copyright (C) 1999, 2001--2023 Free Software Foundation, Inc. + % Copyright (C) 1999, 2001--2024 Free Software Foundation, Inc. --- etc/refcards/ru-refcard.tex -+++ etc/refcards/ru-refcard.tex 2023-08-01 07:21:56.247423006 +0000 ++++ etc/refcards/ru-refcard.tex 2024-02-02 07:47:53.132617523 +0000 @@ -25,6 +25,7 @@ \documentclass[10pt]{article} \usepackage{multicol,tabularx} @@ -79,7 +79,7 @@ \usepackage[utf8]{inputenc} \usepackage[english,russian]{babel} --- etc/refcards/sk-dired-ref.tex -+++ etc/refcards/sk-dired-ref.tex 2023-08-01 07:21:56.247423006 +0000 ++++ etc/refcards/sk-dired-ref.tex 2024-02-02 07:47:53.132617523 +0000 @@ -109,7 +109,8 @@ see the Emacs distribution, or {\tt http \font\eightbf=csbx8 \font\eightit=csti8 @@ -91,7 +91,7 @@ \textfont0=\eightrm \textfont1=\eightmi --- etc/refcards/sk-survival.tex -+++ etc/refcards/sk-survival.tex 2023-08-01 07:21:56.247423006 +0000 ++++ etc/refcards/sk-survival.tex 2024-02-02 07:47:53.132617523 +0000 @@ -86,7 +86,8 @@ \font\eightbf=csbx8 \font\eightit=csti8 @@ -103,10 +103,10 @@ \font\eightss=cmss8 \textfont0=\eightrm --- etc/refcards/survival.tex -+++ etc/refcards/survival.tex 2023-08-01 07:24:05.517053645 +0000 ++++ etc/refcards/survival.tex 2024-02-02 07:49:06.719243261 +0000 @@ -1,4 +1,4 @@ -%&tex +% % Title: GNU Emacs Survival Card - % Copyright (C) 2000--2023 Free Software Foundation, Inc. + % Copyright (C) 2000--2024 Free Software Foundation, Inc. diff --git a/emacs-29.1-pdf.tar.xz b/emacs-29.1-pdf.tar.xz deleted file mode 100644 index ba1ef12..0000000 --- a/emacs-29.1-pdf.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4436a7fd7dc0a7b356f283a749363c72cd61239e025511d13ed3152d58aff0b -size 2029884 diff --git a/emacs-29.1.dif b/emacs-29.1.dif index 89a8deb..6bf9428 100644 --- a/emacs-29.1.dif +++ b/emacs-29.1.dif @@ -45,7 +45,7 @@ for page in *.1; do \ test "$$page" = ChangeLog.1 && continue; \ dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \ -@@ -942,7 +943,7 @@ uninstall: uninstall-$(NTDIR) uninstall- +@@ -947,7 +948,7 @@ uninstall: uninstall-$(NTDIR) uninstall- for page in *.1; do \ rm -f "$(DESTDIR)${man1dir}"/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \ fi) @@ -326,7 +326,7 @@ "Program invoked by \\[ispell-word] and \\[ispell-region] commands." :type 'string :set (lambda (symbol value) -@@ -1418,6 +1420,78 @@ The variable `ispell-library-directory' +@@ -1427,6 +1429,78 @@ The variable `ispell-library-directory' ;; Define commands in menu in opposite order you want them to appear. (let ((map (make-sparse-keymap "Spell"))) diff --git a/emacs-29.1.tar.xz b/emacs-29.1.tar.xz deleted file mode 100644 index 0401aaa..0000000 --- a/emacs-29.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2f881a5cc231e2f5a03e86f4584b0438f83edd7598a09d24a21bd8d003e2e01 -size 52081008 diff --git a/emacs-29.1.tar.xz.sig b/emacs-29.1.tar.xz.sig deleted file mode 100644 index 6e9ac4d..0000000 --- a/emacs-29.1.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEF+kNUhZywEYxsRg+542uDzEV4GsFAmTGCBIACgkQ542uDzEV -4GukZxAAno2Xy2zSdMffeM86gha1KZcdTx/WiAiXJgdUdnskAaz5h+tY9Q4C+AQ4 -rukW35MaNNbZ0/mlU/Sms0R+6zTdCAOW+SL2ELopAsrlxAHwI26pz/dkH4zWTe9e -M48Y8T76nY0myXgL9vn6XfsJZuOUON8YJ7/sRGxgVpkp5ATpMqMt+XY2N1wWYr6r -zxhPs9YbMAXgMSz+w1OCPtwm9ZOICXUTIZlzWdM0ka/ODGKh2dh8F6H25t8LNEp7 -25JlaJ3q+s8fqIsn0q/V4dePbbbCT+juv9G7kXP0z30U6wa701alaN6aFvO4qzpC -oHNqveb/4BeEren8YlkueHmBMV7tfTjJrud/F7TPFNd2l7ZAcDqXZiWXnItRFZd+ -MgIF1Xof46QxzuJaWue1kYGDCOlTzW4/We2K8eLFHxvMFYO1o3VgxxYdUrwFSZD7 -7GTsHBo2DN6FS3SggR/7PjMDfKH+tVCcm4w4hewX3mZuUzmL++1ZZQVrcldYAeeY -bmLyYmiztpkfidaY2wdnEJP6CS3C43Fwpe5m8dEcfNF2hpOJAYzKMGgTdSm08ozy -kGnrQjqP6sivzCxS57u5qXQLvEr5zRHGwDJ4TTfTJqX/TE8/Z6N819ffcW1U+8iA -NkwDWw46cUV7DE+y53Jl9XBVO4Bggb7SHwUIRxe9MDndnplzmxg= -=gjPt ------END PGP SIGNATURE----- diff --git a/emacs-29.2-pdf.tar.xz b/emacs-29.2-pdf.tar.xz new file mode 100644 index 0000000..8c7667b --- /dev/null +++ b/emacs-29.2-pdf.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b53573c575ed26819e426e282311abeeb6623d1c100d8f5e19aa2a5037ed5c00 +size 2032896 diff --git a/emacs-29.2.tar.xz b/emacs-29.2.tar.xz new file mode 100644 index 0000000..91f83eb --- /dev/null +++ b/emacs-29.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d3d2448988720bf4bf57ad77a5a08bf22df26160f90507a841ba986be2670dc +size 52162080 diff --git a/emacs-29.2.tar.xz.sig b/emacs-29.2.tar.xz.sig new file mode 100644 index 0000000..dccaeb3 --- /dev/null +++ b/emacs-29.2.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEF+kNUhZywEYxsRg+542uDzEV4GsFAmWpA70ACgkQ542uDzEV +4Gu8pw//ZNW3GMl7w2YLsxyDFom4Kf7JObr3v5S82LHRoJEm8fWlLtxOAFE4NVkU +d1UuCx9HO9DGLLvdSsssPhhyG3LrUaYoJHzf0hBbII0ERCWMv+zHFNKksyN0tIYT +BY7GtrcHtEmeNdP1+A8AtZQoKaC5v1SxsxX/HPWG+OF6iqY8ephAy8iZgOQ3foDp +iKOJ2Ebv8fqtNX0iSDNUtIs1DgFLktqKu4DlJeJr9h6bbcTpIYTT9qe85qlaNje0 +FX/ErBpZCHTMA/IatkOFFC8VnVQypqn9iCpn8xgaCUI/o3t6LLQycLr7oGGLaz0m +hzfsMpkYP5g9BnUXMO+8bclXA2rSqHKDrl+fPOJpa2TSZIt1GxW0H9QdTuUb5uK4 +VUuUIWcSSLOWpmJ1i/iv4swXJp4BxzGysKz4GpJntyhims59ZSLK6BNPrY/cDu1O +O74KX3NSdG0N6Z76+9kOV68RSSFTd+ijTzhf4ZnnFCR7tATgnMGS6S26aJ7d+ufk +XbKellcUmjeTU7KmUXAybPtMYbP1UiMW0PKsE//jas7u45MC4fc0OzFGC9ffnU3o +uNz0sLGoBY2+T8nlxtylIenBJDlX5i9VNkNii0rqAW1mj2qMcEetMGfCSf6N9jeP +eh5pCTQ1Sut+K0OhXELbpUYjF/s6UXlNUjTvstN3wB5NPoprz68= +=6wNg +-----END PGP SIGNATURE----- diff --git a/emacs.changes b/emacs.changes index 74fb521..52666d8 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Fri Feb 2 08:26:58 UTC 2024 - Dr. Werner Fink + +- Update to GNU Emacs version 29.2 + * Startup Changes in Emacs 29.2 + On GNU/Linux, Emacs is now the default application for 'org-protocol'. + Org mode provides a way to quickly capture bookmarks, notes, and links + using 'emacsclient': + emacsclient "org-protocol://store-link?url=URL&title=TITLE" + * This is a bug-fix release with no new features. + * Changes in Specialized Modes and Packages in Emacs 29.2 + - Tramp + New user option 'tramp-show-ad-hoc-proxies'. + When non-nil, ad-hoc definitions are kept in remote file names instead + of showing the shortcuts. + * Incompatible Lisp Changes in Emacs 29.2 + 'with-sqlite-transaction' rolls back changes if its BODY fails. + If the BODY of the macro signals an error, or committing the results + of the transaction fails, the changes will now be rolled back. +- Port patches mainly by correcting hunk offsets + * emacs-24.1-ps-mule.patch + * emacs-24.4-ps-bdf.patch + * emacs-25.2-ImageMagick7.patch + * emacs-27.1-Xauthority4server.patch + * emacs-27.1-pdftex.patch + * emacs-29.1.dif + * pdump.patch + ------------------------------------------------------------------- Fri Dec 29 22:42:28 UTC 2023 - Giacomo Comes diff --git a/emacs.spec b/emacs.spec index 18f3703..74f7b8c 100644 --- a/emacs.spec +++ b/emacs.spec @@ -1,7 +1,7 @@ # # spec file for package emacs # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -154,7 +154,7 @@ BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xwayland) BuildRequires: pkgconfig(xxf86vm) URL: http://www.gnu.org/software/emacs/ -Version: 29.1 +Version: 29.2 Release: 0 Summary: GNU Emacs Base Package License: GPL-3.0-or-later @@ -338,22 +338,22 @@ and most assembler-like syntaxes. %prep %setup -q -b 2 %if %{with memmmap} -%patch2 -p0 -b .glibc +%patch -P2 -p0 -b .glibc %endif -%patch4 -p0 -b .print -%patch5 -p0 -b .psbdf -%patch7 -p0 -b .psmu -%patch8 -p0 -b .nvoid -%patch12 -p0 -b .x11r7 -%patch15 -p0 -b .iconic -%patch16 -p0 -b .flyspell -%patch22 -p0 -b .pd -%patch23 -p0 -b .custfnt -%patch24 -p1 -b .imag -%patch25 -p0 -b .xft -%patch26 -p0 -b .fmt -%patch29 -p0 -b .xauth -%patch0 -p0 -b .0 +%patch -P4 -p0 -b .print +%patch -P5 -p0 -b .psbdf +%patch -P7 -p0 -b .psmu +%patch -P8 -p0 -b .nvoid +%patch -P12 -p0 -b .x11r7 +%patch -P15 -p0 -b .iconic +%patch -P16 -p0 -b .flyspell +%patch -P22 -p0 -b .pd +%patch -P23 -p0 -b .custfnt +%patch -P24 -p1 -b .imag +%patch -P25 -p0 -b .xft +%patch -P26 -p0 -b .fmt +%patch -P29 -p0 -b .xauth +%patch -P0 -p0 -b .0 %if %{without tex4pdf} pushd etc/refcards/ tar --use-compress-program=xz -xf %{S:8} diff --git a/pdump.patch b/pdump.patch index 5dfa8b9..5a5784c 100644 --- a/pdump.patch +++ b/pdump.patch @@ -11,7 +11,7 @@ diff --git a/src/emacs.c b/src/emacs.c index 687b8c7f81f0..2d6bfe07d813 100644 --- src/emacs.c +++ src/emacs.c -@@ -920,11 +920,15 @@ load_pdump (int argc, char **argv, char *dump_file) +@@ -867,11 +867,15 @@ load_pdump (int argc, char **argv, char *dump_file) NULL #endif ; @@ -27,7 +27,7 @@ index 687b8c7f81f0..2d6bfe07d813 100644 #endif ; -@@ -1065,7 +1069,11 @@ load_pdump (int argc, char **argv, char *dump_file) +@@ -1012,7 +1016,11 @@ load_pdump (int argc, char **argv, char *dump_file) if (IS_DIRECTORY_SEP (*p)) last_sep = p; }