rpm/emacs
SHA256
1
0
Fork 0
forked from pool/emacs
Code Pull Requests Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=290
This commit is contained in:
Dr. Werner Fink 2020-08-21 11:01:12 +00:00 committed by Git OBS Bridge
parent ac02f743f5
commit f3f754ccde
4 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emacs.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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>

1
emacs.sh
View File

@ -45,7 +45,6 @@ else
echo "no emacs binary found"
exit 1
fi
arg0=$1
dbusdaemon=$(type -p dbus-daemon 2>/dev/null)
#
# Now check for valid dbus, e.g. after su/sudo/slogin

16
emacs.spec
View File

@ -169,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
@ -286,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
@ -476,9 +478,9 @@ 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
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
src/emacs -batch -q --no-site -f batch-byte-compile $i; \
done
@ -486,14 +488,14 @@ 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

18
pdump.patch Normal file
View 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)