Hello community,
here is the log from the commit of package emacs for openSUSE:Factory checked
in at 2020-09-01 20:02:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/emacs (Old)
and /work/SRC/openSUSE:Factory/.emacs.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs"
Tue Sep 1 20:02:48 2020 rev:150 rq:830281 version:27.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2020-08-20
22:24:52.171870214 +0200
+++ /work/SRC/openSUSE:Factory/.emacs.new.3399/emacs.changes 2020-09-01
20:03:30.420484062 +0200
@@ -1,0 +2,32 @@
+Fri Aug 28 13:38:54 UTC 2020 - Dr. Werner Fink <wer...@suse.de>
+
+- Be sure that /usr/share/emacs/site-lisp/site-start.d/ is in
+ the load path as otherwise we might catch some not seen errors
+
+-------------------------------------------------------------------
+Mon Aug 24 11:14:22 UTC 2020 - Dr. Werner Fink <wer...@suse.de>
+
+- Correct paths for emacs manual page on the fly
+
+-------------------------------------------------------------------
+Fri Aug 21 10:27:50 UTC 2020 - Dr. Werner Fink <wer...@suse.de>
+
+- Add patch pdump.patch from Andreas Schwab as it allows to
+ rename the executable name in emacs.sh
+
+-------------------------------------------------------------------
+Fri Aug 21 08:54:57 UTC 2020 - Dr. Werner Fink <wer...@suse.de>
+
+- Correct manual page of emacs, that is remove ``local/``
+- Make sure that the emacs spawned by the emacs script does use
+ its default pdumper image file
+- Avoid warning about permissions on /var/lib/games
+
+-------------------------------------------------------------------
+Thu Aug 20 09:08:33 UTC 2020 - Dr. Werner Fink <wer...@suse.de>
+
+- Disable patch emacs-24.4-glibc.patch to see if this fix boo#1175487
+- Require git at build time as used by rebuilding byte compiled lisp files
+- Load pcase and easy-mmode at dump time from emacs-lisp path
+
+-------------------------------------------------------------------
New:
----
pdump.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ emacs.spec ++++++
--- /var/tmp/diff_new_pack.WY8N9L/_old 2020-09-01 20:03:35.328486357 +0200
+++ /var/tmp/diff_new_pack.WY8N9L/_new 2020-09-01 20:03:35.340486363 +0200
@@ -39,6 +39,7 @@
BuildRequires: fonts-config
BuildRequires: freetype2-devel
BuildRequires: giflib-devel
+BuildRequires: git
BuildRequires: gpm-devel
BuildRequires: gtk3-devel
# Used for installtion of info pages as well as to
@@ -158,7 +159,7 @@
Source7: %{name}.keyring
Source8: emacs-%{version}-pdf.tar.xz
Patch: emacs-27.1.dif
-# PATCH-FIX-UPSTREAM Adjust to GnuPG 2.1 key listing change
+# Currently disabled
Patch2: emacs-24.4-glibc.patch
Patch4: emacs-24.3-asian-print.patch
Patch5: emacs-24.4-ps-bdf.patch
@@ -168,6 +169,7 @@
Patch12: emacs-24.3-x11r7.patch
Patch15: emacs-24.3-iconic.patch
Patch16: emacs-24.4-flyspell.patch
+Patch22: pdump.patch
Patch23: emacs-25.1-custom-fonts.patch
# this patch works with both ImageMagick-6 and ImageMagick-7 for us,
# but that is because we ship /usr/include/ImageMagick-7/wand compat
@@ -276,7 +278,7 @@
%prep
%setup -q -b 2
-%patch2 -p0 -b .glibc
+#%patch2 -p0 -b .glibc
%patch4 -p0 -b .print
%patch5 -p0 -b .psbdf
%patch7 -p0 -b .psmu
@@ -285,6 +287,7 @@
%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
@@ -444,6 +447,7 @@
--without-xft \
--without-libotf \
--without-m17n-flt \
+ --without-harfbuzz \
"
COMP="--disable-build-details \
%if %{with mailutils}
@@ -474,24 +478,24 @@
ac_cv_lib_gif_EGifPutExtensionLast=yes
export ac_cv_lib_gif_EGifPutExtensionLast
-CFLAGS="$CFLAGS $SMALL" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS}
--with-dumping=pdumper
-make bootstrap
-make -C lisp/ updates compile
-for i in `find site-lisp/ -name '*.el'`; do
- src/emacs -batch -q --no-site -f batch-byte-compile $i; \
+CFLAGS="$CFLAGS $SMALL -DPDMP_BASE='\"emacs-nox\"'" ./configure ${COMP}
${PREFIX} ${NOX11} ${SYS} --with-dumping=pdumper
+make bootstrap V=1
+make -C lisp/ updates compile V=1
+for i in $(find site-lisp/ -name '*.el'); do
+ EMACSLOADPATH='' src/emacs -batch -q --no-site -f batch-byte-compile $i
done
cp src/emacs emacs-nox
cp src/emacs.pdmp emacs-nox.pdmp
make distclean
#
-CFLAGS="$CFLAGS $LARGE" ./configure ${COMP} ${PREFIX} ${GTK} ${SYS}
--with-dumping=pdumper
-make
+CFLAGS="$CFLAGS $LARGE -DPDMP_BASE='\"emacs-gtk\"'" ./configure ${COMP}
${PREFIX} ${GTK} ${SYS} --with-dumping=pdumper
+make %{?_smp_mflags}
cp src/emacs emacs-gtk
cp src/emacs.pdmp emacs-gtk.pdmp
make distclean
#
-CFLAGS="$CFLAGS $LARGE" ./configure ${COMP} ${PREFIX} ${X11} ${SYS}
--with-dumping=pdumper
-make
+CFLAGS="$CFLAGS $LARGE -DPDMP_BASE='\"emacs-x11\"'" ./configure ${COMP}
${PREFIX} ${X11} ${SYS} --with-dumping=pdumper
+make %{?_smp_mflags}
cp src/emacs emacs-x11
cp src/emacs.pdmp emacs-x11.pdmp
@@ -502,7 +506,7 @@
#
pushd ../site-lisp/
-../emacs-%{version}/src/emacs -batch -q --no-site -f batch-byte-compile *.el
+EMACSLOADPATH='' ../emacs-%{version}/src/emacs -batch -q --no-site -f
batch-byte-compile *.el
rm -vf site-start.elc
rm -vf site-start.el.orig
popd
@@ -513,6 +517,7 @@
##
VERSION=%{version}
eval $(sed -rn "/^configuration=/p" config.log)
+sed -ri
's@/usr/lib/X11/fonts@/usr/share/fonts@g;s@(/usr/)local/(info|share|lib)@\1\2@;s@\$VERSION@%{version}@g;s@\$ARCH@'${configuration}'@g'
doc/man/emacs.1
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_prefix}/lib/emacs/%{version}/${configuration}
install -m 0755 emacs-nox %{buildroot}%{_bindir}
@@ -3258,7 +3263,7 @@
%dir %{_datadir}/emacs/site-lisp/site-start.d/
%{_mandir}/man1/*.1%{ext_man}
%exclude %{_mandir}/man1/*tags.1%{ext_man}
-%dir %attr(770,games,games) %{_localstatedir}/games/emacs
+%dir %attr(775,games,games) %{_localstatedir}/games/emacs
%attr(660,games,games) %{_localstatedir}/games/emacs/snake-scores
%attr(660,games,games) %{_localstatedir}/games/emacs/tetris-scores
++++++ emacs-27.1.dif ++++++
--- /var/tmp/diff_new_pack.WY8N9L/_old 2020-09-01 20:03:35.456486417 +0200
+++ /var/tmp/diff_new_pack.WY8N9L/_new 2020-09-01 20:03:35.456486417 +0200
@@ -9,7 +9,7 @@
lisp/cmuscheme.el | 3 -
lisp/international/mule-cmds.el | 1
lisp/net/ange-ftp.el | 8 +--
- lisp/site-load.el | 41 ++++++++++++++++
+ lisp/site-load.el | 45 ++++++++++++++++++
lisp/speedbar.el | 1
lisp/textmodes/ispell.el | 82 ++++++++++++++++++++++++++++++++-
site-lisp/term/func-keys.el | 33 +++++++++++++
@@ -17,7 +17,7 @@
site-lisp/term/kvt.el | 97
++++++++++++++++++++++++++++++++++++++++
site-lisp/term/linux.el | 79 ++++++++++++++++++++++++++++++++
site-lisp/term/locale.el | 13 +++++
- 18 files changed, 471 insertions(+), 32 deletions(-)
+ 18 files changed, 475 insertions(+), 32 deletions(-)
--- Makefile.in
+++ Makefile.in 2020-08-11 10:21:15.194072175 +0000
@@ -278,9 +278,9 @@
(defun ange-ftp-add-cms-host (host)
--- lisp/site-load.el
+++ lisp/site-load.el 2020-08-11 10:17:21.106266385 +0000
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,45 @@
+;;;;
-+;;; emacs20.xx/lisp/site-load.el
++;;; emacs-27.1/lisp/site-load.el
+;;; Copyright (c) 1995,96,98,99 SuSE Gmbh Nuernberg, Germany. All rights
reserved.
+;;;
+;;; Autor: Werner Fink <wer...@suse.de>, No warranty of any kind
@@ -306,6 +306,10 @@
+;;;;
+(garbage-collect)
+
++(load "emacs-lisp/pcase")
++(load "emacs-lisp/easy-mmode")
++(garbage-collect)
++
+(load "lpr")
+(setq lpr-headers-switches (list "-h"))
+(setq lpr-add-switches t)
++++++ pdump.patch ++++++
From: Andreas Schwab
Index: src/emacs.c
===================================================================
--- src/emacs.c.orig
+++ src/emacs.c
@@ -860,7 +860,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. */
+#ifdef PDMP_BASE
+ const char *argv0_base = PDMP_BASE;
+#else
const char *argv0_base = "emacs";
+#endif
ptrdiff_t needed = (strlen (path_exec)
+ 1
+ strlen (argv0_base)
++++++ site-lisp.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/site-lisp/ger-keys.el new/site-lisp/ger-keys.el
--- old/site-lisp/ger-keys.el 2002-10-17 11:54:05.000000000 +0200
+++ new/site-lisp/ger-keys.el 2020-08-24 13:01:32.740320982 +0200
@@ -87,10 +87,10 @@
;;
;; Lokale Hook's vor und nach dem Sichern des Buffers
;;
-(defvar local-write-file-hooks nil)
- (make-variable-buffer-local 'local-write-file-hooks)
- (put 'local-write-file-hooks 'permanent-local
- (get 'local-write-file-hooks 'permanent-local))
+(defvar write-file-functions nil)
+ (make-variable-buffer-local 'write-file-functions)
+ (put 'write-file-functions 'permanent-local
+ (get 'write-file-functions 'permanent-local))
(defvar after-save-hooks nil)
(make-variable-buffer-local 'after-save-hooks)
@@ -160,7 +160,7 @@
(local-unset-key [?\374])
(remove-hook 'after-save-hooks 'TeX-german-original)
(remove-hook 'after-save-hook 'TeX-german-original)
- (remove-hook 'local-write-file-hooks 'TeX-german-style)
+ (remove-hook 'write-file-functions 'TeX-german-style)
(setq german-mode nil))
;;
(defun german-mode-Init ()
@@ -181,7 +181,7 @@
"Zusammenfassung der Setzung des german-mode TeX-Standards"
(add-hook 'after-save-hooks 'TeX-german-original)
(add-hook 'after-save-hook 'TeX-german-original)
- (add-hook 'local-write-file-hooks 'TeX-german-style)
+ (add-hook 'write-file-functions 'TeX-german-style)
(local-set-key [?\304] 'self-insert-command)
(local-set-key [?\326] 'self-insert-command)
(local-set-key [?\334] 'self-insert-command)
@@ -202,7 +202,7 @@
"Zusammenfassung der Setzung des german-mode Latin-Standards"
(remove-hook 'after-save-hooks 'TeX-german-original)
(remove-hook 'after-save-hook 'TeX-german-original)
- (remove-hook 'local-write-file-hooks 'TeX-german-style)
+ (remove-hook 'write-file-functions 'TeX-german-style)
(local-unset-key [?\304])
(local-unset-key [?\326])
(local-unset-key [?\334])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/site-lisp/site-start.el new/site-lisp/site-start.el
--- old/site-lisp/site-start.el 2018-10-23 08:35:02.530700872 +0200
+++ new/site-lisp/site-start.el 2020-08-28 15:33:33.252810693 +0200
@@ -23,14 +23,8 @@
;; that means: mkdir ~/lib/site-lisp
(if (file-accessible-directory-p "~/lib/site-lisp/")
(setq load-path (append (list "~/lib/site-lisp/") load-path)))
-;;
-;; RMAIL: repair a bug in rmail of emacs 19.29
-;; -------------------------------------------
-(if (and (eq emacs-major-version 19) (eq emacs-minor-version 29))
- (progn
- (put 'rmail-disable-menu 'menu-enable ''t)
- (add-hook 'rmail-summary-mode-hook
- '(lambda () (rmail-summary-construct-io-menu)))))
+(if (file-accessible-directory-p "/usr/share/emacs/site-lisp/site-start.d/")
+ (setq load-path (append (list "/usr/share/emacs/site-lisp/site-start.d/")
load-path)))
;;
;; GNUS
;; ----
@@ -141,8 +135,8 @@
;;
;; XX-mode commands loads "XX-mode" or "XX"
;; ----------------------------------------
-;;(autoload 'bibtex-mode "bibtex" "Modus f\"ur BibTeX" t)
-(autoload 'maple-mode "maple" "Modus f\"ur Maple" t)
+;;(autoload 'bibtex-mode "bibtex" "Modus for BibTeX" t)
+(autoload 'maple-mode "maple" "Modus for Maple" t)
;;(autoload 'web-mode "web-mode" "Major mode for editing WEB-based documents"
t)
;;(autoload 'cweb-mode "cweb" "Major mode for editing CWEB-based documents" t)
;;(autoload 'c++-mode "cc-mode" "C++ Editing Mode" t)
