diff --git a/emacs-24.3-iconic.patch b/emacs-24.3-iconic.patch index b2f4927..8326c95 100644 --- a/emacs-24.3-iconic.patch +++ b/emacs-24.3-iconic.patch @@ -4,7 +4,7 @@ --- lisp/startup.el +++ lisp/startup.el 2016-09-19 09:15:26.871345783 +0000 -@@ -2453,6 +2453,9 @@ nil default-directory" name) +@@ -2455,6 +2455,9 @@ nil default-directory" name) ((equal argi "-no-splash") (setq inhibit-startup-screen t)) diff --git a/emacs-24.4-ps-bdf.patch b/emacs-24.4-ps-bdf.patch index aedabdd..076fd2d 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 2018-05-29 12:23:32.824206557 +0000 -@@ -26235,9 +26235,9 @@ With prefix argument ARG, restart the Pr +@@ -25982,9 +25982,9 @@ With prefix argument ARG, restart the Pr ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (0 0 0 0)) ;;; Generated autoloads from ps-bdf.el diff --git a/emacs-25.2-ImageMagick7.patch b/emacs-25.2-ImageMagick7.patch index c85f301..cfd58ab 100644 --- a/emacs-25.2-ImageMagick7.patch +++ b/emacs-25.2-ImageMagick7.patch @@ -7,7 +7,7 @@ Index: emacs-25.2/configure.ac --- emacs-27.1/configure.ac +++ emacs-27.1/configure.ac 2020-08-11 09:59:04.349950601 +0000 -@@ -2618,7 +2618,7 @@ if test "${HAVE_X11}" = "yes" || test "$ +@@ -2617,7 +2617,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. @@ -18,7 +18,7 @@ Index: emacs-25.2/configure.ac if test $HAVE_IMAGEMAGICK = yes; then --- emacs-27.1/src/image.c +++ emacs-27.1/src/image.c 2020-08-11 09:49:35.500181432 +0000 -@@ -8770,7 +8770,11 @@ imagemagick_compute_animated_image (Magi +@@ -8784,7 +8784,11 @@ imagemagick_compute_animated_image (Magi PixelWand **source, **dest; size_t source_width, source_height; ssize_t source_left, source_top; @@ -30,7 +30,7 @@ Index: emacs-25.2/configure.ac DisposeType dispose; ptrdiff_t lines = 0; -@@ -8835,7 +8839,11 @@ imagemagick_compute_animated_image (Magi +@@ -8849,7 +8853,11 @@ imagemagick_compute_animated_image (Magi if (dispose == BackgroundDispose || PixelGetAlpha (source[x])) { PixelGetMagickColor (source[x], &pixel); @@ -42,7 +42,7 @@ Index: emacs-25.2/configure.ac } } PixelSyncIterator (dest_iterator); -@@ -8880,7 +8888,11 @@ imagemagick_load_image (struct frame *f, +@@ -8894,7 +8902,11 @@ imagemagick_load_image (struct frame *f, MagickWand *image_wand; PixelIterator *iterator; PixelWand **pixels, *bg_wand = NULL; diff --git a/emacs-27.1-gif.patch b/emacs-27.1-gif.patch deleted file mode 100644 index 9ed27dd..0000000 --- a/emacs-27.1-gif.patch +++ /dev/null @@ -1,39 +0,0 @@ ->>>>> On Tue, 8 Sep 2020 20:38:30 +0700, nnoodle said: - - nnoodle> To reproduce: - nnoodle> $ echo 'GIF89a;' > bad.gif - nnoodle> $ emacs -Q bad.gif - - nnoodle> The result will be a segmentation fault. - -This should fix it, can you test it? - -Thanks - -Robert - -diff --git a/src/image.c b/src/image.c -index d8c34669cc..6e3b71a869 100644 ---- a/src/image.c -+++ b/src/image.c -@@ -8251,7 +8251,7 @@ gif_load (struct frame *f, struct image *img) - Lisp_Object specified_file = image_spec_value (img->spec, QCfile, NULL); - Lisp_Object specified_data = image_spec_value (img->spec, QCdata, NULL); - EMACS_INT idx; -- int gif_err; -+ int gif_err = 0; - - if (NILP (specified_data)) - { -@@ -8277,7 +8277,8 @@ gif_load (struct frame *f, struct image *img) - { - #if HAVE_GIFERRORSTRING - image_error ("Cannot open `%s': %s", -- file, build_string (GifErrorString (gif_err))); -+ file, gif_err ? build_string (GifErrorString (gif_err)) -+ : build_string ("Unknown error from gif library")); - #else - image_error ("Cannot open `%s'", file); - #endif - - diff --git a/emacs-27.1-home.patch b/emacs-27.1-home.patch deleted file mode 100644 index d5539b3..0000000 --- a/emacs-27.1-home.patch +++ /dev/null @@ -1,26 +0,0 @@ - - Tomasz> Forgotten / somewhere? - - Robert> Hmm. Any chance of catching that in gdb so we can see where itʼs being - Robert> called from? - -Completely WAG: - ---- - src/xrdb.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- src/xrdb.c -+++ src/xrdb.c 2020-08-15 06:15:14.059639732 +0000 -@@ -292,9 +292,9 @@ get_user_app (const char *class) - /* Check in the home directory. This is a bit of a hack; let's - hope one's home directory doesn't contain ':' or '%'. */ - char const *home = get_homedir (); -- db = search_magic_path (home, class, "%L/%N"); -+ db = search_magic_path (home, class, "/%L/%N"); - if (! db) -- db = search_magic_path (home, class, "%N"); -+ db = search_magic_path (home, class, "/%N"); - } - - return db; diff --git a/emacs-27.1-pdf.tar.xz b/emacs-27.1-pdf.tar.xz deleted file mode 100644 index eebb77e..0000000 --- a/emacs-27.1-pdf.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:721e27d002533b9190282b4c6b169970a3c17dd4a648f04083e895a4a2561afc -size 2015612 diff --git a/emacs-27.1-pdftex.patch b/emacs-27.1-pdftex.patch index 86003d1..7b75d81 100644 --- a/emacs-27.1-pdftex.patch +++ b/emacs-27.1-pdftex.patch @@ -2,16 +2,16 @@ etc/refcards/Makefile | 4 ++-- etc/refcards/cs-dired-ref.tex | 3 ++- etc/refcards/cs-survival.tex | 3 ++- - etc/refcards/fr-survival.tex | 1 - - etc/refcards/pl-refcard.tex | 1 - + etc/refcards/fr-survival.tex | 2 +- + etc/refcards/pl-refcard.tex | 2 +- etc/refcards/ru-refcard.tex | 1 + etc/refcards/sk-dired-ref.tex | 3 ++- etc/refcards/sk-survival.tex | 3 ++- - etc/refcards/survival.tex | 1 - - 9 files changed, 11 insertions(+), 9 deletions(-) + etc/refcards/survival.tex | 2 +- + 9 files changed, 14 insertions(+), 9 deletions(-) --- etc/refcards/Makefile -+++ etc/refcards/Makefile 2020-08-12 06:51:26.826803167 +0000 ++++ etc/refcards/Makefile 2021-03-25 15:07:14.519265674 +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; \ @@ -28,7 +28,7 @@ dvips -t a4 -o $@ pl-refcard.dvi --- etc/refcards/cs-dired-ref.tex -+++ etc/refcards/cs-dired-ref.tex 2020-08-11 13:31:00.597050301 +0000 ++++ etc/refcards/cs-dired-ref.tex 2021-03-25 15:07:14.519265674 +0000 @@ -108,7 +108,8 @@ see the Emacs distribution, or {\tt http \font\eightbf=csbx8 \font\eightit=csti8 @@ -40,7 +40,7 @@ \textfont0=\eightrm \textfont1=\eightmi --- etc/refcards/cs-survival.tex -+++ etc/refcards/cs-survival.tex 2020-08-11 13:31:36.644404071 +0000 ++++ etc/refcards/cs-survival.tex 2021-03-25 15:07:14.519265674 +0000 @@ -84,7 +84,8 @@ \font\eightbf=csbx8 \font\eightit=csti8 @@ -52,21 +52,23 @@ \font\eightss=cmss8 \textfont0=\eightrm --- etc/refcards/fr-survival.tex -+++ etc/refcards/fr-survival.tex 2020-08-11 12:38:55.765034599 +0000 -@@ -1,4 +1,3 @@ ++++ etc/refcards/fr-survival.tex 2021-03-25 15:08:33.797766981 +0000 +@@ -1,4 +1,4 @@ -%&tex ++% % Title: GNU Emacs Survival Card - % Copyright (C) 2000--2020 Free Software Foundation, Inc. + % Copyright (C) 2000--2021 Free Software Foundation, Inc. --- etc/refcards/pl-refcard.tex -+++ etc/refcards/pl-refcard.tex 2020-08-11 12:46:13.525205665 +0000 -@@ -1,4 +1,3 @@ ++++ etc/refcards/pl-refcard.tex 2021-03-25 15:08:53.917386707 +0000 +@@ -1,4 +1,4 @@ -%&mex ++% % Reference Card for GNU Emacs - % Copyright (C) 1999, 2001--2020 Free Software Foundation, Inc. + % Copyright (C) 1999, 2001--2021 Free Software Foundation, Inc. --- etc/refcards/ru-refcard.tex -+++ etc/refcards/ru-refcard.tex 2020-08-12 07:46:56.239620140 +0000 ++++ etc/refcards/ru-refcard.tex 2021-03-25 15:07:14.519265674 +0000 @@ -25,6 +25,7 @@ \documentclass[10pt]{article} \usepackage{multicol,tabularx} @@ -76,7 +78,7 @@ \usepackage[utf8]{inputenc} \usepackage[english,russian]{babel} --- etc/refcards/sk-dired-ref.tex -+++ etc/refcards/sk-dired-ref.tex 2020-08-11 13:31:20.796688178 +0000 ++++ etc/refcards/sk-dired-ref.tex 2021-03-25 15:07:14.519265674 +0000 @@ -109,7 +109,8 @@ see the Emacs distribution, or {\tt http \font\eightbf=csbx8 \font\eightit=csti8 @@ -88,7 +90,7 @@ \textfont0=\eightrm \textfont1=\eightmi --- etc/refcards/sk-survival.tex -+++ etc/refcards/sk-survival.tex 2020-08-11 13:31:53.896093577 +0000 ++++ etc/refcards/sk-survival.tex 2021-03-25 15:07:14.519265674 +0000 @@ -86,7 +86,8 @@ \font\eightbf=csbx8 \font\eightit=csti8 @@ -100,9 +102,10 @@ \font\eightss=cmss8 \textfont0=\eightrm --- etc/refcards/survival.tex -+++ etc/refcards/survival.tex 2020-08-11 12:38:52.405094664 +0000 -@@ -1,4 +1,3 @@ ++++ etc/refcards/survival.tex 2021-03-25 15:07:57.346455997 +0000 +@@ -1,4 +1,4 @@ -%&tex ++% % Title: GNU Emacs Survival Card - % Copyright (C) 2000--2020 Free Software Foundation, Inc. + % Copyright (C) 2000--2021 Free Software Foundation, Inc. diff --git a/emacs-27.1.tar.xz b/emacs-27.1.tar.xz deleted file mode 100644 index 848ac81..0000000 --- a/emacs-27.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a4c128f915fc937d61edfc273c98106711b540c9be3cd5d2e2b9b5b2f172e41 -size 43752012 diff --git a/emacs-27.1.tar.xz.sig b/emacs-27.1.tar.xz.sig deleted file mode 100644 index 0492a91..0000000 --- a/emacs-27.1.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEE1AWqLIYsVPF+7mvg6LzXhmr8+XgFAl8xzTYACgkQ6LzXhmr8 -+XjGjAf/S3scggDm1G3/EAKf0nMPBNBJaRboWohoUviu6/024WHKdsZ+qJ1w7Ad2 -saHbyoouiKJcq75rcfxe4faeRYy/V5QHchxfnvt092UnZrSMaq9jkjp5DUARxeZx -8pCB5OPC9BTMyT/gOe4mqIplYYBRsF26fcKfvcLTuZ45+4Jkii8CSNa9iJbYQoaW -41MqZFvPsQhRF7UH084ONxZnrXpBebrRSoY4yj1eM/lLtcHFgUvSg5UoP6EwXqcL -kkQB4+UGGOzxA3zwsLzmrq9gOa39w/pJY+Fs9+bYuf8xf2nbq3VnobKnPJveeMMq -0yTvrrY5E7/4vTXeb5ykmggNqTMa7w== -=29/a ------END PGP SIGNATURE----- diff --git a/emacs-27.2-pdf.tar.xz b/emacs-27.2-pdf.tar.xz new file mode 100644 index 0000000..3059240 --- /dev/null +++ b/emacs-27.2-pdf.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ec995c3227a30a62cafd4458e672f12247d4bcbec7852bd4b0ce50bf8995f36 +size 2017436 diff --git a/emacs-27.2.tar.xz b/emacs-27.2.tar.xz new file mode 100644 index 0000000..d9e7b90 --- /dev/null +++ b/emacs-27.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4a7cc4e78e63f378624e0919215b910af5bb2a0afc819fad298272e9f40c1b9 +size 44624480 diff --git a/emacs-27.2.tar.xz.sig b/emacs-27.2.tar.xz.sig new file mode 100644 index 0000000..fefce58 --- /dev/null +++ b/emacs-27.2.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJgXHmkAAoJEJHBJi8B6405d2EIAIPafSj+sV3Hemu9CSPL+F38 +KutOo7nUF1AO0tgdijPGZ4BTBsWnsum0dLQ/JLtor7/NQuqrZTMJQbrorLluwCR7 +p1aVtwQ+enWn3G0Aq/4uWo0xaMCvJlEPOQuYE8Dtt12PFZzmfAE1r4KZa4cL073h +suugT/tz7awq7QS6GbjI88mkJXVMuEwVYPPS2tzBUTkA2152dikFSyqBhUnIo3Ni +eDN6NvSYBpL1I9HgNYuiBJp9xv8CzGtwm/7Nidntzl9SPVQlZkZIHNj8tRbE67Ge +R0EXBgnDsSKlRUM51R7PejnSG6134VcLCaItMF6dIiVBu6BwQXw1t+zdqnzG6v8= +=L6J6 +-----END PGP SIGNATURE----- diff --git a/emacs.changes b/emacs.changes index cc7959f..32d8fa1 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Fri Mar 26 09:35:15 UTC 2021 - Dr. Werner Fink + +- Update emacs.keyring + +------------------------------------------------------------------- +Thu Mar 25 14:24:18 UTC 2021 - Dr. Werner Fink + +- Update to GNU Emacs version 27.2 + * Changes in Emacs 27.2 + This is a bug-fix release with no new features. + * Lisp Changes in Emacs 27.2 + The behavior of the user option 'resize-mini-frames' has changed. + If set to a non-nil value which isn't a function, resize the mini + frame using the new function 'fit-mini-frame-to-buffer' which won't + skip leading or trailing empty lines of the buffer. + * Changes in Specialized Modes and Packages in Emacs 27.2 + Tramp: The user option 'tramp-completion-reread-directory-timeout' + is now obsolete. +- Remove patches now upstream + * emacs-27.1-gif.patch + * emacs-27.1-home.patch +- Port patches + * emacs-24.3-iconic.patch + * emacs-24.4-ps-bdf.patch + * emacs-25.2-ImageMagick7.patch + * pdump.patch + ------------------------------------------------------------------- Mon Mar 8 13:40:06 UTC 2021 - Dr. Werner Fink diff --git a/emacs.keyring b/emacs.keyring index 117d748..72d2b0d 100644 Binary files a/emacs.keyring and b/emacs.keyring differ diff --git a/emacs.spec b/emacs.spec index cd37927..871bdc7 100644 --- a/emacs.spec +++ b/emacs.spec @@ -128,7 +128,7 @@ BuildRequires: pkgconfig(xshmfence) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xxf86vm) URL: http://www.gnu.org/software/emacs/ -Version: 27.1 +Version: 27.2 Release: 0 Summary: GNU Emacs Base Package License: GPL-3.0-or-later @@ -177,8 +177,6 @@ Patch23: emacs-25.1-custom-fonts.patch Patch24: emacs-25.2-ImageMagick7.patch Patch25: emacs-26.1-xft4x11.patch Patch26: emacs-27.1-pdftex.patch -Patch27: emacs-27.1-home.patch -Patch28: emacs-27.1-gif.patch Patch29: emacs-27.1-Xauthority4server.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -258,7 +256,7 @@ Summary: Info files for GNU Emacs Group: Documentation/Other %if 0%{?suse_version} <= 1500 Requires(post): %install_info_prereq -Requires(preun): %install_info_prereq +Requires(preun):%install_info_prereq %endif BuildArch: noarch @@ -271,7 +269,7 @@ modes. Summary: Generate Tag Files for Use with Emacs Group: Development/Tools/Navigators Requires(post): coreutils update-alternatives -Requires(preun): coreutils update-alternatives +Requires(preun):coreutils update-alternatives Provides: ctags:/usr/bin/etags %description -n etags @@ -295,8 +293,6 @@ and most assembler-like syntaxes. %patch24 -p1 -b .imag %patch25 -p0 -b .xft %patch26 -p0 -b .fmt -%patch27 -p0 -b .home -%patch28 -p1 -b .crash %patch29 -p0 -b .xauth %patch -p0 -b .0 %if %{without tex4pdf} @@ -630,7 +626,7 @@ find %{buildroot}%{_datadir}/emacs/%{version}/etc/ -name '*[a-z].[16]' | \ rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/COPYING ln -sf ../etc/COPYING \ %{buildroot}%{_datadir}/emacs/%{version}/lisp/COPYING -# +# fdupes -q -r -1 %{buildroot}%{_datadir}/emacs/%{version}/etc/images/icons/ %{buildroot}%{_datadir}/icons/ |\ xargs -n 2 | while read first second; do case "${first}" in @@ -662,7 +658,7 @@ test -L usr/bin/emacs && rm -f usr/bin/emacs || true if test -e usr/share/emacs/site-lisp/auctex/font-latex.elc ; then owd=$(pwd) cd usr/share/emacs/site-lisp/auctex || exit 1 - emacs -batch -no-site-file -no-init-file --eval '(setq load-path (cons "." load-path) + emacs -batch -no-site-file -no-init-file --eval '(setq load-path (cons "." load-path) byte-compile-warnings nil TeX-lisp-directory "" TeX-auto-global "")' -f batch-byte-compile font-latex.el > /dev/null 2>&1 @@ -673,7 +669,7 @@ fi if test -e usr/share/emacs/site-lisp/auctex/font-latex.elc ; then owd=$(pwd) cd usr/share/emacs/site-lisp/auctex || exit 1 - emacs -batch -no-site-file -no-init-file --eval '(setq load-path (cons "." load-path) + emacs -batch -no-site-file -no-init-file --eval '(setq load-path (cons "." load-path) byte-compile-warnings nil TeX-lisp-directory "" TeX-auto-global "")' -f batch-byte-compile font-latex.el > /dev/null 2>&1 @@ -1680,6 +1676,7 @@ fi %{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL.th %{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL.translators %{_datadir}/emacs/%{version}/etc/tutorials/TUTORIAL.zh +%{_datadir}/emacs/%{version}/etc/w32-feature.el %{_datadir}/emacs/%{version}/etc/yow.lines %dir %{_datadir}/emacs/%{version}/lisp/ %{_datadir}/emacs/%{version}/lisp/COPYING @@ -2880,6 +2877,7 @@ fi %{_datadir}/emacs/%{version}/lisp/org/org-pcomplete.elc %{_datadir}/emacs/%{version}/lisp/org/org-plot.elc %{_datadir}/emacs/%{version}/lisp/org/org-protocol.elc +%{_datadir}/emacs/%{version}/lisp/org/org-refile.elc %{_datadir}/emacs/%{version}/lisp/org/org-src.elc %{_datadir}/emacs/%{version}/lisp/org/org-table.elc %{_datadir}/emacs/%{version}/lisp/org/org-tempo.elc @@ -4430,6 +4428,7 @@ fi %{_datadir}/emacs/%{version}/lisp/org/org-pcomplete.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/org-plot.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/org-protocol.el%{ext_el} +%{_datadir}/emacs/%{version}/lisp/org/org-refile.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/org-src.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/org-table.el%{ext_el} %{_datadir}/emacs/%{version}/lisp/org/org-tempo.el%{ext_el} diff --git a/pdump.patch b/pdump.patch index cd1eb60..f3b550f 100644 --- a/pdump.patch +++ b/pdump.patch @@ -4,7 +4,7 @@ Index: src/emacs.c =================================================================== --- src/emacs.c.orig +++ src/emacs.c -@@ -860,7 +860,11 @@ load_pdump (int argc, char **argv) +@@ -869,7 +869,11 @@ load_pdump (int argc, char **argv) /* Look for "emacs.pdmp" in PATH_EXEC. We hardcode "emacs" in "emacs.pdmp" so that the Emacs binary still works if the user copies and renames it. */