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-10-01 21:21:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new.28202 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs" Sun Oct 1 21:21:48 2023 rev:177 rq:1114250 version:29.1 Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2023-08-21 11:43:06.275404089 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new.28202/emacs.changes 2023-10-01 21:21:55.519818373 +0200 @@ -1,0 +2,19 @@ +Thu Sep 28 11:53:14 UTC 2023 - Dr. Werner Fink <wer...@suse.de> + +- For GNUS: Use message-user-fqdn instead of gnus-local-organization + +------------------------------------------------------------------- +Tue Sep 26 12:37:30 UTC 2023 - Dr. Werner Fink <wer...@suse.de> + +- Now with changed pdump.patch patch from bjorn.bi...@thaodan.de +- Build also wayland gtk based binary +- Support wayland binary by checking for XDG_SESSION_TYPE +- Provide eln native shared binaries for all emacs program binaries + +------------------------------------------------------------------- +Tue Sep 26 00:11:46 UTC 2023 - Björn Bidar <bjorn.bi...@thaodan.de> + +- Pass libdir to configure so native Emacs lisp files are installed + correctly on 64bit systems + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.C59Pb8/_old 2023-10-01 21:21:58.567928666 +0200 +++ /var/tmp/diff_new_pack.C59Pb8/_new 2023-10-01 21:21:58.571928810 +0200 @@ -148,6 +148,7 @@ BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xshmfence) BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(xwayland) BuildRequires: pkgconfig(xxf86vm) URL: http://www.gnu.org/software/emacs/ Version: 29.1 @@ -256,6 +257,8 @@ Requires: ifnteuro Requires: xorg-x11-fonts Requires: xorg-x11-fonts-core +Requires: (ghostscript-fonts-std or urw-base35-fonts) +%glib2_gsettings_schema_requires Enhances: libX11-6 Summary: GNU Emacs: Emacs binary with X Window System Support Group: Productivity/Text/Editors @@ -279,8 +282,6 @@ Summary: GNU Emacs-nox: Emacs Lisp native compiled binary files Group: Productivity/Text/Editors -%define _libeln %{_prefix}/lib - %description -n emacs-eln Emacs Lisp (Elisp) is the Lisp dialect used by the Emacs text editor family. GNU Emacs can currently execute Elisp code either interpreted @@ -354,6 +355,7 @@ %endif %build +umask 022 %if %{without autoconf} # We don't want to run autoconf if test configure.ac -nt aclocal.m4 -o m4/gnulib-comp.m4 -nt aclocal.m4 ; then @@ -444,6 +446,7 @@ --sharedstatedir=%{_localstatedir}/lib \ --libexecdir=%{_libexecdir} \ --with-file-notification=yes \ + --libdir=%{_libdir} \ --enable-locallisppath=%{_datadir}/emacs/%{version}/site-lisp:%{_datadir}/emacs/site-lisp " DESKTOP="--with-x \ @@ -463,6 +466,7 @@ " GTK="${DESKTOP} \ --with-x-toolkit=gtk3 \ + --without-pgtk \ --with-toolkit-scroll-bars \ --x-includes=%{_x11inc} \ --x-libraries=%{_x11lib} \ @@ -471,11 +475,6 @@ %if %{with cairo} --with-cairo \ %endif -%if %{with nativecomp} - --with-native-compilation \ -%else - --without-native-compilation \ -%endif --with-xwidgets \ " X11="${DESKTOP} \ @@ -485,7 +484,6 @@ --x-libraries=%{_x11lib}:%{_x11data} \ --without-libotf \ --without-m17n-flt \ - --without-native-compilation \ " NOX11="--with-gpm \ --without-x \ @@ -502,7 +500,6 @@ --without-libotf \ --without-m17n-flt \ --without-harfbuzz \ - --without-native-compilation \ " COMP="--disable-build-details \ %if %{with mailutils} @@ -511,6 +508,11 @@ %else --with-pop \ %endif +%if %{with nativecomp} + --with-native-compilation \ +%else + --without-native-compilation \ +%endif --without-hesiod \ --with-gameuser=:games \ --with-kerberos \ @@ -533,27 +535,45 @@ ac_cv_lib_gif_EGifPutExtensionLast=yes export ac_cv_lib_gif_EGifPutExtensionLast +parking=$(mktemp -p ${PWD} -d parking.XXXXXX) CFLAGS="$CFLAGS -DPDMP_BASE='\"emacs-nox\"'" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS} --with-dumping=pdumper %make_build 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 +cp -p src/emacs src/emacs-nox +cp -p src/emacs.pdmp src/emacs-nox.pdmp +%if %{with nativecomp} +find native-lisp -type d -exec mkdir -p "${parking}%{_libdir}/emacs/%{version}/{}" \; +find native-lisp -type f -exec install -m 0644 "{}" "${parking}%{_libdir}/emacs/%{version}/{}" \; +%endif 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 +cp -p src/emacs src/emacs-x11 +cp -p src/emacs.pdmp src/emacs-x11.pdmp +%if %{with nativecomp} +find native-lisp -type d -exec mkdir -p "${parking}%{_libdir}/emacs/%{version}/{}" \; +find native-lisp -type f -exec install -m 0644 "{}" "${parking}%{_libdir}/emacs/%{version}/{}" \; +%endif make distclean # CFLAGS="$CFLAGS -DPDMP_BASE='\"emacs-gtk\"'" ./configure ${COMP} ${PREFIX} ${GTK} ${SYS} --with-dumping=pdumper %make_build -cp src/emacs emacs-gtk -cp src/emacs.pdmp emacs-gtk.pdmp -find -name '*.eln' +cp src/emacs src/emacs-gtk +cp src/emacs.pdmp src/emacs-gtk.pdmp +%if %{with nativecomp} +find native-lisp -type d -exec mkdir -p "${parking}%{_libdir}/emacs/%{version}/{}" \; +find native-lisp -type f -exec install -m 0644 "{}" "${parking}%{_libdir}/emacs/%{version}/{}" \; +%endif +make distclean +# +CFLAGS="$CFLAGS -DPDMP_BASE='\"emacs-wayland\"'" ./configure ${COMP} ${PREFIX} ${GTK//--without-pgtk/--with-pgtk} ${SYS} --with-dumping=pdumper +%make_build +cp src/emacs src/emacs-wayland +cp src/emacs.pdmp src/emacs-wayland.pdmp %if %{with tex4pdf} # @@ -568,6 +588,7 @@ popd %install +umask 022 # PATH=/sbin:$PATH ## @@ -578,12 +599,24 @@ mkdir -p %{buildroot}%{_libexecdir}/emacs/%{version}/${configuration} make install DESTDIR=%{buildroot} systemdunitdir=%{_userunitdir} rm -vf %{buildroot}%{_libexecdir}/emacs/%{version}/${configuration}/*.pdmp -install -m 0755 emacs-nox %{buildroot}%{_bindir} -install -m 0755 emacs-gtk %{buildroot}%{_bindir} -install -m 0755 emacs-x11 %{buildroot}%{_bindir} -install -m 0644 emacs-nox.pdmp %{buildroot}%{_libexecdir}/emacs/%{version}/${configuration}/ -install -m 0644 emacs-gtk.pdmp %{buildroot}%{_libexecdir}/emacs/%{version}/${configuration}/ -install -m 0644 emacs-x11.pdmp %{buildroot}%{_libexecdir}/emacs/%{version}/${configuration}/ +%if %{with nativecomp} +pushd native-lisp/ + ln -sf ../parking.*/usr/lib64/emacs/29.1/native-lisp/* . +popd +%endif +for pdmp in emacs-nox emacs-gtk emacs-x11 emacs-wayland +do + install -m 0755 src/${pdmp} %{buildroot}%{_bindir} + install -m 0644 src/${pdmp}.pdmp %{buildroot}%{_libexecdir}/emacs/%{version}/${configuration}/ + ln -sf ${pdmp}.pdmp %{buildroot}%{_libexecdir}/emacs/%{version}/${configuration}/${pdmp}-$(src/${pdmp} --fingerprint).pdmp +done +%if %{with nativecomp} +pushd parking.*/%{_libdir}/emacs/%{version}/ + find native-lisp -type d -exec mkdir -p "%{buildroot}%{_libdir}/emacs/%{version}/{}" \; + find native-lisp -type f -exec install -m 0644 "{}" "%{buildroot}%{_libdir}/emacs/%{version}/{}" \; +popd +%endif +rm -rf parking.* rm -vf %{buildroot}/usr/bin/emacs rm -vf %{buildroot}%{_libexecdir}/emacs/%{version}/${configuration}/emacs.pdmp install -p %{S:5} %{buildroot}/usr/bin/emacs @@ -723,19 +756,19 @@ %if %{with nativecomp} touch eln.list -for eln in %{buildroot}%{_libeln}/emacs/%{version}/native-lisp/%{version}-*/*.eln +for eln in %{buildroot}%{_libdir}/emacs/%{version}/native-lisp/%{version}-*/*.eln do if test -e $eln then - echo '%%{_libeln}/emacs/%%{version}/native-lisp/%%{version}-*/*.eln' >> eln.list + echo '%%{_libdir}/emacs/%%{version}/native-lisp/%%{version}-*/*.eln' >> eln.list fi break done -for eln in %{buildroot}%{_libeln}/emacs/%{version}/native-lisp/%{version}-*/preloaded/*.eln +for eln in %{buildroot}%{_libdir}/emacs/%{version}/native-lisp/%{version}-*/preloaded/*.eln do if test -e $eln then - echo '%%{_libeln}/emacs/%%{version}/native-lisp/%%{version}-*/preloaded/*.eln' >> eln.list + echo '%%{_libdir}/emacs/%%{version}/native-lisp/%%{version}-*/preloaded/*.eln' >> eln.list fi break done @@ -770,6 +803,10 @@ TeX-auto-global "<none>")' -f batch-byte-compile font-latex.el > /dev/null 2>&1 cd $owd fi +%glib2_gsettings_schema_post + +%postun -n emacs-x11 +%glib2_gsettings_schema_postun %if 0%{?suse_version} <= 1500 %post info @@ -982,7 +1019,7 @@ %{_datadir}/emacs/%{version}/etc/charsets/symbol.map %{_datadir}/emacs/%{version}/etc/compilation.txt %{_datadir}/emacs/%{version}/etc/emacs_lldb.py -%{_datadir}/emacs/%{version}/etc/org.gnu.emacs.defaults.gschema.xml +%{_datadir}/emacs/%{version}/etc/org.gnu.emacs.defaults.gschema.* %dir %{_datadir}/emacs/%{version}/etc/org/ %dir %{_datadir}/emacs/%{version}/etc/org/csl/ %{_datadir}/emacs/%{version}/etc/org/csl/README @@ -3438,17 +3475,20 @@ %files -n emacs-nox %defattr(-, root, root) %{_bindir}/emacs-nox -%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-nox.pdmp +%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-nox*.pdmp %files -n emacs-x11 %defattr(-, root, root) %{_bindir}/emacs-x11 %{_bindir}/emacs-gtk -%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-x11.pdmp -%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-gtk.pdmp +%{_bindir}/emacs-wayland +%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-x11*.pdmp +%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-gtk*.pdmp +%{_libexecdir}/emacs/%{version}/*-suse-linux*/emacs-wayland*.pdmp %dir %{appDefaultsDir} %{appDefaultsFile} %{_datadir}/applications/emacs*.desktop +%{_datadir}/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml %{_datadir}/icons/hicolor/128x128/apps/emacs.png %{_datadir}/icons/hicolor/16x16/apps/emacs.png %{_datadir}/icons/hicolor/24x24/apps/emacs.png @@ -3467,11 +3507,11 @@ %if %{with nativecomp} %files -n emacs-eln -f eln.list %defattr(-, root, root) -%dir %{_libeln}/emacs/ -%dir %{_libeln}/emacs/%{version}/ -%dir %{_libeln}/emacs/%{version}/native-lisp/ -%dir %{_libeln}/emacs/%{version}/native-lisp/%{version}-*/ -%dir %{_libeln}/emacs/%{version}/native-lisp/%{version}-*/preloaded/ +%dir %{_libdir}/emacs/ +%dir %{_libdir}/emacs/%{version}/ +%dir %{_libdir}/emacs/%{version}/native-lisp/ +%dir %{_libdir}/emacs/%{version}/native-lisp/%{version}-*/ +%dir %{_libdir}/emacs/%{version}/native-lisp/%{version}-*/preloaded/ %endif %files -n emacs-info ++++++ emacs.sh ++++++ --- /var/tmp/diff_new_pack.C59Pb8/_old 2023-10-01 21:21:58.687933008 +0200 +++ /var/tmp/diff_new_pack.C59Pb8/_new 2023-10-01 21:21:58.691933153 +0200 @@ -5,9 +5,10 @@ # The environment variable EMACS_TOOLKIT is used to determine # the prefered GUI. Possible values/types of EMACS_TOOLKIT are # -# nox -- for pure console based GNU Emacs -# gtk -- for full GTK2/3 based GNU Emacs -# x11 -- for full LUCID based GNU Emacs (used Xaw3d) +# nox -- for pure console based GNU Emacs +# gtk -- for full GTK2/3 based GNU Emacs (for real X11) +# wayland -- for full GTK2/3 based GNU Emacs (for wayland) +# x11 -- for full LUCID based GNU Emacs (used Xaw3d) # # Should work but remember history # bnc#345669 -- Emacs doesn't un-maximize in KDE/KWin @@ -21,11 +22,22 @@ # esac # fi # -: ${EMACS_TOOLKIT:=gtk} +if test -n "${XDG_SESSION_TYPE}" +then + if test "${XDG_SESSION_TYPE}" = wayland -a -x ${0}-wayland + then + : ${EMACS_TOOLKIT:=wayland} + else + : ${EMACS_TOOLKIT:=gtk} + fi +else + : ${EMACS_TOOLKIT:=gtk} +fi # # Enabled again # -if test "$EMACS_TOOLKIT" = gtk; then +if test "$EMACS_TOOLKIT" = gtk -o "$EMACS_TOOLKIT" = wayland +then # Currently (2013/05/24) the parser of the GNOME libs # are broken that is it is not independent from locale LC_NUMERIC=POSIX ++++++ pdump.patch ++++++ --- /var/tmp/diff_new_pack.C59Pb8/_old 2023-10-01 21:21:58.711933876 +0200 +++ /var/tmp/diff_new_pack.C59Pb8/_new 2023-10-01 21:21:58.715934021 +0200 @@ -1,15 +1,17 @@ -From: Andreas Schwab -Port to GNU Emacs 29.1: Werner Fink +From 54823555425ffabe31b42672b1894d0e3ff1b018 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Bidar?= <bjorn.bi...@thaodan.de> +Date: Fri, 10 Feb 2023 23:31:35 +0200 +Subject: [PATCH] Allow to override pdmp base -Index: src/emacs.c -=================================================================== --- - src/emacs.c | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) + src/emacs.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +diff --git a/src/emacs.c b/src/emacs.c +index 687b8c7f81f0..2d6bfe07d813 100644 --- src/emacs.c -+++ src/emacs.c 2023-08-07 07:30:34.317996305 +0000 -@@ -867,12 +867,16 @@ load_pdump (int argc, char **argv) ++++ src/emacs.c +@@ -920,11 +920,15 @@ load_pdump (int argc, char **argv, char *dump_file) NULL #endif ; @@ -21,39 +23,20 @@ "Emacs" #else "emacs" - #endif +#endif - ; - - /* 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 + ; +@@ -1065,7 +1069,11 @@ load_pdump (int argc, char **argv, char *dump_file) + if (IS_DIRECTORY_SEP (*p)) + last_sep = p; + } +#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; -+ } ++ argv0_base = PDMP_BASE; ++#else + argv0_base = last_sep ? last_sep + 1 : argv[0]; +#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. */ + 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/site-start.el new/site-lisp/site-start.el --- old/site-lisp/site-start.el 2020-08-28 15:33:33.252810693 +0200 +++ new/site-lisp/site-start.el 2023-09-28 13:51:27.757966144 +0200 @@ -32,12 +32,12 @@ ;; the environment variables HOSTNAME or FROM_HEADER and ORGANIZATION. ;; (Note: gnus-local-organization is obsolete.) ;; -;(setq gnus-local-domain "our.domain.is.not.set") +;(setq message-user-fqdn "our.domain.is.not.set") ;(setq message-user-organization "Linux Private Site") ;; ;; This should be set by gnus via (system-name) call (does not work) ;; -(if (or (not (boundp 'gnus-local-domain)) (null gnus-local-domain)) +(if (or (not (boundp 'message-user-fqdn)) (null message-user-fqdn)) (let ((tmph (getenv "HOSTNAME")) (tmpf (getenv "FROM_HEADER"))) (if (or (null tmph) (not (string-match "\\." tmph))) @@ -45,9 +45,9 @@ (if (not (string-match "\\." tmph)) (setq gnus-local-domain "our.domain.is.not.set") (string-match "\\." tmph) - (setq gnus-local-domain (substring tmph (match-end 0)))) + (setq message-user-fqdn (substring tmph (match-end 0)))) (if (stringp tmpf) - (setq gnus-local-domain tmpf)))) + (setq message-user-fqdn tmpf)))) ;; (eval-when-compile (defvar message-user-organization)) (if (or (not (boundp 'message-user-organization)) (null message-user-organization))
