Accepting request 830281 from editors
- 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 - Correct paths for emacs manual page on the fly - Add patch pdump.patch from Andreas Schwab as it allows to rename the executable name in emacs.sh - 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 - 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 OBS-URL: https://build.opensuse.org/request/show/830281 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=150
This commit is contained in:
Git OBS Bridge
@@ -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 <werner@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)
|
||||
|
||||
@@ -1,3 +1,35 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 28 13:38:54 UTC 2020 - Dr. Werner Fink <werner@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 <werner@suse.de>
|
||||
|
||||
- Correct paths for emacs manual page on the fly
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 21 10:27:50 UTC 2020 - Dr. Werner Fink <werner@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 <werner@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 <werner@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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 18 09:22:51 UTC 2020 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
|
||||
31
emacs.spec
31
emacs.spec
@@ -39,6 +39,7 @@ BuildRequires: fontconfig-devel
|
||||
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 @@ Source6: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz.sig
|
||||
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 @@ Patch11: emacs-24.4-xim.patch
|
||||
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 @@ and most assembler-like syntaxes.
|
||||
|
||||
%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 @@ and most assembler-like syntaxes.
|
||||
%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 @@ DESKTOP="--with-x \
|
||||
--without-xft \
|
||||
--without-libotf \
|
||||
--without-m17n-flt \
|
||||
--without-harfbuzz \
|
||||
"
|
||||
COMP="--disable-build-details \
|
||||
%if %{with mailutils}
|
||||
@@ -474,24 +478,24 @@ fi
|
||||
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 @@ make -C etc/refcards/
|
||||
|
||||
#
|
||||
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 @@ PATH=/sbin:$PATH
|
||||
##
|
||||
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 @@ fi
|
||||
%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
|
||||
|
||||
|
||||
18
pdump.patch
Normal file
18
pdump.patch
Normal file
@@ -0,0 +1,18 @@
|
||||
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)
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a1d2ebbc40bd8a9d89fdf72ceb92465087fc803567c65259bd884cfa33c11dbc
|
||||
size 51806
|
||||
oid sha256:3c3b2fea1937f7af8c667f3b4ff67572fac147dd661715c1fa1fc18bc631644e
|
||||
size 51852
|
||||
|
||||
Reference in New Issue
Block a user