Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at 2023-08-08 15:54:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new.22712 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs" Tue Aug 8 15:54:04 2023 rev:175 rq:1102651 version:29.1 Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2023-08-03 17:27:20.338875859 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new.22712/emacs.changes 2023-08-08 15:54:04.844672762 +0200 @@ -1,0 +2,7 @@ +Mon Aug 7 07:37:16 UTC 2023 - Dr. Werner Fink <[email protected]> + +- Extend patch pdump.patch + * Make various emacs flavours find their pdmp files even if first + argument is simply named "emacs" (slack message, boo#1214008) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.ElZ8cR/_old 2023-08-08 15:54:06.064680397 +0200 +++ /var/tmp/diff_new_pack.ElZ8cR/_new 2023-08-08 15:54:06.072680447 +0200 @@ -25,6 +25,8 @@ %bcond_with nativecomp %endif %bcond_without cairo +# This generates (after s/with/without/) all refcards below etc/refcards/ +# to be stored in emacs-<version>-pdf.tar.xz only once %bcond_with tex4pdf %bcond_with memmmap @@ -532,14 +534,12 @@ done cp src/emacs emacs-nox cp src/emacs.pdmp emacs-nox.pdmp -find -name '*.eln' make distclean # CFLAGS="$CFLAGS -DPDMP_BASE='\"emacs-x11\"'" ./configure ${COMP} ${PREFIX} ${X11} ${SYS} --with-dumping=pdumper %make_build cp src/emacs emacs-x11 cp src/emacs.pdmp emacs-x11.pdmp -find -name '*.eln' make distclean # CFLAGS="$CFLAGS -DPDMP_BASE='\"emacs-gtk\"'" ./configure ${COMP} ${PREFIX} ${GTK} ${SYS} --with-dumping=pdumper ++++++ pdump.patch ++++++ --- /var/tmp/diff_new_pack.ElZ8cR/_old 2023-08-08 15:54:06.232681449 +0200 +++ /var/tmp/diff_new_pack.ElZ8cR/_new 2023-08-08 15:54:06.236681473 +0200 @@ -1,13 +1,14 @@ From: Andreas Schwab +Port to GNU Emacs 29.1: Werner Fink Index: src/emacs.c =================================================================== --- - src/emacs.c | 4 ++++ - 1 file changed, 4 insertions(+) + src/emacs.c | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) --- src/emacs.c -+++ src/emacs.c 2021-10-08 09:36:17.039806927 +0000 ++++ src/emacs.c 2023-08-07 07:30:34.317996305 +0000 @@ -867,12 +867,16 @@ load_pdump (int argc, char **argv) NULL #endif @@ -25,4 +26,34 @@ ; /* TODO: maybe more thoroughly scrub process environment in order to +@@ -957,6 +961,29 @@ load_pdump (int argc, char **argv) + path_exec = ns_relocate (path_exec); + #endif + ++#ifdef PDMP_BASE ++ if (emacs_executable && *emacs_executable) ++ { ++ needed = (strlen (path_exec) ++ + 1 ++ + strlen (argv0_base) ++ + 1 ++ + strlen (suffix) ++ + 1); ++ if (bufsize < needed) ++ { ++ xfree (dump_file); ++ dump_file = xpalloc (NULL, &bufsize, needed - bufsize, -1, 1); ++ } ++ sprintf (dump_file, "%s%c%s%s", ++ path_exec, DIRECTORY_SEP, argv0_base, suffix); ++ result = pdumper_load (dump_file, emacs_executable); ++ ++ if (result == PDUMPER_LOAD_SUCCESS) ++ goto out; ++ } ++#endif ++ + /* Look for "emacs-FINGERPRINT.pdmp" in PATH_EXEC. We hardcode + "emacs" in "emacs-FINGERPRINT.pdmp" so that the Emacs binary + still works if the user copies and renames it. */
