From d715a06a136fccd74fae0ae67376e3f6109246a7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 30 Dec 2015 13:21:28 -0700 Subject: [PATCH 01/41] Use system malloc on 32-bit MIPS (bz 1294893). --- xemacs.appdata.xml | 19 +++++++++++++------ xemacs.spec | 9 ++++++--- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/xemacs.appdata.xml b/xemacs.appdata.xml index b623940..00c4be6 100644 --- a/xemacs.appdata.xml +++ b/xemacs.appdata.xml @@ -1,6 +1,6 @@ - - xemacs.desktop + + xemacs.desktop CC0 GPL-3.0+ XEmacs @@ -17,9 +17,16 @@

- http://www.xemacs.org/Images/gnus.png - http://www.xemacs.org/Images/custom.png + + http://www.xemacs.org/Images/gnus.png + Gnus in XEmacs + + + http://www.xemacs.org/Images/custom.png + Customize buffer + + james@xemacs.org http://www.xemacs.org/ - james@xemacs.org - + http://tracker.xemacs.org/XEmacs/its/ + diff --git a/xemacs.spec b/xemacs.spec index b0c14d8..464a358 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 12%{?snap:.%{snap}}%{?dist} +Release: 13%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -303,7 +303,7 @@ common_options=" --with-pop --without-hesiod --with-tls=nss \ -%ifarch alpha ia64 ppc64 +%ifarch alpha ia64 ppc64 mips mipsel --with-system-malloc %endif --with-pdump @@ -674,7 +674,10 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog -* Sat Oct 3 2015 Jerry James - 21.5.34-1220150929hga76c9268bb72 +* Wed Dec 30 2015 Michal Toman - 21.5.34-13.20150929hga76c9268bb72 +- Use system malloc on 32-bit MIPS (bz 1294893) + +* Sat Oct 3 2015 Jerry James - 21.5.34-12.20150929hga76c9268bb72 - Update to snapshot: fixes multiple bugs - Add -alsaplay patch to fix playing sounds through ALSA From f3f85a99c8929a6f463876ac2e6ae20286d120a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:22:23 +0000 Subject: [PATCH 02/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 464a358..39b2af7 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 13%{?snap:.%{snap}}%{?dist} +Release: 14%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -674,6 +674,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 21.5.34-14.20150929hga76c9268bb72 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Dec 30 2015 Michal Toman - 21.5.34-13.20150929hga76c9268bb72 - Use system malloc on 32-bit MIPS (bz 1294893) From ef0d6ccc3948568a8e05dfb72d7f246ffb9eaf82 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 20 Feb 2016 17:29:55 -0700 Subject: [PATCH 03/41] Update to latest mercurial snapshot. --- .gitignore | 1 + sources | 2 +- xemacs.spec | 15 +++++---------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index b5f4f31..e02f520 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /xemacs-20140605hgacf1c26e3019.tar.xz /xemacs-20150420hg23178aa71f8b.tar.xz /xemacs-20150929hga76c9268bb72.tar.xz +/xemacs-20160104hg4d03958b4080.tar.xz diff --git a/sources b/sources index f1298ef..aa4684a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -462a2f1a8308fb59ae12cae107798d05 xemacs-20150929hga76c9268bb72.tar.xz +19005a04860b394a2d836dcf1f6007f9 xemacs-20160104hg4d03958b4080.tar.xz diff --git a/xemacs.spec b/xemacs.spec index 39b2af7..d9f1708 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,16 +19,15 @@ %bcond_without modules %endif -%global snap 20150929hga76c9268bb72 +%global snap 20160104hg4d03958b4080 Name: xemacs Version: 21.5.34 -Release: 14%{?snap:.%{snap}}%{?dist} +Release: 15%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) -Group: Applications/Editors License: GPLv3+ URL: http://www.xemacs.org/ %if 0%{?snap:1} @@ -125,7 +124,6 @@ This package contains XEmacs built for X Windows%{?with_mule: with MULE support} %package common Summary: Byte-compiled lisp files and other common files for XEmacs -Group: Applications/Editors Requires: %{name}-filesystem = %{version}-%{release} Requires(post): chkconfig Requires(preun): chkconfig @@ -141,7 +139,6 @@ This package contains byte-compiled lisp and other common files for XEmacs. %package nox Summary: Different version of Emacs built without X Windows support -Group: Applications/Editors # Note: no xemacs-packages* dependencies here, we need -nox to build the # base package set. Requires: %{name}-common = %{version}-%{release} @@ -161,7 +158,6 @@ This package contains XEmacs built without X Windows support. %package xft Summary: Different version of Emacs built with Xft/fontconfig support -Group: Applications/Editors Requires: %{name}-common = %{version}-%{release} Requires: xemacs-packages-base >= 20060510 Requires(post): chkconfig @@ -180,7 +176,6 @@ This package contains XEmacs built with Xft and fontconfig support. %package el Summary: Emacs lisp source files for XEmacs -Group: Development/Libraries Requires: %{name}-filesystem = %{version}-%{release} %description el @@ -195,7 +190,6 @@ interest when developing or debugging XEmacs itself. %package info Summary: XEmacs documentation in GNU texinfo format -Group: Documentation BuildArch: noarch Requires(post): info Requires(preun): info @@ -211,7 +205,6 @@ This package contains XEmacs documentation in GNU texinfo format. %package devel Summary: Development files for XEmacs -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -226,7 +219,6 @@ This package contains XEmacs development support files. %package filesystem Summary: XEmacs filesystem layout -Group: Applications/Editors BuildArch: noarch %description filesystem @@ -674,6 +666,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Feb 20 2016 Jerry James - 21.5.34-15.20160104hg4d03958b4080 +- Update to latest mercurial snapshot + * Fri Feb 05 2016 Fedora Release Engineering - 21.5.34-14.20150929hga76c9268bb72 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From e1eb076aee79b17e31e4e6236323d461e7933a7d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 28 May 2016 15:09:29 -0600 Subject: [PATCH 04/41] Update to latest mercurial snapshot. Also, fix M-x shell under tcsh (bz 1222897, 1260785). --- .gitignore | 1 + sources | 2 +- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 2 +- xemacs-21.5.34-setsid.patch | 28 ++++++++++++++++++++++ xemacs-21.5.34-tls.patch | 15 ++++++++++++ xemacs.spec | 15 ++++++++++-- 6 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 xemacs-21.5.34-setsid.patch create mode 100644 xemacs-21.5.34-tls.patch diff --git a/.gitignore b/.gitignore index e02f520..066754c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /xemacs-20150420hg23178aa71f8b.tar.xz /xemacs-20150929hga76c9268bb72.tar.xz /xemacs-20160104hg4d03958b4080.tar.xz +/xemacs-20160507hgd5b51c618ef8.tar.xz diff --git a/sources b/sources index aa4684a..3fbc8bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19005a04860b394a2d836dcf1f6007f9 xemacs-20160104hg4d03958b4080.tar.xz +1b1ea71723e5bfe4badf7e87e38a0736 xemacs-20160507hgd5b51c618ef8.tar.xz diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index a475ca6..d553474 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -14,7 +14,7 @@ fi --- ./configure.orig 2012-08-02 12:39:01.000000000 -0600 +++ ./configure 2012-08-06 20:28:23.841705350 -0600 -@@ -15036,7 +15036,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib +@@ -15045,7 +15045,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; *) diff --git a/xemacs-21.5.34-setsid.patch b/xemacs-21.5.34-setsid.patch new file mode 100644 index 0000000..b6b0ab8 --- /dev/null +++ b/xemacs-21.5.34-setsid.patch @@ -0,0 +1,28 @@ +--- ./src/process-unix.c.orig 2016-05-28 13:52:40.000000000 -0600 ++++ ./src/process-unix.c 2016-05-28 14:50:54.288035364 -0600 +@@ -1122,10 +1122,8 @@ unix_create_process (Lisp_Process *p, + + /* Disconnect the current controlling terminal, pursuant to + making the pty be the controlling terminal of the process. +- Also put us in our own process group. +- Moved this call to later in the function, because on Cygwin, +- setsid() causes the pty setup to fail in some way. +- disconnect_controlling_terminal (); */ ++ Also put us in our own process group. */ ++ disconnect_controlling_terminal (); + + if (pty_flag) + { +@@ -1244,12 +1242,6 @@ unix_create_process (Lisp_Process *p, + child_setup_tty (xforkout); + } /* if (pty_flag) */ + +- /* Moved this here because of Cygwin. Vin Shelton 2015-03-24. */ +- /* Disconnect the current controlling terminal, pursuant to +- making the pty be the controlling terminal of the process. +- Also put us in our own process group. */ +- disconnect_controlling_terminal (); +- + EMACS_SIGNAL (SIGINT, SIG_DFL); + EMACS_SIGNAL (SIGQUIT, SIG_DFL); + diff --git a/xemacs-21.5.34-tls.patch b/xemacs-21.5.34-tls.patch new file mode 100644 index 0000000..5d8ab81 --- /dev/null +++ b/xemacs-21.5.34-tls.patch @@ -0,0 +1,15 @@ +--- ./src/tls.c.orig 2016-05-28 13:52:40.000000000 -0600 ++++ ./src/tls.c 2016-05-28 14:20:54.457085311 -0600 +@@ -370,12 +370,6 @@ init_tls (void) + /* Set options on the model socket */ + if (SSL_OptionSet (nss_model, SSL_SECURITY, PR_TRUE) != SECSuccess) + signal_error (Qtls_error, "NSS cannot enable model socket", NSS_ERRSTR); +- if (SSL_OptionSet (nss_model, SSL_ENABLE_SSL2, PR_FALSE) != SECSuccess) +- signal_error (Qtls_error, "NSS unable to disable SSLv2", NSS_ERRSTR); +- if (SSL_OptionSet (nss_model, SSL_V2_COMPATIBLE_HELLO, PR_FALSE) +- != SECSuccess) +- signal_error (Qtls_error, "NSS unable to disable SSLv2 handshake", +- NSS_ERRSTR); + if (SSL_OptionSet (nss_model, SSL_ENABLE_DEFLATE, PR_FALSE) != SECSuccess) + signal_error (Qtls_error, "NSS unable to disable deflate", NSS_ERRSTR); + if (SSL_OptionSet (nss_model, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE) diff --git a/xemacs.spec b/xemacs.spec index d9f1708..2d68efc 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20160104hg4d03958b4080 +%global snap 20160507hgd5b51c618ef8 Name: xemacs Version: 21.5.34 -Release: 15%{?snap:.%{snap}}%{?dist} +Release: 16%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -61,7 +61,12 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch +# Don't try to set an option that has been removed from nss +Patch7: %{name}-21.5.34-tls.patch +# Undo a Cygwin fix that breaks M-x shell with tcsh on Linux +Patch8: %{name}-21.5.34-setsid.patch +BuildRequires: gcc BuildRequires: texinfo BuildRequires: ncurses-devel BuildRequires: gpm-devel @@ -242,6 +247,8 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch4 %patch5 %patch6 +%patch7 +%patch8 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -666,6 +673,10 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat May 28 2016 Jerry James - 21.5.34-16.20160507hgd5b51c618ef8 +- Update to latest mercurial snapshot +- Fix M-x shell under tcsh (bz 1222897, 1260785) + * Sat Feb 20 2016 Jerry James - 21.5.34-15.20160104hg4d03958b4080 - Update to latest mercurial snapshot From 771e41e16d57c6c8465df0bb0c2c8fa4d0144ae0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 3 Jun 2016 14:41:30 -0600 Subject: [PATCH 05/41] Update to fix NSS breakage. Drop upstreamed -tls and -setsid patches. --- .gitignore | 1 + sources | 2 +- xemacs-21.5.34-setsid.patch | 28 ---------------------------- xemacs-21.5.34-tls.patch | 15 --------------- xemacs-snapshot.sh | 2 +- xemacs.spec | 14 ++++++-------- 6 files changed, 9 insertions(+), 53 deletions(-) delete mode 100644 xemacs-21.5.34-setsid.patch delete mode 100644 xemacs-21.5.34-tls.patch diff --git a/.gitignore b/.gitignore index 066754c..710fdb5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /xemacs-20150929hga76c9268bb72.tar.xz /xemacs-20160104hg4d03958b4080.tar.xz /xemacs-20160507hgd5b51c618ef8.tar.xz +/xemacs-20160603hga561e02bb626.tar.xz diff --git a/sources b/sources index 3fbc8bc..8e81253 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b1ea71723e5bfe4badf7e87e38a0736 xemacs-20160507hgd5b51c618ef8.tar.xz +04a0b49ae238fb84b5ae928a8e216cf2 xemacs-20160603hga561e02bb626.tar.xz diff --git a/xemacs-21.5.34-setsid.patch b/xemacs-21.5.34-setsid.patch deleted file mode 100644 index b6b0ab8..0000000 --- a/xemacs-21.5.34-setsid.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ./src/process-unix.c.orig 2016-05-28 13:52:40.000000000 -0600 -+++ ./src/process-unix.c 2016-05-28 14:50:54.288035364 -0600 -@@ -1122,10 +1122,8 @@ unix_create_process (Lisp_Process *p, - - /* Disconnect the current controlling terminal, pursuant to - making the pty be the controlling terminal of the process. -- Also put us in our own process group. -- Moved this call to later in the function, because on Cygwin, -- setsid() causes the pty setup to fail in some way. -- disconnect_controlling_terminal (); */ -+ Also put us in our own process group. */ -+ disconnect_controlling_terminal (); - - if (pty_flag) - { -@@ -1244,12 +1242,6 @@ unix_create_process (Lisp_Process *p, - child_setup_tty (xforkout); - } /* if (pty_flag) */ - -- /* Moved this here because of Cygwin. Vin Shelton 2015-03-24. */ -- /* Disconnect the current controlling terminal, pursuant to -- making the pty be the controlling terminal of the process. -- Also put us in our own process group. */ -- disconnect_controlling_terminal (); -- - EMACS_SIGNAL (SIGINT, SIG_DFL); - EMACS_SIGNAL (SIGQUIT, SIG_DFL); - diff --git a/xemacs-21.5.34-tls.patch b/xemacs-21.5.34-tls.patch deleted file mode 100644 index 5d8ab81..0000000 --- a/xemacs-21.5.34-tls.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./src/tls.c.orig 2016-05-28 13:52:40.000000000 -0600 -+++ ./src/tls.c 2016-05-28 14:20:54.457085311 -0600 -@@ -370,12 +370,6 @@ init_tls (void) - /* Set options on the model socket */ - if (SSL_OptionSet (nss_model, SSL_SECURITY, PR_TRUE) != SECSuccess) - signal_error (Qtls_error, "NSS cannot enable model socket", NSS_ERRSTR); -- if (SSL_OptionSet (nss_model, SSL_ENABLE_SSL2, PR_FALSE) != SECSuccess) -- signal_error (Qtls_error, "NSS unable to disable SSLv2", NSS_ERRSTR); -- if (SSL_OptionSet (nss_model, SSL_V2_COMPATIBLE_HELLO, PR_FALSE) -- != SECSuccess) -- signal_error (Qtls_error, "NSS unable to disable SSLv2 handshake", -- NSS_ERRSTR); - if (SSL_OptionSet (nss_model, SSL_ENABLE_DEFLATE, PR_FALSE) != SECSuccess) - signal_error (Qtls_error, "NSS unable to disable deflate", NSS_ERRSTR); - if (SSL_OptionSet (nss_model, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE) diff --git a/xemacs-snapshot.sh b/xemacs-snapshot.sh index 51e8eef..fb235dc 100755 --- a/xemacs-snapshot.sh +++ b/xemacs-snapshot.sh @@ -22,7 +22,7 @@ pwd=$(pwd) now=$(date +%Y%m%d) cd "$tmp" -hg clone https://bitbucket.org/xemacs/xemacs-beta +hg clone https://bitbucket.org/xemacs/xemacs xemacs-beta cd xemacs-beta hg update -r "$rev" # Hack to avoid needing .hg/ around but still getting xemacs-extra-name right diff --git a/xemacs.spec b/xemacs.spec index 2d68efc..5e9be5f 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20160507hgd5b51c618ef8 +%global snap 20160603hga561e02bb626 Name: xemacs Version: 21.5.34 -Release: 16%{?snap:.%{snap}}%{?dist} +Release: 17%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -61,10 +61,6 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch -# Don't try to set an option that has been removed from nss -Patch7: %{name}-21.5.34-tls.patch -# Undo a Cygwin fix that breaks M-x shell with tcsh on Linux -Patch8: %{name}-21.5.34-setsid.patch BuildRequires: gcc BuildRequires: texinfo @@ -247,8 +243,6 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch4 %patch5 %patch6 -%patch7 -%patch8 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -673,6 +667,10 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Jun 3 2016 Jerry James - 21.5.34-17.20160603hga561e02bb626 +- Update to fix NSS breakage +- Drop upstreamed -tls and -setsid patches + * Sat May 28 2016 Jerry James - 21.5.34-16.20160507hgd5b51c618ef8 - Update to latest mercurial snapshot - Fix M-x shell under tcsh (bz 1222897, 1260785) From 155946898a150788745c77b3245fe09028339425 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 18 Oct 2016 14:46:22 -0600 Subject: [PATCH 06/41] Update to latest mercurial snapshot. --- .gitignore | 1 + sources | 2 +- xemacs.spec | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 710fdb5..fff02d2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /xemacs-20160104hg4d03958b4080.tar.xz /xemacs-20160507hgd5b51c618ef8.tar.xz /xemacs-20160603hga561e02bb626.tar.xz +/xemacs-20161013hg39f002ba1b8c.tar.xz diff --git a/sources b/sources index 8e81253..7825b50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04a0b49ae238fb84b5ae928a8e216cf2 xemacs-20160603hga561e02bb626.tar.xz +d1b7476b56d730722726f2f1cf4c50dd xemacs-20161013hg39f002ba1b8c.tar.xz diff --git a/xemacs.spec b/xemacs.spec index 5e9be5f..ce66ae1 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20160603hga561e02bb626 +%global snap 20161013hg39f002ba1b8c Name: xemacs Version: 21.5.34 -Release: 17%{?snap:.%{snap}}%{?dist} +Release: 18%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -530,13 +530,11 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null [ -e %{_bindir}/xemacs-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} if [ $1 -eq 0 ] ; then - update-desktop-database %{_datadir}/applications &>/dev/null touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null fi %posttrans -update-desktop-database %{_datadir}/applications &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %post nox @@ -667,6 +665,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Oct 18 2016 Jerry James - 21.5.34-18.20161013hg39f002ba1b8c +- Update to latest mercurial snapshot + * Fri Jun 3 2016 Jerry James - 21.5.34-17.20160603hga561e02bb626 - Update to fix NSS breakage - Drop upstreamed -tls and -setsid patches From 350f5ce8b77a0bdf82cf8b461c9e9b7d5ade3d32 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 14 Jan 2017 17:07:56 -0700 Subject: [PATCH 07/41] Update to latest mercurial snapshot (bz 1408201). Also: - Use glibc malloc on all platforms. - Add -with-output-to-string patch. --- .gitignore | 5 +---- sources | 2 +- xemacs-21.5.34-with-output-to-string.patch | 20 ++++++++++++++++++++ xemacs.spec | 18 ++++++++++++------ 4 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 xemacs-21.5.34-with-output-to-string.patch diff --git a/.gitignore b/.gitignore index fff02d2..d9c9fa6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,5 @@ -/xemacs-21.5.34.tar.gz -/xemacs-20140605hgacf1c26e3019.tar.xz -/xemacs-20150420hg23178aa71f8b.tar.xz -/xemacs-20150929hga76c9268bb72.tar.xz /xemacs-20160104hg4d03958b4080.tar.xz /xemacs-20160507hgd5b51c618ef8.tar.xz /xemacs-20160603hga561e02bb626.tar.xz /xemacs-20161013hg39f002ba1b8c.tar.xz +/xemacs-20170114hgd0e8ec0fe015.tar.xz diff --git a/sources b/sources index 7825b50..4e122b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1b7476b56d730722726f2f1cf4c50dd xemacs-20161013hg39f002ba1b8c.tar.xz +SHA512 (xemacs-20170114hgd0e8ec0fe015.tar.xz) = 7cf12dee82b714f61eefcef321b7c15cb47ed60debd629120b208689a0eb6f37f414905abf46a470070c4df716edae5d4c46a2c0fe1f249b147ad3b4f57787e8 diff --git a/xemacs-21.5.34-with-output-to-string.patch b/xemacs-21.5.34-with-output-to-string.patch new file mode 100644 index 0000000..9d39345 --- /dev/null +++ b/xemacs-21.5.34-with-output-to-string.patch @@ -0,0 +1,20 @@ +--- lisp/subr.el.orig 2017-01-14 14:43:49.000000000 -0700 ++++ lisp/subr.el 2017-01-14 16:35:55.082156030 -0700 +@@ -624,9 +624,14 @@ + + (defmacro with-output-to-string (&rest body) + "Execute BODY, return the text it sent to `standard-output', as a string." +- `(get-output-stream-string +- (let ((standard-output (make-string-output-stream))) +- (prog1 standard-output ,@body)))) ++ `(let ((standard-output ++ (get-buffer-create (generate-new-buffer-name " *string-output*")))) ++ (let ((standard-output standard-output)) ++ ,@body) ++ (with-current-buffer standard-output ++ (prog1 ++ (buffer-string) ++ (kill-buffer nil))))) + + (defmacro with-local-quit (&rest body) + "Execute BODY with `inhibit-quit' temporarily bound to nil." diff --git a/xemacs.spec b/xemacs.spec index ce66ae1..6529e38 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20161013hg39f002ba1b8c +%global snap 20170114hgd0e8ec0fe015 Name: xemacs Version: 21.5.34 -Release: 18%{?snap:.%{snap}}%{?dist} +Release: 19%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -61,6 +61,8 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch +# Revert recent buggy change to with-output-to-string +Patch7: %{name}-21.5.34-with-output-to-string.patch BuildRequires: gcc BuildRequires: texinfo @@ -100,7 +102,7 @@ BuildRequires: neXtaw-devel %endif # gtk BuildRequires: libXft-devel # Note: no xemacs-packages-extra dependency here, need main pkg to build it. -Requires: xemacs-packages-base >= 20060510 +Requires: xemacs-packages-base Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi @@ -243,6 +245,7 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch4 %patch5 %patch6 +%patch7 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -295,10 +298,8 @@ common_options=" --with-mail-locking=lockf --with-pop --without-hesiod - --with-tls=nss \ -%ifarch alpha ia64 ppc64 mips mipsel + --with-tls=nss --with-system-malloc -%endif --with-pdump %if ! %{with modules} --without-modules @@ -665,6 +666,11 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Jan 14 2017 Jerry James - 21.5.34-19.20170114hg29e551281d78 +- Update to latest mercurial snapshot (bz 1408201) +- Use glibc malloc on all platforms +- Add -with-output-to-string patch + * Tue Oct 18 2016 Jerry James - 21.5.34-18.20161013hg39f002ba1b8c - Update to latest mercurial snapshot From fc2f2f821f4b0c0a45708814ca9965afead4cf26 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 24 Jan 2017 20:35:05 -0700 Subject: [PATCH 08/41] Update to latest mercurial snapshot to really fix bz 1408201. Also, drop upstreamed -with-output-to-string patch. --- .gitignore | 2 +- sources | 2 +- xemacs-21.5.34-with-output-to-string.patch | 20 -------------------- xemacs.spec | 11 ++++++----- 4 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 xemacs-21.5.34-with-output-to-string.patch diff --git a/.gitignore b/.gitignore index d9c9fa6..df85b2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/xemacs-20160104hg4d03958b4080.tar.xz /xemacs-20160507hgd5b51c618ef8.tar.xz /xemacs-20160603hga561e02bb626.tar.xz /xemacs-20161013hg39f002ba1b8c.tar.xz /xemacs-20170114hgd0e8ec0fe015.tar.xz +/xemacs-20170124hgf412e9f093d4.tar.xz diff --git a/sources b/sources index 4e122b3..cec5cc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20170114hgd0e8ec0fe015.tar.xz) = 7cf12dee82b714f61eefcef321b7c15cb47ed60debd629120b208689a0eb6f37f414905abf46a470070c4df716edae5d4c46a2c0fe1f249b147ad3b4f57787e8 +SHA512 (xemacs-20170124hgf412e9f093d4.tar.xz) = 9ff78b9c830fd7deee95075098f80be2aacbec6ba690f3104c82be12648e98af4af8ca90694d8f6c0551ee96e9be44161e4ad08fc61d8959483cca6b4656ec22 diff --git a/xemacs-21.5.34-with-output-to-string.patch b/xemacs-21.5.34-with-output-to-string.patch deleted file mode 100644 index 9d39345..0000000 --- a/xemacs-21.5.34-with-output-to-string.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- lisp/subr.el.orig 2017-01-14 14:43:49.000000000 -0700 -+++ lisp/subr.el 2017-01-14 16:35:55.082156030 -0700 -@@ -624,9 +624,14 @@ - - (defmacro with-output-to-string (&rest body) - "Execute BODY, return the text it sent to `standard-output', as a string." -- `(get-output-stream-string -- (let ((standard-output (make-string-output-stream))) -- (prog1 standard-output ,@body)))) -+ `(let ((standard-output -+ (get-buffer-create (generate-new-buffer-name " *string-output*")))) -+ (let ((standard-output standard-output)) -+ ,@body) -+ (with-current-buffer standard-output -+ (prog1 -+ (buffer-string) -+ (kill-buffer nil))))) - - (defmacro with-local-quit (&rest body) - "Execute BODY with `inhibit-quit' temporarily bound to nil." diff --git a/xemacs.spec b/xemacs.spec index 6529e38..0b6d734 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20170114hgd0e8ec0fe015 +%global snap 20170124hgf412e9f093d4 Name: xemacs Version: 21.5.34 -Release: 19%{?snap:.%{snap}}%{?dist} +Release: 20%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -61,8 +61,6 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch -# Revert recent buggy change to with-output-to-string -Patch7: %{name}-21.5.34-with-output-to-string.patch BuildRequires: gcc BuildRequires: texinfo @@ -245,7 +243,6 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch4 %patch5 %patch6 -%patch7 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -666,6 +663,10 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Jan 24 2017 Jerry James - 21.5.34-20.20170124hgf412e9f093d4 +- Update to latest mercurial snapshot to really fix bz 1408201 +- Drop upstreamed -with-output-to-string patch + * Sat Jan 14 2017 Jerry James - 21.5.34-19.20170114hg29e551281d78 - Update to latest mercurial snapshot (bz 1408201) - Use glibc malloc on all platforms From 6ddabfd1a29256a2e41b28fbb7ba023728af0d36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:44:45 +0000 Subject: [PATCH 09/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 0b6d734..b8b904d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 20%{?snap:.%{snap}}%{?dist} +Release: 21%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -663,6 +663,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 21.5.34-21.20170124hgf412e9f093d4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jan 24 2017 Jerry James - 21.5.34-20.20170124hgf412e9f093d4 - Update to latest mercurial snapshot to really fix bz 1408201 - Drop upstreamed -with-output-to-string patch From 06b7de7139616d81f8e93ffbb291d0e79f9e0575 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 22 Feb 2017 08:51:36 -0700 Subject: [PATCH 10/41] Rebuild for NSS 3.29.1. --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index b8b904d..faa6374 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 21%{?snap:.%{snap}}%{?dist} +Release: 22%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -663,6 +663,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Feb 22 2017 Jerry James - 21.5.34-22.20170124hgf412e9f093d4 +- Rebuild for NSS 3.29.1 + * Sat Feb 11 2017 Fedora Release Engineering - 21.5.34-21.20170124hgf412e9f093d4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From f0339dbaf00c0e5d1ba26c52cc7f8384b4206523 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:59:16 +0000 Subject: [PATCH 11/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index faa6374..e01c644 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 22%{?snap:.%{snap}}%{?dist} +Release: 23%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -663,6 +663,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 21.5.34-23.20170124hgf412e9f093d4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Feb 22 2017 Jerry James - 21.5.34-22.20170124hgf412e9f093d4 - Rebuild for NSS 3.29.1 From e5271126d234ce77c0982d4a00ee39f150bab471 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:34:03 +0000 Subject: [PATCH 12/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index e01c644..a2b03a6 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 23%{?snap:.%{snap}}%{?dist} +Release: 24%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -663,6 +663,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 21.5.34-24.20170124hgf412e9f093d4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 21.5.34-23.20170124hgf412e9f093d4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 07647a254b6b04c14df87cd5a9aaf9644fcfe96a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 5 Aug 2017 13:29:30 -0600 Subject: [PATCH 13/41] Update to latest mercurial snapshot for miscellaneous bug fixes. --- .gitignore | 2 +- sources | 2 +- xemacs-21.5.25-mk-nochk-features.patch | 6 +++--- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 10 +++++----- xemacs-21.5.28-courier-default.patch | 6 +++--- xemacs.spec | 7 +++++-- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index df85b2f..87b1f5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/xemacs-20160507hgd5b51c618ef8.tar.xz /xemacs-20160603hga561e02bb626.tar.xz /xemacs-20161013hg39f002ba1b8c.tar.xz /xemacs-20170114hgd0e8ec0fe015.tar.xz /xemacs-20170124hgf412e9f093d4.tar.xz +/xemacs-20170628hg97140cfdeca7.tar.xz diff --git a/sources b/sources index cec5cc8..86d483b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20170124hgf412e9f093d4.tar.xz) = 9ff78b9c830fd7deee95075098f80be2aacbec6ba690f3104c82be12648e98af4af8ca90694d8f6c0551ee96e9be44161e4ad08fc61d8959483cca6b4656ec22 +SHA512 (xemacs-20170628hg97140cfdeca7.tar.xz) = 73a70c084611af0ac33fdb36cfa27a327ca22d2c69721be37b7ad5236bab54e9ece5dd93343ac7ddac696624fe0c35e39d36ad50b0d56d09efae90e1364c1196 diff --git a/xemacs-21.5.25-mk-nochk-features.patch b/xemacs-21.5.25-mk-nochk-features.patch index 2a0ce92..79a5a1d 100644 --- a/xemacs-21.5.25-mk-nochk-features.patch +++ b/xemacs-21.5.25-mk-nochk-features.patch @@ -1,6 +1,6 @@ ---- ./Makefile.in.in.orig 2012-08-02 12:38:27.000000000 -0600 -+++ ./Makefile.in.in 2012-08-06 20:27:16.084145753 -0600 -@@ -394,7 +394,7 @@ etc/PROBLEMS: $(srcdir)/PROBLEMS +--- Makefile.in.in.orig 2017-04-18 09:36:15.000000000 -0600 ++++ Makefile.in.in 2017-04-18 09:38:44.769709731 -0600 +@@ -402,7 +402,7 @@ etc/PROBLEMS: $(srcdir)/PROBLEMS install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index d553474..b22a228 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -1,5 +1,5 @@ ---- ./aclocal.m4.orig 2012-08-02 12:38:27.000000000 -0600 -+++ ./aclocal.m4 2012-08-06 20:28:23.842705270 -0600 +--- aclocal.m4.orig 2017-04-18 09:36:15.000000000 -0600 ++++ aclocal.m4 2017-04-18 09:39:55.004373324 -0600 @@ -533,7 +533,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; @@ -12,9 +12,9 @@ ;; esac fi ---- ./configure.orig 2012-08-02 12:39:01.000000000 -0600 -+++ ./configure 2012-08-06 20:28:23.841705350 -0600 -@@ -15045,7 +15045,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib +--- configure.orig 2017-04-18 09:36:15.000000000 -0600 ++++ configure 2017-04-18 09:39:55.010373295 -0600 +@@ -15071,7 +15071,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; *) diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch index 4e9cff4..57c3dbb 100644 --- a/xemacs-21.5.28-courier-default.patch +++ b/xemacs-21.5.28-courier-default.patch @@ -1,6 +1,6 @@ ---- ./src/faces.c.orig 2012-08-02 12:38:29.000000000 -0600 -+++ ./src/faces.c 2012-08-06 20:29:33.659097709 -0600 -@@ -2484,7 +2484,7 @@ complex_vars_of_faces (void) +--- src/faces.c.orig 2017-04-18 09:36:15.000000000 -0600 ++++ src/faces.c 2017-04-18 09:40:13.685283847 -0600 +@@ -2503,7 +2503,7 @@ complex_vars_of_faces (void) Fcons (Fcons (list1 (device_symbol), diff --git a/xemacs.spec b/xemacs.spec index a2b03a6..8270ba7 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20170124hgf412e9f093d4 +%global snap 20170628hg97140cfdeca7 Name: xemacs Version: 21.5.34 -Release: 24%{?snap:.%{snap}}%{?dist} +Release: 25%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -663,6 +663,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Aug 5 2017 Jerry James - 21.5.34-25.20170628hg97140cfdeca7 +- Update to latest mercurial snapshot for miscellaneous bug fixes + * Thu Aug 03 2017 Fedora Release Engineering - 21.5.34-24.20170124hgf412e9f093d4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From a451a963f606040c617feac46290f1bce6eda40a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 28 Nov 2017 20:29:51 -0700 Subject: [PATCH 14/41] Update to latest mercurial snapshot for miscellaneous bug fixes. Drop Canna support (bz 1517235). --- .gitignore | 2 +- sources | 2 +- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 10 ++++----- xemacs-21.5.34-format-overflow.patch | 11 ++++++++++ xemacs.spec | 25 +++++++++++----------- 5 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 xemacs-21.5.34-format-overflow.patch diff --git a/.gitignore b/.gitignore index 87b1f5c..abea978 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/xemacs-20160603hga561e02bb626.tar.xz /xemacs-20161013hg39f002ba1b8c.tar.xz /xemacs-20170114hgd0e8ec0fe015.tar.xz /xemacs-20170124hgf412e9f093d4.tar.xz /xemacs-20170628hg97140cfdeca7.tar.xz +/xemacs-20171125hg700dd03e6a31.tar.xz diff --git a/sources b/sources index 86d483b..2096486 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20170628hg97140cfdeca7.tar.xz) = 73a70c084611af0ac33fdb36cfa27a327ca22d2c69721be37b7ad5236bab54e9ece5dd93343ac7ddac696624fe0c35e39d36ad50b0d56d09efae90e1364c1196 +SHA512 (xemacs-20171125hg700dd03e6a31.tar.xz) = 4e5c73c4ad9027962fc6830eeca1bd5ad1ee111387a271a3fe5fbada762523397ffbacebee88b9d1dff281f9c18c3758d1378b695b0dc4832d7f71562b915a8f diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index b22a228..5b498ab 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -1,5 +1,5 @@ ---- aclocal.m4.orig 2017-04-18 09:36:15.000000000 -0600 -+++ aclocal.m4 2017-04-18 09:39:55.004373324 -0600 +--- aclocal.m4.orig 2017-11-26 14:00:22.000000000 -0700 ++++ aclocal.m4 2017-11-25 14:04:27.613768853 -0700 @@ -533,7 +533,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; @@ -12,9 +12,9 @@ ;; esac fi ---- configure.orig 2017-04-18 09:36:15.000000000 -0600 -+++ configure 2017-04-18 09:39:55.010373295 -0600 -@@ -15071,7 +15071,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib +--- configure.orig 2017-11-26 14:00:22.000000000 -0700 ++++ configure 2017-11-25 14:04:27.618768833 -0700 +@@ -15079,7 +15079,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; *) diff --git a/xemacs-21.5.34-format-overflow.patch b/xemacs-21.5.34-format-overflow.patch new file mode 100644 index 0000000..55e8fbe --- /dev/null +++ b/xemacs-21.5.34-format-overflow.patch @@ -0,0 +1,11 @@ +--- src/process.c.orig 2017-11-25 14:00:22.000000000 -0700 ++++ src/process.c 2017-11-25 14:25:02.487156560 -0700 +@@ -522,7 +522,7 @@ make_process_internal (Lisp_Object name) + name1 = name; + for (i = 1; ; i++) + { +- Ascbyte suffix[10]; ++ Ascbyte suffix[12]; + Lisp_Object tem = Fget_process (name1); + if (NILP (tem)) + break; diff --git a/xemacs.spec b/xemacs.spec index 8270ba7..f8ac591 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20170628hg97140cfdeca7 +%global snap 20171125hg700dd03e6a31 Name: xemacs Version: 21.5.34 -Release: 25%{?snap:.%{snap}}%{?dist} +Release: 26%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -61,6 +61,8 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch +# Patch to be submitted upstream: fix overflow of a buffer via sprintf +Patch7: %{name}-21.5.34-format-overflow.patch BuildRequires: gcc BuildRequires: texinfo @@ -76,7 +78,6 @@ BuildRequires: libtiff-devel BuildRequires: giflib-devel BuildRequires: desktop-file-utils %if %{with mule} -BuildRequires: Canna-devel %if %{with wnn} BuildRequires: FreeWnn-devel %endif # wnn @@ -160,7 +161,7 @@ This package contains XEmacs built without X Windows support. %package xft Summary: Different version of Emacs built with Xft/fontconfig support Requires: %{name}-common = %{version}-%{release} -Requires: xemacs-packages-base >= 20060510 +Requires: xemacs-packages-base Requires(post): chkconfig Requires(post): coreutils Requires(postun): chkconfig @@ -234,7 +235,7 @@ add functionality to XEmacs. %prep %setup -q -n %{name}-%{?snap:beta}%{!?snap:%{version}} -find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f +find . -type f -name "*.elc" -o -name "*.info*" -exec rm -f {} \+ sed -i -e /tetris/d lisp/menubar-items.el %patch0 %patch1 @@ -243,6 +244,7 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch4 %patch5 %patch6 +%patch7 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -286,7 +288,8 @@ common_options=" --with-system-packages=%{_datadir}/xemacs --without-msw %if %{with mule} - --with-mule + --with-unicode-internal + --without-canna %endif --with-clash-detection --with-database=berkdb @@ -313,7 +316,6 @@ common_options=" --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox \ --with-sound=none \ --with-xim=no \ - --without-canna \ --without-wnn \ --without-x make EMACSDEBUGPATHS=yes # toplevel parallel make fails @@ -582,11 +584,6 @@ fi %ghost %{_bindir}/xemacs %{_bindir}/xemacs-%{xver} %{_libdir}/xemacs-%{xver}/doc/ -%if %{with modules} -%if %{with mule} -%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/canna_api.ell -%endif -%endif %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/gnuclient.desktop @@ -663,6 +660,10 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Nov 28 2017 Jerry James - 21.5.34-26.20171125hg700dd03e6a31 +- Update to latest mercurial snapshot for miscellaneous bug fixes +- Drop Canna support (bz 1517235) + * Sat Aug 5 2017 Jerry James - 21.5.34-25.20170628hg97140cfdeca7 - Update to latest mercurial snapshot for miscellaneous bug fixes From efb46bac1e99d4b7666bea2bec82d5e7b50707bd Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 28 Dec 2017 17:33:17 -0700 Subject: [PATCH 15/41] Update to latest mercurial snapshot for Unicode support. Also: - Add -gcpro patch to fix FTBFS. - Add -overflow patch to fix possible bad code generation. - Add -data-start patch to fix FTBFS on ppc64/ppc64le. --- .gitignore | 1 + sources | 2 +- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 10 ++--- xemacs-21.5.28-courier-default.patch | 12 ++--- xemacs-21.5.34-data-start.patch | 12 +++++ xemacs-21.5.34-format-overflow.patch | 2 +- xemacs-21.5.34-gcpro.patch | 52 ++++++++++++++++++++++ xemacs-21.5.34-overflow.patch | 20 +++++++++ xemacs.spec | 25 ++++++++--- 9 files changed, 118 insertions(+), 18 deletions(-) create mode 100644 xemacs-21.5.34-data-start.patch create mode 100644 xemacs-21.5.34-gcpro.patch create mode 100644 xemacs-21.5.34-overflow.patch diff --git a/.gitignore b/.gitignore index abea978..5aaa13e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /xemacs-20170124hgf412e9f093d4.tar.xz /xemacs-20170628hg97140cfdeca7.tar.xz /xemacs-20171125hg700dd03e6a31.tar.xz +/xemacs-20171227hg27f66ce6ab71.tar.xz diff --git a/sources b/sources index 2096486..f9e904c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20171125hg700dd03e6a31.tar.xz) = 4e5c73c4ad9027962fc6830eeca1bd5ad1ee111387a271a3fe5fbada762523397ffbacebee88b9d1dff281f9c18c3758d1378b695b0dc4832d7f71562b915a8f +SHA512 (xemacs-20171227hg27f66ce6ab71.tar.xz) = 16c66f998f7db4e2ff335d4562c8bba6a9bfea77e7d7d191a9ec21131c35390e7ee2dfcc6894e9ccd2b05226d0629402b2a45e6cd516a4ec81bd88b1a37e5580 diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index 5b498ab..9d0e902 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -1,5 +1,5 @@ ---- aclocal.m4.orig 2017-11-26 14:00:22.000000000 -0700 -+++ aclocal.m4 2017-11-25 14:04:27.613768853 -0700 +--- aclocal.m4.orig 2017-12-27 09:57:56.000000000 -0700 ++++ aclocal.m4 2017-12-27 09:59:53.773320170 -0700 @@ -533,7 +533,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; @@ -12,9 +12,9 @@ ;; esac fi ---- configure.orig 2017-11-26 14:00:22.000000000 -0700 -+++ configure 2017-11-25 14:04:27.618768833 -0700 -@@ -15079,7 +15079,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib +--- configure.orig 2017-12-27 09:57:56.000000000 -0700 ++++ configure 2017-12-27 09:59:53.778320152 -0700 +@@ -15058,7 +15058,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; *) diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch index 57c3dbb..696fb5d 100644 --- a/xemacs-21.5.28-courier-default.patch +++ b/xemacs-21.5.28-courier-default.patch @@ -1,11 +1,11 @@ ---- src/faces.c.orig 2017-04-18 09:36:15.000000000 -0600 -+++ src/faces.c 2017-04-18 09:40:13.685283847 -0600 -@@ -2503,7 +2503,7 @@ complex_vars_of_faces (void) +--- src/faces.c.orig 2017-12-27 10:00:10.468259293 -0700 ++++ src/faces.c 2017-12-27 10:01:24.744988448 -0700 +@@ -2524,7 +2524,7 @@ complex_vars_of_faces (void) Fcons (Fcons (list1 (device_symbol), -- build_ascstring ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")), -+ build_ascstring ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")), +- build_ascstring ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-m-*-*-*")), ++ build_ascstring ("-*-courier-medium-r-*-*-*-120-*-*-m-*-*-*")), inst_list); - + #endif /* HAVE_GTK */ #endif /* !HAVE_XFT */ diff --git a/xemacs-21.5.34-data-start.patch b/xemacs-21.5.34-data-start.patch new file mode 100644 index 0000000..a41dac2 --- /dev/null +++ b/xemacs-21.5.34-data-start.patch @@ -0,0 +1,12 @@ +--- src/sysdep.c.orig 2017-12-28 13:34:54.000000000 -0700 ++++ src/sysdep.c 2017-12-28 17:06:55.763497550 -0700 +@@ -1969,7 +1969,8 @@ start_of_data (void) + if (!initialized) + return static_heap_base; + #endif +- return ((char *) &environ); ++ extern char _end; ++ return &_end; + #else + extern int data_start; + return ((char *) &data_start); diff --git a/xemacs-21.5.34-format-overflow.patch b/xemacs-21.5.34-format-overflow.patch index 55e8fbe..116a453 100644 --- a/xemacs-21.5.34-format-overflow.patch +++ b/xemacs-21.5.34-format-overflow.patch @@ -5,7 +5,7 @@ for (i = 1; ; i++) { - Ascbyte suffix[10]; -+ Ascbyte suffix[12]; ++ Ascbyte suffix[16]; Lisp_Object tem = Fget_process (name1); if (NILP (tem)) break; diff --git a/xemacs-21.5.34-gcpro.patch b/xemacs-21.5.34-gcpro.patch new file mode 100644 index 0000000..24d3e3c --- /dev/null +++ b/xemacs-21.5.34-gcpro.patch @@ -0,0 +1,52 @@ +--- src/print.c.orig 2017-12-27 09:57:56.000000000 -0700 ++++ src/print.c 2017-12-27 11:27:07.382631140 -0700 +@@ -464,7 +464,8 @@ output_string (Lisp_Object function, con + if (print_unbuffered) + Lstream_flush (XLSTREAM (function)); + +- RETURN_UNGCPRO (result); ++ UNGCPRO; ++ return result; + } + else if (BUFFERP (function)) + { +@@ -476,7 +477,8 @@ output_string (Lisp_Object function, con + + buffer_insert_string (XBUFFER (function), nonreloc, reloc, offset, len); + +- RETURN_UNGCPRO (len); ++ UNGCPRO; ++ return len; + } + else if (MARKERP (function)) + { +@@ -490,7 +492,8 @@ output_string (Lisp_Object function, con + offset, len, -1, 0); + set_byte_marker_position (function, + byte_marker_position (function) + len); +- RETURN_UNGCPRO (len); /* We will have errored on failure. */ ++ UNGCPRO; ++ return len; /* We will have errored on failure. */ + } + else if (FRAMEP (function)) + { +@@ -507,7 +510,8 @@ output_string (Lisp_Object function, con + clear_echo_area_from_print (f, Qnil, 1); + echo_area_append (f, nonreloc, reloc, offset, len, Vprint_message_label); + +- RETURN_UNGCPRO (len); ++ UNGCPRO; ++ return len; + } + else if (EQ (function, Qt) || EQ (function, Qnil)) + { +@@ -557,7 +561,8 @@ output_string (Lisp_Object function, con + offset += itext_ichar_len (newnonreloc + offset); + } + +- RETURN_UNGCPRO (len); ++ UNGCPRO; ++ return len; + } + } + diff --git a/xemacs-21.5.34-overflow.patch b/xemacs-21.5.34-overflow.patch new file mode 100644 index 0000000..94f6663 --- /dev/null +++ b/xemacs-21.5.34-overflow.patch @@ -0,0 +1,20 @@ +--- src/alloca.c.orig 2017-12-28 13:34:54.000000000 -0700 ++++ src/alloca.c 2017-12-28 13:39:44.078644647 -0700 +@@ -177,15 +177,14 @@ xemacs_c_alloca (size_t size) + + { + #ifdef emacs +- size_t total_size = sizeof (header) + size; + register pointer new_; + +- if (total_size < size || ((Bytecount) (total_size) < 0)) ++ if (SIZE_MAX - size < sizeof(header)) + { + memory_full (); + } + +- new_ = xmalloc ((Bytecount) total_size); ++ new_ = xmalloc ((Bytecount) (size + sizeof(header))); + #else + register pointer new_ = malloc (sizeof (header) + size); + #endif diff --git a/xemacs.spec b/xemacs.spec index f8ac591..40f8f5e 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,7 +19,7 @@ %bcond_without modules %endif -%global snap 20171125hg700dd03e6a31 +%global snap 20171227hg27f66ce6ab71 Name: xemacs Version: 21.5.34 @@ -61,8 +61,14 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch -# Patch to be submitted upstream: fix overflow of a buffer via sprintf +# Submitted upstream 28 Dec 2017: fix overflow of a buffer via sprintf Patch7: %{name}-21.5.34-format-overflow.patch +# Submitted upstream 28 Dec 2017: fix some ungcpro expressions +Patch8: %{name}-21.5.34-gcpro.patch +# Submitted upstream 28 Dec 2017: do not rely on integer overflow wrapping +Patch9: %{name}-21.5.34-overflow.patch +# Submitted upstream 28 Dec 2017: better computation of data start address +Patch10: %{name}-21.5.34-data-start.patch BuildRequires: gcc BuildRequires: texinfo @@ -89,8 +95,8 @@ BuildRequires: alsa-lib-devel BuildRequires: libdb-devel BuildRequires: gmp-devel %if %{with gtk} -BuildRequires: gtk+-devel -BuildRequires: libglade-devel +BuildRequires: gtk2-devel +BuildRequires: libglade2-devel %else # gtk BuildRequires: xorg-x11-xbitmaps %if %{with xaw3d} @@ -245,6 +251,9 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch5 %patch6 %patch7 +%patch8 +%patch9 +%patch10 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -267,7 +276,7 @@ EOF %build %if %{with gtk} -CFLAGS="$CFLAGS $(pkg-config libglade --cflags) -fno-strict-aliasing" +CFLAGS="$CFLAGS $(pkg-config libglade-2.0 --cflags) -fno-strict-aliasing" %else CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %endif @@ -660,6 +669,12 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Thu Dec 28 2017 Jerry James - 21.5.34-26.20171227hg27f66ce6ab71 +- Update to latest mercurial snapshot for Unicode support +- Add -gcpro patch to fix FTBFS +- Add -overflow patch to fix possible bad code generation +- Add -data-start patch to fix FTBFS on ppc64/ppc64le + * Tue Nov 28 2017 Jerry James - 21.5.34-26.20171125hg700dd03e6a31 - Update to latest mercurial snapshot for miscellaneous bug fixes - Drop Canna support (bz 1517235) From 932223be1f1b822a0ccdf73400620b3d9169f68d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 28 Dec 2017 22:29:32 -0700 Subject: [PATCH 16/41] Add -endian patch to fix FTBFS on ppc64/s390x. --- xemacs-21.5.34-endian.patch | 11 +++++++++++ xemacs.spec | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 xemacs-21.5.34-endian.patch diff --git a/xemacs-21.5.34-endian.patch b/xemacs-21.5.34-endian.patch new file mode 100644 index 0000000..729454a --- /dev/null +++ b/xemacs-21.5.34-endian.patch @@ -0,0 +1,11 @@ +--- src/config.h.in.orig 2017-12-28 13:34:54.000000000 -0700 ++++ src/config.h.in 2017-12-28 22:15:05.193233587 -0700 +@@ -312,7 +312,7 @@ things are arranged in config.h.in. In + #undef STDC_HEADERS + + #undef TIME_WITH_SYS_TIME +-/* #undef WORDS_BIGENDIAN */ ++#undef WORDS_BIGENDIAN + + #undef HAVE_LONG_FILE_NAMES + diff --git a/xemacs.spec b/xemacs.spec index 40f8f5e..077c2e1 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -69,6 +69,8 @@ Patch8: %{name}-21.5.34-gcpro.patch Patch9: %{name}-21.5.34-overflow.patch # Submitted upstream 28 Dec 2017: better computation of data start address Patch10: %{name}-21.5.34-data-start.patch +# Submitted upstream 28 Dec 2017: fix building on big endian architectures +Patch11: %{name}-21.5.34-endian.patch BuildRequires: gcc BuildRequires: texinfo @@ -254,6 +256,7 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch8 %patch9 %patch10 +%patch11 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -674,6 +677,7 @@ fi - Add -gcpro patch to fix FTBFS - Add -overflow patch to fix possible bad code generation - Add -data-start patch to fix FTBFS on ppc64/ppc64le +- Add -endian patch to fix FTBFS on ppc64/s390x * Tue Nov 28 2017 Jerry James - 21.5.34-26.20171125hg700dd03e6a31 - Update to latest mercurial snapshot for miscellaneous bug fixes From de837c3477505f1def94daee9169e6def6f847ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:28:39 +0000 Subject: [PATCH 17/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 077c2e1..714f599 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 26%{?snap:.%{snap}}%{?dist} +Release: 27%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -672,6 +672,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 21.5.34-27.20171227hg27f66ce6ab71 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Dec 28 2017 Jerry James - 21.5.34-26.20171227hg27f66ce6ab71 - Update to latest mercurial snapshot for Unicode support - Add -gcpro patch to fix FTBFS From 21dca458989e4bd5a634d05118dabd1db9b31a48 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 11 Feb 2018 22:29:52 +0100 Subject: [PATCH 18/41] Rebuild (giflib) --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 714f599..1362688 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 27%{?snap:.%{snap}}%{?dist} +Release: 28%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -672,6 +672,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sun Feb 11 2018 Sandro Mani - 21.5.34-28.20171227hg27f66ce6ab71 +- Rebuild (giflib) + * Fri Feb 09 2018 Fedora Release Engineering - 21.5.34-27.20171227hg27f66ce6ab71 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 339fe2fabe339c7d75829749ba4e43ea4ce9eb80 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 4 Mar 2018 15:10:08 -0700 Subject: [PATCH 19/41] Update to latest mercurial snapshot for miscellaneous bug fixes. Also: - Remove obsolete scriptlets. - Drop upstreamed -endian, -gcpro, and -format-overflow patches. - Install a scalable icon. --- .gitignore | 2 +- sources | 2 +- xemacs-21.5.34-endian.patch | 11 ------ xemacs-21.5.34-format-overflow.patch | 11 ------ xemacs-21.5.34-gcpro.patch | 52 --------------------------- xemacs.png | Bin 1363 -> 0 bytes xemacs.spec | 49 +++++++++---------------- 7 files changed, 18 insertions(+), 109 deletions(-) delete mode 100644 xemacs-21.5.34-endian.patch delete mode 100644 xemacs-21.5.34-format-overflow.patch delete mode 100644 xemacs-21.5.34-gcpro.patch delete mode 100644 xemacs.png diff --git a/.gitignore b/.gitignore index 5aaa13e..ad573eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -/xemacs-20161013hg39f002ba1b8c.tar.xz /xemacs-20170114hgd0e8ec0fe015.tar.xz /xemacs-20170124hgf412e9f093d4.tar.xz /xemacs-20170628hg97140cfdeca7.tar.xz /xemacs-20171125hg700dd03e6a31.tar.xz /xemacs-20171227hg27f66ce6ab71.tar.xz +/xemacs-20171230hg92757c2b8239.tar.xz diff --git a/sources b/sources index f9e904c..0482249 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20171227hg27f66ce6ab71.tar.xz) = 16c66f998f7db4e2ff335d4562c8bba6a9bfea77e7d7d191a9ec21131c35390e7ee2dfcc6894e9ccd2b05226d0629402b2a45e6cd516a4ec81bd88b1a37e5580 +SHA512 (xemacs-20171230hg92757c2b8239.tar.xz) = 280f83e8b9ab184801351ccf8987034e81dabdef439ffabf87477e47e2685a8c3b277ba6d8d781e9e2dd8657a7f25b5485e1efc3ecaf9fbc69eb48f89be6dd5e diff --git a/xemacs-21.5.34-endian.patch b/xemacs-21.5.34-endian.patch deleted file mode 100644 index 729454a..0000000 --- a/xemacs-21.5.34-endian.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/config.h.in.orig 2017-12-28 13:34:54.000000000 -0700 -+++ src/config.h.in 2017-12-28 22:15:05.193233587 -0700 -@@ -312,7 +312,7 @@ things are arranged in config.h.in. In - #undef STDC_HEADERS - - #undef TIME_WITH_SYS_TIME --/* #undef WORDS_BIGENDIAN */ -+#undef WORDS_BIGENDIAN - - #undef HAVE_LONG_FILE_NAMES - diff --git a/xemacs-21.5.34-format-overflow.patch b/xemacs-21.5.34-format-overflow.patch deleted file mode 100644 index 116a453..0000000 --- a/xemacs-21.5.34-format-overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/process.c.orig 2017-11-25 14:00:22.000000000 -0700 -+++ src/process.c 2017-11-25 14:25:02.487156560 -0700 -@@ -522,7 +522,7 @@ make_process_internal (Lisp_Object name) - name1 = name; - for (i = 1; ; i++) - { -- Ascbyte suffix[10]; -+ Ascbyte suffix[16]; - Lisp_Object tem = Fget_process (name1); - if (NILP (tem)) - break; diff --git a/xemacs-21.5.34-gcpro.patch b/xemacs-21.5.34-gcpro.patch deleted file mode 100644 index 24d3e3c..0000000 --- a/xemacs-21.5.34-gcpro.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- src/print.c.orig 2017-12-27 09:57:56.000000000 -0700 -+++ src/print.c 2017-12-27 11:27:07.382631140 -0700 -@@ -464,7 +464,8 @@ output_string (Lisp_Object function, con - if (print_unbuffered) - Lstream_flush (XLSTREAM (function)); - -- RETURN_UNGCPRO (result); -+ UNGCPRO; -+ return result; - } - else if (BUFFERP (function)) - { -@@ -476,7 +477,8 @@ output_string (Lisp_Object function, con - - buffer_insert_string (XBUFFER (function), nonreloc, reloc, offset, len); - -- RETURN_UNGCPRO (len); -+ UNGCPRO; -+ return len; - } - else if (MARKERP (function)) - { -@@ -490,7 +492,8 @@ output_string (Lisp_Object function, con - offset, len, -1, 0); - set_byte_marker_position (function, - byte_marker_position (function) + len); -- RETURN_UNGCPRO (len); /* We will have errored on failure. */ -+ UNGCPRO; -+ return len; /* We will have errored on failure. */ - } - else if (FRAMEP (function)) - { -@@ -507,7 +510,8 @@ output_string (Lisp_Object function, con - clear_echo_area_from_print (f, Qnil, 1); - echo_area_append (f, nonreloc, reloc, offset, len, Vprint_message_label); - -- RETURN_UNGCPRO (len); -+ UNGCPRO; -+ return len; - } - else if (EQ (function, Qt) || EQ (function, Qnil)) - { -@@ -557,7 +561,8 @@ output_string (Lisp_Object function, con - offset += itext_ichar_len (newnonreloc + offset); - } - -- RETURN_UNGCPRO (len); -+ UNGCPRO; -+ return len; - } - } - diff --git a/xemacs.png b/xemacs.png deleted file mode 100644 index 21be91beefb211546897aea4de77cae4d09c91f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1363 zcmchWv1`;|7{;I2JIYl%eAb56LF#u!7Y9p(Qo3mFJ8VF&P1+#cgd;DG>J{Q7wnL#? zk7mi{;&>t`bdcNp3)I2IP5cYoDn#Bdxg>Y>q=NXsm*w}p&-=bll7o%b-RY^zQvjx& zHRS=g$)_>_;MI+9?*LrcxVP2Bb~Q9&A=Wb%j9`)J!7RBq9pp#?rvb z)F2QkC@R3Wi2|7dc{OitXy7sMeP1p*YAKz{U~lrSn?w)7r(qa|PqJ~@BajSSA$||| zLVY=}U@uQs5Cvl^P6KYmQ$@2NS-LrxKT?iWyxJ7ZJ<9J7 z_DI1#?G~hLMbuV}71hwR48~TB?V&ZJjwHL4t%me>AW~NL!KHf)=?qpQe{($e2LYXU ap#uB^eR}b7@5AA(w`}D!Tk5s_aPJpqKhi7! diff --git a/xemacs.spec b/xemacs.spec index 1362688..aab4774 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20171227hg27f66ce6ab71 +%global snap 20171230hg92757c2b8239 Name: xemacs Version: 21.5.34 -Release: 28%{?snap:.%{snap}}%{?dist} +Release: 29%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -35,13 +35,12 @@ Source0: %{name}-%{snap}.tar.xz %else Source0: http://ftp.xemacs.org/xemacs-%{majver}/xemacs-%{version}.tar.gz %endif -Source1: %{name}.png +Source1: %{name}.appdata.xml Source2: xemacs.desktop Source3: dotxemacs-init.el Source4: default.el Source5: xemacs-sitestart.el Source6: gnuclient.desktop -Source7: %{name}.appdata.xml # Fedora-specific. Don't run the check-features Makefile target. It checks # that necessary packages are installed, but they aren't installed while @@ -61,16 +60,10 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch -# Submitted upstream 28 Dec 2017: fix overflow of a buffer via sprintf -Patch7: %{name}-21.5.34-format-overflow.patch -# Submitted upstream 28 Dec 2017: fix some ungcpro expressions -Patch8: %{name}-21.5.34-gcpro.patch # Submitted upstream 28 Dec 2017: do not rely on integer overflow wrapping -Patch9: %{name}-21.5.34-overflow.patch +Patch7: %{name}-21.5.34-overflow.patch # Submitted upstream 28 Dec 2017: better computation of data start address -Patch10: %{name}-21.5.34-data-start.patch -# Submitted upstream 28 Dec 2017: fix building on big endian architectures -Patch11: %{name}-21.5.34-endian.patch +Patch8: %{name}-21.5.34-data-start.patch BuildRequires: gcc BuildRequires: texinfo @@ -97,8 +90,7 @@ BuildRequires: alsa-lib-devel BuildRequires: libdb-devel BuildRequires: gmp-devel %if %{with gtk} -BuildRequires: gtk2-devel -BuildRequires: libglade2-devel +BuildRequires: gtk3-devel %else # gtk BuildRequires: xorg-x11-xbitmaps %if %{with xaw3d} @@ -254,9 +246,6 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch6 %patch7 %patch8 -%patch9 -%patch10 -%patch11 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -278,11 +267,7 @@ EOF %build -%if %{with gtk} -CFLAGS="$CFLAGS $(pkg-config libglade-2.0 --cflags) -fno-strict-aliasing" -%else CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%endif export CFLAGS export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule export LDFLAGS="$RPM_LD_FLAGS -Wl,--as-needed" @@ -467,7 +452,7 @@ desktop-file-install --mode=644 --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ # AppData file mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -install -pm 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/appdata +install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata # site-start.el install -dm 755 \ @@ -482,8 +467,8 @@ install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el # icon -install -Dpm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png +install -Dpm 644 etc/xemacs-icon.svg \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/xemacs.png # macro file install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.%{name} @@ -536,18 +521,10 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %post %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ %{_bindir}/xemacs-%{xver} 80 -touch --no-create %{_datadir}/icons/hicolor &>/dev/null %postun [ -e %{_bindir}/xemacs-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %post nox %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ @@ -599,7 +576,7 @@ fi %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/gnuclient.desktop -%{_datadir}/icons/hicolor/48x48/apps/xemacs.png +%{_datadir}/icons/hicolor/scalable/apps/xemacs.png %{_mandir}/man1/gnuclient.1* %{_mandir}/man1/gnudoit.1* @@ -672,6 +649,12 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Mar 3 2018 Jerry James - 21.5.34-29.20171230hg92757c2b8239 +- Update to latest mercurial snapshot for miscellaneous bug fixes +- Remove obsolete scriptlets +- Drop upstreamed -endian, -gcpro, and -format-overflow patches +- Install a scalable icon + * Sun Feb 11 2018 Sandro Mani - 21.5.34-28.20171227hg27f66ce6ab71 - Rebuild (giflib) From 0e44989678eda4c8db517bf0f2795488c48a23a0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 7 Jul 2018 16:26:44 -0600 Subject: [PATCH 20/41] Remove info-related scriptlets. --- xemacs.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index aab4774..e87fa1d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -550,20 +550,6 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc [ $1 -ne 0 ] || \ %{_sbindir}/alternatives --remove etags %{_bindir}/etags.xemacs || : -%post info -for file in xemacs internals lispref new-users-guide ; do - /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir -done -: - -%preun info -if [ $1 -eq 0 ] ; then - for file in xemacs internals lispref new-users-guide ; do - /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir - done -fi -: - %files %doc Installation From 4317a6357ec19f029d9f2af70a8f503bc0b3bd23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:11:35 +0000 Subject: [PATCH 21/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index e87fa1d..d55b359 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 29%{?snap:.%{snap}}%{?dist} +Release: 30%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -635,6 +635,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 21.5.34-30.20171230hg92757c2b8239 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat Mar 3 2018 Jerry James - 21.5.34-29.20171230hg92757c2b8239 - Update to latest mercurial snapshot for miscellaneous bug fixes - Remove obsolete scriptlets From ec5eeb720040d2154e40ea3ff0dbba296d69491e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 15 Oct 2018 00:55:07 +0100 Subject: [PATCH 22/41] Update alternatives dep --- xemacs.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index d55b359..ad0d253 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 30%{?snap:.%{snap}}%{?dist} +Release: 31%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -106,9 +106,9 @@ Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi Requires: xorg-x11-fonts-misc -Requires(post): chkconfig +Requires(post): /usr/sbin/alternatives Requires(post): coreutils -Requires(postun): chkconfig +Requires(postun): /usr/sbin/alternatives Requires(postun): coreutils Provides: xemacs(bin) = %{version}-%{release} @@ -127,8 +127,8 @@ This package contains XEmacs built for X Windows%{?with_mule: with MULE support} %package common Summary: Byte-compiled lisp files and other common files for XEmacs Requires: %{name}-filesystem = %{version}-%{release} -Requires(post): chkconfig -Requires(preun): chkconfig +Requires(post): /usr/sbin/alternatives +Requires(preun): /usr/sbin/alternatives %description common XEmacs is a highly customizable open source text editor and @@ -144,9 +144,9 @@ Summary: Different version of Emacs built without X Windows support # Note: no xemacs-packages* dependencies here, we need -nox to build the # base package set. Requires: %{name}-common = %{version}-%{release} -Requires(post): chkconfig +Requires(post): /usr/sbin/alternatives Requires(post): coreutils -Requires(postun): chkconfig +Requires(postun): /usr/sbin/alternatives Provides: xemacs(bin) = %{version}-%{release} %description nox @@ -162,9 +162,9 @@ This package contains XEmacs built without X Windows support. Summary: Different version of Emacs built with Xft/fontconfig support Requires: %{name}-common = %{version}-%{release} Requires: xemacs-packages-base -Requires(post): chkconfig +Requires(post): /usr/sbin/alternatives Requires(post): coreutils -Requires(postun): chkconfig +Requires(postun): /usr/sbin/alternatives Provides: xemacs(bin) = %{version}-%{release} %description xft @@ -635,6 +635,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sun Oct 14 2018 Peter Robinson 21.5.34-31.20171230hg92757c2b8239 +- Update alternatives dep + * Sat Jul 14 2018 Fedora Release Engineering - 21.5.34-30.20171230hg92757c2b8239 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 8be405a05fa287a1225f57555596a55b49ce57d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:15:00 +0000 Subject: [PATCH 23/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index ad0d253..64e1488 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 31%{?snap:.%{snap}}%{?dist} +Release: 32%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -635,6 +635,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 21.5.34-32.20171230hg92757c2b8239 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Oct 14 2018 Peter Robinson 21.5.34-31.20171230hg92757c2b8239 - Update alternatives dep From 2fa224b10b7e9d9eea3a772ddcc4002ad226aae2 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 21 Mar 2019 20:14:15 -0600 Subject: [PATCH 24/41] Update to latest mercurial snapshot for miscellaneous bug fixes. Also: - Switch from NSS to OpenSSL - Build with openldap support - Enable test suite --- .gitignore | 7 +------ sources | 2 +- xemacs.spec | 40 ++++++++++++++++++++++++---------------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index ad573eb..7f42168 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/xemacs-20170114hgd0e8ec0fe015.tar.xz -/xemacs-20170124hgf412e9f093d4.tar.xz -/xemacs-20170628hg97140cfdeca7.tar.xz -/xemacs-20171125hg700dd03e6a31.tar.xz -/xemacs-20171227hg27f66ce6ab71.tar.xz -/xemacs-20171230hg92757c2b8239.tar.xz +/xemacs-*.tar.xz diff --git a/sources b/sources index 0482249..55006c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20171230hg92757c2b8239.tar.xz) = 280f83e8b9ab184801351ccf8987034e81dabdef439ffabf87477e47e2685a8c3b277ba6d8d781e9e2dd8657a7f25b5485e1efc3ecaf9fbc69eb48f89be6dd5e +SHA512 (xemacs-20190321hge6bb9f0fcc42.tar.xz) = 27b01cd6d8ea075548339c59490e8615626b9befc67accb6d2f3a37741dfc0d7d91e1414d076009f5b1ce49bbbd1b030b5be089de6af16dc93c1b22a992fc613 diff --git a/xemacs.spec b/xemacs.spec index 64e1488..48357de 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20171230hg92757c2b8239 +%global snap 20190321hge6bb9f0fcc42 Name: xemacs Version: 21.5.34 -Release: 32%{?snap:.%{snap}}%{?dist} +Release: 33%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -69,7 +69,8 @@ BuildRequires: gcc BuildRequires: texinfo BuildRequires: ncurses-devel BuildRequires: gpm-devel -BuildRequires: nss-devel +BuildRequires: openldap-devel +BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: zlib-devel BuildRequires: libjpeg-devel @@ -285,18 +286,18 @@ common_options=" --with-system-packages=%{_datadir}/xemacs --without-msw %if %{with mule} + --with-mule --with-unicode-internal --without-canna %endif --with-clash-detection --with-database=berkdb - --without-ldap + --with-ldap --without-postgresql --with-mail-locking=lockf --with-pop --without-hesiod - --with-tls=nss - --with-system-malloc + --with-tls=openssl --with-pdump %if ! %{with modules} --without-modules @@ -488,19 +489,15 @@ chmod a+x $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}%{_sysconfdir}/xemacs-fe.sh find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/%{xbuild}/gzip-el.sh rm $RPM_BUILD_ROOT{%{_bindir}/gnuattach,%{_mandir}/man1/gnuattach.1} -cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc +pushd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc rm -r InstallGuide tests XKeysymDB *.1 -cd - +popd # separate files -rm -f *.files base-files el-files info-files -echo "%%defattr(-,root,root,-)" > base-files -echo "%%defattr(-,root,root,-)" > el-files -echo "%%defattr(-,root,root,-)" > info-files - +rm -f *.files base-files el-files +touch base-files el-files find $RPM_BUILD_ROOT%{_datadir}/xemacs{-%{xver},/site-packages/lisp/*} \ \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \ - \( -type d -name info -fprint info.files -prune \) -o \ \( -type d -not -name site-start.d -fprintf dir.files "%%%%dir %%p\n" \) -o \ \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \ -fprint base-el-not-bytecomped.files \) \) @@ -513,10 +510,12 @@ sed -i -e 's|^\(.*/site-packages/lisp/.*\)$|%%config(noreplace) \1|' \ # combine the file lists cat base-*.files dir.files >> base-files cat el-*.files >> el-files -cat info.files >> info-files install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc +%check +%make_build check + %post %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ @@ -599,6 +598,7 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %{_libdir}/xemacs/ %dir %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/ %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.elc +%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/eldap.ell %endif %{_rpmconfigdir}/macros.d/macros.%{name} %config(noreplace) %{_sysconfdir}/skel/.xemacs/ @@ -611,7 +611,7 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.el %endif -%files info -f info-files +%files info %license COPYING %{_infodir}/*.info* @@ -635,6 +635,14 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190321hge6bb9f0fcc42 +- Enable test suite + +* Thu Mar 21 2019 Jerry James - 21.5.34-33.20190321hge6bb9f0fcc42 +- Update to latest mercurial snapshot for miscellaneous bug fixes +- Switch from NSS to OpenSSL +- Build with openldap support + * Sun Feb 03 2019 Fedora Release Engineering - 21.5.34-32.20171230hg92757c2b8239 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b05cd20d3cd8bea41064543613f43acc886aede5 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 21 Mar 2019 22:03:17 -0600 Subject: [PATCH 25/41] One more upstream update to fix 32-bit builds. --- sources | 2 +- xemacs.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 55006c8..78d5beb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20190321hge6bb9f0fcc42.tar.xz) = 27b01cd6d8ea075548339c59490e8615626b9befc67accb6d2f3a37741dfc0d7d91e1414d076009f5b1ce49bbbd1b030b5be089de6af16dc93c1b22a992fc613 +SHA512 (xemacs-20190321hg970cd945847e.tar.xz) = 65bb09bc51b72382e41322cc45de07e9375e13aff4eb9e4ac12946239f1ce6b885c803dedb017dc5d4faf67728f39f858464d53f97d8df0780401c95d7e0b0e5 diff --git a/xemacs.spec b/xemacs.spec index 48357de..b1eb87a 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,7 +19,7 @@ %bcond_without modules %endif -%global snap 20190321hge6bb9f0fcc42 +%global snap 20190321hg970cd945847e Name: xemacs Version: 21.5.34 @@ -635,10 +635,10 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog -* Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190321hge6bb9f0fcc42 +* Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190321hg970cd945847e - Enable test suite -* Thu Mar 21 2019 Jerry James - 21.5.34-33.20190321hge6bb9f0fcc42 +* Thu Mar 21 2019 Jerry James - 21.5.34-33.20190321hg970cd945847e - Update to latest mercurial snapshot for miscellaneous bug fixes - Switch from NSS to OpenSSL - Build with openldap support From 39d3e7e6bc3f41eff7f3a1316251cd69e8e78ee7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 23 Mar 2019 20:07:46 -0600 Subject: [PATCH 26/41] One more upstream update to fix the big endian build. Obsolete -el subpackage. Compress the Lisp source files. --- sources | 2 +- xemacs.spec | 68 +++++++++++++++++++++-------------------------------- 2 files changed, 28 insertions(+), 42 deletions(-) diff --git a/sources b/sources index 78d5beb..819edf6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20190321hg970cd945847e.tar.xz) = 65bb09bc51b72382e41322cc45de07e9375e13aff4eb9e4ac12946239f1ce6b885c803dedb017dc5d4faf67728f39f858464d53f97d8df0780401c95d7e0b0e5 +SHA512 (xemacs-20190323hgc0ed7ef9a5a1.tar.xz) = 57de142b3cbd829191180f0b8792f245c5978e3e83a23eec5dee402bd31acbf1b24f4f04c3173f7120dba5898b0ff53655b8403050bd69666cb93ee61deed636 diff --git a/xemacs.spec b/xemacs.spec index b1eb87a..1db0281 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,7 +19,7 @@ %bcond_without modules %endif -%global snap 20190321hg970cd945847e +%global snap 20190323hgc0ed7ef9a5a1 Name: xemacs Version: 21.5.34 @@ -126,11 +126,15 @@ and an open software development model, similar to Linux. This package contains XEmacs built for X Windows%{?with_mule: with MULE support}. %package common -Summary: Byte-compiled lisp files and other common files for XEmacs +Summary: Lisp files and other common files for XEmacs Requires: %{name}-filesystem = %{version}-%{release} Requires(post): /usr/sbin/alternatives Requires(preun): /usr/sbin/alternatives +# This can be removed when F29 reaches EOL +Obsoletes: %{name}-el < 21.5.34-33 +Provides: %{name}-el = %{version}-%{release} + %description common XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -138,7 +142,7 @@ Public License and related to other versions of Emacs, in particular GNU Emacs. Its emphasis is on modern graphical user interface support and an open software development model, similar to Linux. -This package contains byte-compiled lisp and other common files for XEmacs. +This package contains lisp and other common files for XEmacs. %package nox Summary: Different version of Emacs built without X Windows support @@ -177,20 +181,6 @@ and an open software development model, similar to Linux. This package contains XEmacs built with Xft and fontconfig support. -%package el -Summary: Emacs lisp source files for XEmacs -Requires: %{name}-filesystem = %{version}-%{release} - -%description el -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains the lisp source files for XEmacs, mainly of -interest when developing or debugging XEmacs itself. - %package info Summary: XEmacs documentation in GNU texinfo format BuildArch: noarch @@ -410,6 +400,9 @@ EOF %install make install DESTDIR=$RPM_BUILD_ROOT +# Compress the .el files +find %{buildroot}%{_datadir}/xemacs-%{xver} -name \*.el -exec gzip --best {} \+ + %if %{with nox} # install nox files echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1 @@ -493,23 +486,16 @@ pushd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc rm -r InstallGuide tests XKeysymDB *.1 popd -# separate files -rm -f *.files base-files el-files -touch base-files el-files -find $RPM_BUILD_ROOT%{_datadir}/xemacs{-%{xver},/site-packages/lisp/*} \ - \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \ - \( -type d -not -name site-start.d -fprintf dir.files "%%%%dir %%p\n" \) -o \ - \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \ - -fprint base-el-not-bytecomped.files \) \) -sed -i -e "s|$RPM_BUILD_ROOT||" *.files - -# make site-packages lisp files config files -sed -i -e 's|^\(.*/site-packages/lisp/.*\)$|%%config(noreplace) \1|' \ - base-el-not-bytecomped.files - -# combine the file lists -cat base-*.files dir.files >> base-files -cat el-*.files >> el-files +# Generate file list and make site-packages lisp files config files. +# (Note: The double-quote before "(noreplace)" is only to work around +# a bug in rpm-spec-mode). +find $RPM_BUILD_ROOT \ + \( -path $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver} -o \ + -path $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/\* -o \ + -path $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/\* \) -a \ + \( \( -type d -not -name site-start.d -fprintf base-files "%%%%dir /%%P\n" \) -o \ + \( -type f -path $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/\*.el.gz -not -exec test -e {}c \; -fprintf base-files "%%%%config""(noreplace) /%%P\n" \) -o \ + \( -type f -fprintf base-files "/%%P\n" \) \) install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc @@ -597,6 +583,7 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %if %{with modules} %{_libdir}/xemacs/ %dir %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/ +%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.el %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.elc %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/eldap.ell %endif @@ -606,11 +593,6 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %{_mandir}/man1/gnuserv.1* %{_mandir}/man1/xemacs.1* -%files el -f el-files -%if %{with modules} -%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.el -%endif - %files info %license COPYING %{_infodir}/*.info* @@ -635,13 +617,17 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog -* Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190321hg970cd945847e +* Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190323hgc0ed7ef9a5a1 +- Obsolete -el subpackage +- Remove needless use of %%defattr +- Simplify generation of file list - Enable test suite -* Thu Mar 21 2019 Jerry James - 21.5.34-33.20190321hg970cd945847e +* Thu Mar 21 2019 Jerry James - 21.5.34-33.20190323hgc0ed7ef9a5a1 - Update to latest mercurial snapshot for miscellaneous bug fixes - Switch from NSS to OpenSSL - Build with openldap support +- Compress the Lisp source files * Sun Feb 03 2019 Fedora Release Engineering - 21.5.34-32.20171230hg92757c2b8239 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 482e4ef3139667fcff7565baad1e30c67ad25573 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:01:18 +0000 Subject: [PATCH 27/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 1db0281..f7206cf 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 33%{?snap:.%{snap}}%{?dist} +Release: 34%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -617,6 +617,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 21.5.34-34.20190323hgc0ed7ef9a5a1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190323hgc0ed7ef9a5a1 - Obsolete -el subpackage - Remove needless use of %%defattr From 5a36dcffe11585c87e07d9e4d6f063cc162a7d43 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 24 Jan 2020 22:23:45 -0700 Subject: [PATCH 28/41] Minor spec file cleanups. --- xemacs.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index f7206cf..af263dc 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -131,10 +131,6 @@ Requires: %{name}-filesystem = %{version}-%{release} Requires(post): /usr/sbin/alternatives Requires(preun): /usr/sbin/alternatives -# This can be removed when F29 reaches EOL -Obsoletes: %{name}-el < 21.5.34-33 -Provides: %{name}-el = %{version}-%{release} - %description common XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -226,7 +222,7 @@ add functionality to XEmacs. %prep %setup -q -n %{name}-%{?snap:beta}%{!?snap:%{version}} -find . -type f -name "*.elc" -o -name "*.info*" -exec rm -f {} \+ +find . -type f -name "*.elc" -o -name "*.info*" -delete sed -i -e /tetris/d lisp/menubar-items.el %patch0 %patch1 From a475a09fb89904cc55315c24844ccc22de62018a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 28 Jan 2020 08:49:54 -0700 Subject: [PATCH 29/41] Replace libdb with gdbm. Use pkgconfig BRs. --- xemacs.spec | 76 ++++++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index af263dc..bce5560 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -65,51 +65,51 @@ Patch7: %{name}-21.5.34-overflow.patch # Submitted upstream 28 Dec 2017: better computation of data start address Patch8: %{name}-21.5.34-data-start.patch -BuildRequires: gcc -BuildRequires: texinfo -BuildRequires: ncurses-devel -BuildRequires: gpm-devel -BuildRequires: openldap-devel -BuildRequires: openssl-devel -BuildRequires: pam-devel -BuildRequires: zlib-devel -BuildRequires: libjpeg-devel BuildRequires: compface-devel -BuildRequires: libpng-devel -BuildRequires: libtiff-devel -BuildRequires: giflib-devel BuildRequires: desktop-file-utils %if %{with mule} %if %{with wnn} BuildRequires: FreeWnn-devel -%endif # wnn -%endif # mule -BuildRequires: xmkmf -BuildRequires: libXau-devel -BuildRequires: libXpm-devel -BuildRequires: alsa-lib-devel -BuildRequires: libdb-devel +%endif +%endif +BuildRequires: gcc +BuildRequires: gdbm-devel +BuildRequires: giflib-devel BuildRequires: gmp-devel +BuildRequires: gpm-devel +BuildRequires: openldap-devel +BuildRequires: pam-devel +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(ncurses) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(xau) +BuildRequires: pkgconfig(xft) +BuildRequires: pkgconfig(xpm) +BuildRequires: pkgconfig(zlib) +BuildRequires: texinfo +BuildRequires: xmkmf %if %{with gtk} -BuildRequires: gtk3-devel -%else # gtk +BuildRequires: pkgconfig(gtk+-3.0) +%else BuildRequires: xorg-x11-xbitmaps %if %{with xaw3d} -BuildRequires: Xaw3d-devel -%else # xaw3d +BuildRequires: pkgconfig(xaw3d) +%else BuildRequires: neXtaw-devel -%endif # xaw3d -%endif # gtk -BuildRequires: libXft-devel +%endif +%endif # Note: no xemacs-packages-extra dependency here, need main pkg to build it. Requires: xemacs-packages-base Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi Requires: xorg-x11-fonts-misc -Requires(post): /usr/sbin/alternatives +Requires(post): alternatives Requires(post): coreutils -Requires(postun): /usr/sbin/alternatives +Requires(postun): alternatives Requires(postun): coreutils Provides: xemacs(bin) = %{version}-%{release} @@ -128,8 +128,8 @@ This package contains XEmacs built for X Windows%{?with_mule: with MULE support} %package common Summary: Lisp files and other common files for XEmacs Requires: %{name}-filesystem = %{version}-%{release} -Requires(post): /usr/sbin/alternatives -Requires(preun): /usr/sbin/alternatives +Requires(post): alternatives +Requires(preun): alternatives %description common XEmacs is a highly customizable open source text editor and @@ -145,9 +145,9 @@ Summary: Different version of Emacs built without X Windows support # Note: no xemacs-packages* dependencies here, we need -nox to build the # base package set. Requires: %{name}-common = %{version}-%{release} -Requires(post): /usr/sbin/alternatives +Requires(post): alternatives Requires(post): coreutils -Requires(postun): /usr/sbin/alternatives +Requires(postun): alternatives Provides: xemacs(bin) = %{version}-%{release} %description nox @@ -163,9 +163,9 @@ This package contains XEmacs built without X Windows support. Summary: Different version of Emacs built with Xft/fontconfig support Requires: %{name}-common = %{version}-%{release} Requires: xemacs-packages-base -Requires(post): /usr/sbin/alternatives +Requires(post): alternatives Requires(post): coreutils -Requires(postun): /usr/sbin/alternatives +Requires(postun): alternatives Provides: xemacs(bin) = %{version}-%{release} %description xft @@ -307,7 +307,7 @@ mv lib-src/DOC{,-nox} mv src/xemacs{,-nox-%{xver}} mv lib-src/config.values{,-nox} mv Installation{,-nox} -%endif # nox +%endif # build with Xft %configure $common_options \ @@ -409,7 +409,7 @@ install -pm 644 lib-src/DOC-nox \ $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/DOC install -pm 644 lib-src/config.values-nox \ $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values -%endif # nox +%endif # install xft files echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-xft.1 @@ -613,6 +613,10 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Jan 28 2020 Jerry James - 21.5.34-3420190323hgc0ed7ef9a5a1 +- Replace libdb with gdbm +- Use pkgconfig BRs + * Sat Jul 27 2019 Fedora Release Engineering - 21.5.34-34.20190323hgc0ed7ef9a5a1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 6b4e167749a7328e430c388b15ebecbcae544b74 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:16:14 +0000 Subject: [PATCH 30/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index bce5560..5610c1f 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 34%{?snap:.%{snap}}%{?dist} +Release: 35%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -613,6 +613,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 21.5.34-35.20190323hgc0ed7ef9a5a1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Jan 28 2020 Jerry James - 21.5.34-3420190323hgc0ed7ef9a5a1 - Replace libdb with gdbm - Use pkgconfig BRs From 621bba2cd1d7d2114bec274feb7fe416a621765a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 21 Jul 2020 19:41:14 -0600 Subject: [PATCH 31/41] Explicitly ask configure for gdbm. --- xemacs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 5610c1f..a08b71f 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -277,7 +277,7 @@ common_options=" --without-canna %endif --with-clash-detection - --with-database=berkdb + --with-database=gdbm --with-ldap --without-postgresql --with-mail-locking=lockf From 20b6445349530fb191bed3220438a71480ec3fd1 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 14:54:38 +0000 Subject: [PATCH 32/41] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- xemacs.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index a08b71f..d510451 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 35%{?snap:.%{snap}}%{?dist} +Release: 36%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -394,7 +394,7 @@ cat > macros.xemacs << EOF EOF %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # Compress the .el files find %{buildroot}%{_datadir}/xemacs-%{xver} -name \*.el -exec gzip --best {} \+ @@ -613,6 +613,10 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Jul 14 2020 Tom Stellard - 21.5.34-36.20190323hgc0ed7ef9a5a1 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Fri Jan 31 2020 Fedora Release Engineering - 21.5.34-35.20190323hgc0ed7ef9a5a1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e70c0a7c88ccf6a01a68d5ed6db536b7b3f39d15 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 22 Jul 2020 16:32:12 -0600 Subject: [PATCH 33/41] Update to latest mercurial snapshot for miscellaneous bug fixes. - Add -strsignal patch to fix build with latest glibc. --- sources | 2 +- xemacs-21.5.34-strsignal.patch | 85 ++++++++++++++++++++++++++++++++++ xemacs.spec | 21 ++++----- 3 files changed, 95 insertions(+), 13 deletions(-) create mode 100644 xemacs-21.5.34-strsignal.patch diff --git a/sources b/sources index 819edf6..b5901cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20190323hgc0ed7ef9a5a1.tar.xz) = 57de142b3cbd829191180f0b8792f245c5978e3e83a23eec5dee402bd31acbf1b24f4f04c3173f7120dba5898b0ff53655b8403050bd69666cb93ee61deed636 +SHA512 (xemacs-20200331hge2ac728aa576.tar.xz) = cfeb5bdef2cb864550674200a3fb95bb71923b248394bca10e1b0e21c3fb79343201ab458219d1a12c46d753194a8ab95ca1b43f7b13e4451a5e0d2886e688e6 diff --git a/xemacs-21.5.34-strsignal.patch b/xemacs-21.5.34-strsignal.patch new file mode 100644 index 0000000..02fa97b --- /dev/null +++ b/xemacs-21.5.34-strsignal.patch @@ -0,0 +1,85 @@ +--- configure.orig 2020-07-22 15:06:06.967107535 -0600 ++++ configure 2020-07-22 15:09:53.877056156 -0600 +@@ -18093,7 +18093,7 @@ done + esac + + +-for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen ++for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +--- configure.ac.orig 2020-07-21 21:57:12.000000000 -0600 ++++ configure.ac 2020-07-22 15:09:48.023057483 -0600 +@@ -4563,7 +4563,7 @@ dnl ------------------------------------ + dnl Check for POSIX functions. + dnl ---------------------------------------------------------------- + +-AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) ++AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) + + dnl getaddrinfo() is borked under hpux11 + if test "$ac_cv_func_getaddrinfo" != "no" ; then +--- src/config.h.in.orig 2020-07-21 21:57:12.000000000 -0600 ++++ src/config.h.in 2020-07-22 15:08:47.781071118 -0600 +@@ -417,6 +417,7 @@ things are arranged in config.h.in. In + #undef HAVE_SNPRINTF + #undef HAVE_STRERROR + #undef HAVE_STRLWR ++#undef HAVE_STRSIGNAL + #undef HAVE_STRUPR + #undef HAVE_SYMLINK + #undef HAVE_TZSET +--- src/process.c.orig 2020-07-21 21:57:12.000000000 -0600 ++++ src/process.c 2020-07-22 15:24:09.884978441 -0600 +@@ -1646,7 +1646,11 @@ const char * + signal_name (int signum) + { + if (signum >= 0 && signum < NSIG) ++#ifdef HAVE_STRSIGNAL ++ return strsignal (signum); ++#else + return (const char *) sys_siglist[signum]; ++#endif + + return (const char *) GETTEXT ("unknown signal"); + } +--- src/s/linux.h.orig 2020-07-21 21:57:12.000000000 -0600 ++++ src/s/linux.h 2020-07-22 15:11:55.884028996 -0600 +@@ -36,10 +36,6 @@ Boston, MA 02111-1307, USA. */ + + /* Deleted GNU_LIBRARY_PENDING_OUTPUT_COUNT -- unused in XEmacs */ + +-/* This is needed for sysdep.c */ +- +-#define HAVE_SYS_SIGLIST +- + /* #define POSIX -- not used in XEmacs */ + + /* Deleted TERM stuff -- probably hugely obsolete */ +--- src/sysdep.c.orig 2020-07-22 15:06:29.217102499 -0600 ++++ src/sysdep.c 2020-07-22 15:30:51.614011813 -0600 +@@ -3521,7 +3521,7 @@ get_random (void) + /* Strings corresponding to defined signals */ + /************************************************************************/ + +-#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) ++#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) + + #if defined(WIN32_NATIVE) || defined(CYGWIN) + const char *sys_siglist[] = +--- src/syssignal.h.orig 2020-07-21 21:57:12.000000000 -0600 ++++ src/syssignal.h 2020-07-22 15:22:23.900976554 -0600 +@@ -263,10 +263,8 @@ signal_handler_t qxe_reliable_signal (in + # endif + #endif + +-/* HAVE_DECL_SYS_SIGLIST is determined by configure. On Linux, it seems, +- configure incorrectly fails to find it, so s/linux.h defines +- HAVE_SYS_SIGLIST. */ +-#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) ++/* Systems that have sys_siglist but do not declare it. */ ++#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) + extern const char *sys_siglist[]; + #endif + diff --git a/xemacs.spec b/xemacs.spec index d510451..21b7996 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20190323hgc0ed7ef9a5a1 +%global snap 20200331hge2ac728aa576 Name: xemacs Version: 21.5.34 -Release: 36%{?snap:.%{snap}}%{?dist} +Release: 37%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -64,6 +64,8 @@ Patch6: %{name}-21.5.34-alsaplay.patch Patch7: %{name}-21.5.34-overflow.patch # Submitted upstream 28 Dec 2017: better computation of data start address Patch8: %{name}-21.5.34-data-start.patch +# Submitted upstream 22 Jul 2020: Use strsignal() in preference to sys_siglist +Patch9: %{name}-21.5.34-strsignal.patch BuildRequires: compface-devel BuildRequires: desktop-file-utils @@ -221,18 +223,9 @@ This package contains directories that are required by other packages that add functionality to XEmacs. %prep -%setup -q -n %{name}-%{?snap:beta}%{!?snap:%{version}} +%autosetup -p0 -n %{name}-%{?snap:beta}%{!?snap:%{version}} find . -type f -name "*.elc" -o -name "*.info*" -delete sed -i -e /tetris/d lisp/menubar-items.el -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 -%patch8 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -613,6 +606,10 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Jul 22 2020 Jerry James - 21.5.34-37.20200331hge2ac728aa576 +- Update to latest mercurial snapshot for miscellaneous bug fixes +- Add -strsignal patch to fix build with latest glibc + * Tue Jul 14 2020 Tom Stellard - 21.5.34-36.20190323hgc0ed7ef9a5a1 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From 7db6db0fd375365066afdc424cdc3fb149308e75 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:35:09 +0000 Subject: [PATCH 34/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 21b7996..b06825d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 37%{?snap:.%{snap}}%{?dist} +Release: 38%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -606,6 +606,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 21.5.34-38.20200331hge2ac728aa576 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 22 2020 Jerry James - 21.5.34-37.20200331hge2ac728aa576 - Update to latest mercurial snapshot for miscellaneous bug fixes - Add -strsignal patch to fix build with latest glibc From f60634b59139c0ce32d7babbdc88eb9eeda64475 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 9 Nov 2020 21:33:37 -0700 Subject: [PATCH 35/41] Explicitly BR make. --- xemacs.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xemacs.spec b/xemacs.spec index b06825d..3c5b5dc 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -79,6 +79,7 @@ BuildRequires: gdbm-devel BuildRequires: giflib-devel BuildRequires: gmp-devel BuildRequires: gpm-devel +BuildRequires: make BuildRequires: openldap-devel BuildRequires: pam-devel BuildRequires: pkgconfig(alsa) From 9201297f41b6d91402a067ecf1e65122e6483c1c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 21 Jan 2021 21:27:47 -0700 Subject: [PATCH 36/41] Mark as deprecated (bz 1916926). --- xemacs.spec | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/xemacs.spec b/xemacs.spec index 3c5b5dc..74d02d3 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -116,6 +116,10 @@ Requires(postun): alternatives Requires(postun): coreutils Provides: xemacs(bin) = %{version}-%{release} +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %global xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') %global xbuild %(echo %{_build} | sed -e 's/^\\([^-]*-[^-]*-[^-]*\\).*/\\1/') @@ -134,6 +138,10 @@ Requires: %{name}-filesystem = %{version}-%{release} Requires(post): alternatives Requires(preun): alternatives +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %description common XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -153,6 +161,10 @@ Requires(post): coreutils Requires(postun): alternatives Provides: xemacs(bin) = %{version}-%{release} +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %description nox XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -171,6 +183,10 @@ Requires(post): coreutils Requires(postun): alternatives Provides: xemacs(bin) = %{version}-%{release} +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %description xft XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -186,6 +202,10 @@ BuildArch: noarch Requires(post): info Requires(preun): info +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %description info XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -200,6 +220,10 @@ Summary: Development files for XEmacs Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %description devel XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -213,6 +237,10 @@ This package contains XEmacs development support files. Summary: XEmacs filesystem layout BuildArch: noarch +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %description filesystem XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -607,6 +635,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Thu Jan 21 2021 Jerry James - 21.5.34-38.20200331hge2ac728aa576 +- Mark as deprecated (bz 1916926) + * Wed Jul 29 2020 Fedora Release Engineering - 21.5.34-38.20200331hge2ac728aa576 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 86b2e621c35b286b77d513cf03132a4f2078d893 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:55:09 +0000 Subject: [PATCH 37/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 74d02d3..d3576f6 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 38%{?snap:.%{snap}}%{?dist} +Release: 39%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -635,6 +635,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 21.5.34-39.20200331hge2ac728aa576 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Jan 21 2021 Jerry James - 21.5.34-38.20200331hge2ac728aa576 - Mark as deprecated (bz 1916926) From ca3ac70be7482a40d2a10b3a569ba67c2efd5680 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:26:04 +0000 Subject: [PATCH 38/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index d3576f6..729043e 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 39%{?snap:.%{snap}}%{?dist} +Release: 40%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -635,6 +635,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 21.5.34-40.20200331hge2ac728aa576 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 21.5.34-39.20200331hge2ac728aa576 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 8dd60e636a1bca0243a42cf559d6fe28a474965b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 4 Aug 2021 09:43:44 -0600 Subject: [PATCH 39/41] Add -xlinker patch to fix link failure. --- xemacs-21.5.34-xlinker.patch | 94 ++++++++++++++++++++++++++++++++++++ xemacs.spec | 11 +++-- 2 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 xemacs-21.5.34-xlinker.patch diff --git a/xemacs-21.5.34-xlinker.patch b/xemacs-21.5.34-xlinker.patch new file mode 100644 index 0000000..0b361f4 --- /dev/null +++ b/xemacs-21.5.34-xlinker.patch @@ -0,0 +1,94 @@ +--- configure.ac.orig 2021-08-04 09:10:32.405958685 -0600 ++++ configure.ac 2021-08-04 09:27:43.671827551 -0600 +@@ -186,7 +186,7 @@ if test "$GCC" = "yes"; then + case [$]1 in + -L | -l | -u ) [$1]="$[$1] [$]1 [$]2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) [$1]="$[$1] [$]1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) [$1]="$[$1] -Xlinker [$]1" ;; + esac + shift +--- configure.orig 2021-08-04 09:10:32.515958873 -0600 ++++ configure 2021-08-04 09:29:53.325030055 -0600 +@@ -9768,7 +9768,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_switch_system="$ld_switch_system $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_switch_system="$ld_switch_system $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_switch_system="$ld_switch_system -Xlinker $1" ;; + esac + shift +@@ -9781,7 +9781,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_switch_machine="$ld_switch_machine $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_switch_machine="$ld_switch_machine $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_switch_machine="$ld_switch_machine -Xlinker $1" ;; + esac + shift +@@ -9794,7 +9794,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_switch_site="$ld_switch_site $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_switch_site="$ld_switch_site $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_switch_site="$ld_switch_site -Xlinker $1" ;; + esac + shift +@@ -9807,7 +9807,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) LDFLAGS="$LDFLAGS $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) LDFLAGS="$LDFLAGS $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) LDFLAGS="$LDFLAGS -Xlinker $1" ;; + esac + shift +@@ -9820,7 +9820,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_call_shared="$ld_call_shared $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_call_shared="$ld_call_shared $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_call_shared="$ld_call_shared -Xlinker $1" ;; + esac + shift +@@ -10104,7 +10104,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) xe_check_libs="$xe_check_libs $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) xe_check_libs="$xe_check_libs $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) xe_check_libs="$xe_check_libs -Xlinker $1" ;; + esac + shift +@@ -10188,7 +10188,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;; + esac + shift +@@ -13457,7 +13457,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;; + esac + shift +@@ -18065,7 +18065,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;; + esac + shift diff --git a/xemacs.spec b/xemacs.spec index 729043e..2dbe26b 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 40%{?snap:.%{snap}}%{?dist} +Release: 41%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -66,6 +66,8 @@ Patch7: %{name}-21.5.34-overflow.patch Patch8: %{name}-21.5.34-data-start.patch # Submitted upstream 22 Jul 2020: Use strsignal() in preference to sys_siglist Patch9: %{name}-21.5.34-strsignal.patch +# Do not protect -specs=* with -Xlinker +Patch10: %{name}-21.5.34-xlinker.patch BuildRequires: compface-devel BuildRequires: desktop-file-utils @@ -276,10 +278,10 @@ EOF %build -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +CFLAGS="%{build_cflags} -fno-strict-aliasing" export CFLAGS export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule -export LDFLAGS="$RPM_LD_FLAGS -Wl,--as-needed" +export LDFLAGS="%{build_ldflags}" # The --with-*dir args can probably go away in the future if/when upstream # configure learns to honor standard autofoo dirs better. @@ -635,6 +637,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Aug 4 2021 Jerry James - 21.5.34-41.20200331hge2ac728aa576 +- Add -xlinker patch to fix link failure + * Fri Jul 23 2021 Fedora Release Engineering - 21.5.34-40.20200331hge2ac728aa576 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f29cd9af4c1dbfa9701a7034d935caac859e5fca Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:17:57 +0200 Subject: [PATCH 40/41] Rebuilt with OpenSSL 3.0.0 --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 2dbe26b..32c9c3d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 41%{?snap:.%{snap}}%{?dist} +Release: 42%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -637,6 +637,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Sep 14 2021 Sahana Prasad - 21.5.34-42.20200331hge2ac728aa576 +- Rebuilt with OpenSSL 3.0.0 + * Wed Aug 4 2021 Jerry James - 21.5.34-41.20200331hge2ac728aa576 - Add -xlinker patch to fix link failure From 9cb7ea0e93314bea87b174961f3f67e455fc736e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 17 Jan 2022 09:54:47 -0700 Subject: [PATCH 41/41] Unmaintained upstream --- .gitignore | 1 - dead.package | 1 + default.el | 28 - dotxemacs-init.el | 4 - gnuclient.desktop | 11 - sources | 1 - xemacs-21.5.25-mk-nochk-features.patch | 11 - xemacs-21.5.25-wnnfix-128362.patch | 61 -- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 28 - xemacs-21.5.28-courier-default.patch | 11 - xemacs-21.5.29-x-server.patch | 11 - xemacs-21.5.34-alsaplay.patch | 13 - xemacs-21.5.34-data-start.patch | 12 - xemacs-21.5.34-overflow.patch | 20 - xemacs-21.5.34-strsignal.patch | 85 -- xemacs-21.5.34-utf8-fonts.patch | 64 -- xemacs-21.5.34-xlinker.patch | 94 -- xemacs-sitestart.el | 156 --- xemacs-snapshot.sh | 34 - xemacs.appdata.xml | 32 - xemacs.desktop | 34 - xemacs.spec | 1078 -------------------- 22 files changed, 1 insertion(+), 1789 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 default.el delete mode 100644 dotxemacs-init.el delete mode 100644 gnuclient.desktop delete mode 100644 sources delete mode 100644 xemacs-21.5.25-mk-nochk-features.patch delete mode 100644 xemacs-21.5.25-wnnfix-128362.patch delete mode 100644 xemacs-21.5.27-no-expdyn-ia64-106744.patch delete mode 100644 xemacs-21.5.28-courier-default.patch delete mode 100644 xemacs-21.5.29-x-server.patch delete mode 100644 xemacs-21.5.34-alsaplay.patch delete mode 100644 xemacs-21.5.34-data-start.patch delete mode 100644 xemacs-21.5.34-overflow.patch delete mode 100644 xemacs-21.5.34-strsignal.patch delete mode 100644 xemacs-21.5.34-utf8-fonts.patch delete mode 100644 xemacs-21.5.34-xlinker.patch delete mode 100644 xemacs-sitestart.el delete mode 100755 xemacs-snapshot.sh delete mode 100644 xemacs.appdata.xml delete mode 100644 xemacs.desktop delete mode 100644 xemacs.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7f42168..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/xemacs-*.tar.xz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..151f4be --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Unmaintained upstream diff --git a/default.el b/default.el deleted file mode 100644 index 8d4478e..0000000 --- a/default.el +++ /dev/null @@ -1,28 +0,0 @@ -;;; default.el - loaded at startup after "~/.xemacs/init.el" by default -;;; -;;; Setting `inhibit-default-init' to non-nil in "~/.xemacs/init.el" -;;; prevents loading of this file. The "-q" option to xemacs -;;; prevents "~/.xemacs/init.el" *and* this file from being loaded -;;; at startup. - -;; enable wheel mouse support by default -(when window-system - (mwheel-install)) - -;; make gnus save articles be mbox format not rmail format -(defvar gnus-default-article-saver 'gnus-summary-save-in-file) - -;; use terminfo by default -(defvar system-uses-terminfo t) - -;; turn on syntax highlighting by default if lazy-lock is available -(when (fboundp 'turn-on-lazy-lock) - (require 'font-lock) - ;; use lazy-lock by default if lazy-shot is not enabled - (remove-hook 'font-lock-mode-hook 'turn-on-lazy-lock) - (add-hook 'font-lock-mode-hook - (function - (lambda () - (unless (and (boundp 'lazy-shot-mode) lazy-shot-mode) - (turn-on-lazy-lock)))) - t)) diff --git a/dotxemacs-init.el b/dotxemacs-init.el deleted file mode 100644 index 6697754..0000000 --- a/dotxemacs-init.el +++ /dev/null @@ -1,4 +0,0 @@ -;;; ~/.xemacs/init.el - -;;; uncomment this line to disable loading of "default.el" at startup -;(setq inhibit-default-init t) diff --git a/gnuclient.desktop b/gnuclient.desktop deleted file mode 100644 index c06d946..0000000 --- a/gnuclient.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Gnuclient -GenericName=Text Editor -Comment=Edit text -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=gnuclient %f -Icon=xemacs -Type=Application -Terminal=false -Categories=Application;Utility;TextEditor; -StartupWMClass=XEmacs diff --git a/sources b/sources deleted file mode 100644 index b5901cd..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (xemacs-20200331hge2ac728aa576.tar.xz) = cfeb5bdef2cb864550674200a3fb95bb71923b248394bca10e1b0e21c3fb79343201ab458219d1a12c46d753194a8ab95ca1b43f7b13e4451a5e0d2886e688e6 diff --git a/xemacs-21.5.25-mk-nochk-features.patch b/xemacs-21.5.25-mk-nochk-features.patch deleted file mode 100644 index 79a5a1d..0000000 --- a/xemacs-21.5.25-mk-nochk-features.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.in.orig 2017-04-18 09:36:15.000000000 -0600 -+++ Makefile.in.in 2017-04-18 09:38:44.769709731 -0600 -@@ -402,7 +402,7 @@ etc/PROBLEMS: $(srcdir)/PROBLEMS - - install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep - --install: all check-features install-arch-dep install-arch-indep -+install: all install-arch-dep install-arch-indep - - install-arch-dep: mkdir - for subdir in ${INSTALL_ARCH_DEP_SUBDIR}; do \ diff --git a/xemacs-21.5.25-wnnfix-128362.patch b/xemacs-21.5.25-wnnfix-128362.patch deleted file mode 100644 index 0b64249..0000000 --- a/xemacs-21.5.25-wnnfix-128362.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- src/mule-wnnfns.c.orig 2011-04-29 07:31:16.000000000 -0600 -+++ src/mule-wnnfns.c 2011-05-03 14:00:02.625969757 -0600 -@@ -316,7 +316,7 @@ - Lisp_Object Qwnn_jisho, Qwnn_sbn, Qwnn_dbn_len, Qwnn_sbn_cnt, Qwnn_suuji; - Lisp_Object Qwnn_kana, Qwnn_eisuu, Qwnn_kigou, Qwnn_toji_kakko, Qwnn_fuzokogo, Qwnn_kaikakko; - Lisp_Object Vwnn_server_type; --Lisp_Object Vcwnn_zhuyin; -+//Lisp_Object Vcwnn_zhuyin; - Lisp_Object Vwnnenv_sticky; - Lisp_Object Vwnn_uniq_level; - Lisp_Object Qchinese_sisheng; -@@ -1914,9 +1914,11 @@ - DEFVAR_LISP ("wnn-server-type", &Vwnn_server_type /* - *jserver, cserver .. - */ ); -- DEFVAR_LISP ("cwnn-zhuyin", &Vcwnn_zhuyin /* -+#if 0 -+ DEFVAR_LISP ("cwnn-zhuyin", &Vcwnn_zhuyin /* - *pinyin or zhuyin - */ ); -+#endif - DEFVAR_LISP ("wnnenv-sticky", &Vwnnenv_sticky /* - *If non-nil, make environment sticky - */ ); -@@ -1925,7 +1927,7 @@ - */ ); - - Vwnn_server_type = Qjserver; -- Vcwnn_zhuyin = Qnil; -+ //Vcwnn_zhuyin = Qnil; - Vwnnenv_sticky = Qnil; - - DEFSYMBOL (Qchinese_sisheng); -@@ -1952,10 +1954,14 @@ - case 0x80: - if (EQ(Vwnn_server_type, Qcserver)) - { -+#if 0 - len = cwnn_yincod_pzy (pzy, wc, - NILP (Vcwnn_zhuyin) - ? CWNN_PINYIN - : CWNN_ZHUYIN); -+#else -+ len = 0; -+#endif - for (i = 0; i < len; i++) - { - if (pzy[i] & 0x80) -@@ -2055,8 +2061,12 @@ - else *pin = *w; - w++; pin++; - } -+#if 0 - len = cwnn_pzy_yincod (ybuf, pbuf, - NILP (Vcwnn_zhuyin) ? CWNN_PINYIN : CWNN_ZHUYIN); -+#else -+ return; -+#endif - if (len <= 0) - return; - diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch deleted file mode 100644 index 9d0e902..0000000 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- aclocal.m4.orig 2017-12-27 09:57:56.000000000 -0700 -+++ aclocal.m4 2017-12-27 09:59:53.773320170 -0700 -@@ -533,7 +533,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib - ;; - - *) -- ld_dynamic_link_flags="${wl}-export-dynamic" -+ # avoid -export-dynamic on ia64 -+ if test "$xehost_cpu" != "ia64"; then -+ ld_dynamic_link_flags="${wl}-export-dynamic" -+ fi - ;; - esac - fi ---- configure.orig 2017-12-27 09:57:56.000000000 -0700 -+++ configure 2017-12-27 09:59:53.778320152 -0700 -@@ -15058,7 +15058,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib - ;; - - *) -- ld_dynamic_link_flags="${wl}-export-dynamic" -+ # avoid -export-dynamic on ia64 -+ if test "$xehost_cpu" != "ia64"; then -+ ld_dynamic_link_flags="${wl}-export-dynamic" -+ fi - ;; - esac - fi diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch deleted file mode 100644 index 696fb5d..0000000 --- a/xemacs-21.5.28-courier-default.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/faces.c.orig 2017-12-27 10:00:10.468259293 -0700 -+++ src/faces.c 2017-12-27 10:01:24.744988448 -0700 -@@ -2524,7 +2524,7 @@ complex_vars_of_faces (void) - Fcons - (Fcons - (list1 (device_symbol), -- build_ascstring ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-m-*-*-*")), -+ build_ascstring ("-*-courier-medium-r-*-*-*-120-*-*-m-*-*-*")), - inst_list); - #endif /* HAVE_GTK */ - #endif /* !HAVE_XFT */ diff --git a/xemacs-21.5.29-x-server.patch b/xemacs-21.5.29-x-server.patch deleted file mode 100644 index f72b399..0000000 --- a/xemacs-21.5.29-x-server.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./lisp/x-init.el.orig 2012-08-02 12:38:28.000000000 -0600 -+++ ./lisp/x-init.el 2012-08-06 20:31:09.330411828 -0600 -@@ -154,7 +154,7 @@ it was previously unaware of, the predic - (string-equal "X Consortium" vendor)) - ;; Ok, we think this could be a Sun keyboard. Run the Sun code. - (x-win-init-sun device)) -- ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation" vendor) -+ ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation\|Fedora Project" vendor) - ;; Those XFree86 people do some weird keysym stuff, too. - (x-win-init-xfree86 device))))) - diff --git a/xemacs-21.5.34-alsaplay.patch b/xemacs-21.5.34-alsaplay.patch deleted file mode 100644 index eaa9b7c..0000000 --- a/xemacs-21.5.34-alsaplay.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/alsaplay.c.orig 2011-05-02 21:22:30.000000000 -0600 -+++ src/alsaplay.c 2015-10-03 10:33:52.961671169 -0600 -@@ -375,6 +375,10 @@ alsa_play_sound_data (const Binbyte *dat - if ((err = snd_pcm_writei (pcm_handle, data, length)) < 0) - goto error_mixer; - -+ /* Wait for it to finish */ -+ if ((err = snd_pcm_drain (pcm_handle)) < 0) -+ goto error_mixer; -+ - /* Put the volume back the way it used to be */ - reset_volume (&mix); - diff --git a/xemacs-21.5.34-data-start.patch b/xemacs-21.5.34-data-start.patch deleted file mode 100644 index a41dac2..0000000 --- a/xemacs-21.5.34-data-start.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/sysdep.c.orig 2017-12-28 13:34:54.000000000 -0700 -+++ src/sysdep.c 2017-12-28 17:06:55.763497550 -0700 -@@ -1969,7 +1969,8 @@ start_of_data (void) - if (!initialized) - return static_heap_base; - #endif -- return ((char *) &environ); -+ extern char _end; -+ return &_end; - #else - extern int data_start; - return ((char *) &data_start); diff --git a/xemacs-21.5.34-overflow.patch b/xemacs-21.5.34-overflow.patch deleted file mode 100644 index 94f6663..0000000 --- a/xemacs-21.5.34-overflow.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/alloca.c.orig 2017-12-28 13:34:54.000000000 -0700 -+++ src/alloca.c 2017-12-28 13:39:44.078644647 -0700 -@@ -177,15 +177,14 @@ xemacs_c_alloca (size_t size) - - { - #ifdef emacs -- size_t total_size = sizeof (header) + size; - register pointer new_; - -- if (total_size < size || ((Bytecount) (total_size) < 0)) -+ if (SIZE_MAX - size < sizeof(header)) - { - memory_full (); - } - -- new_ = xmalloc ((Bytecount) total_size); -+ new_ = xmalloc ((Bytecount) (size + sizeof(header))); - #else - register pointer new_ = malloc (sizeof (header) + size); - #endif diff --git a/xemacs-21.5.34-strsignal.patch b/xemacs-21.5.34-strsignal.patch deleted file mode 100644 index 02fa97b..0000000 --- a/xemacs-21.5.34-strsignal.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- configure.orig 2020-07-22 15:06:06.967107535 -0600 -+++ configure 2020-07-22 15:09:53.877056156 -0600 -@@ -18093,7 +18093,7 @@ done - esac - - --for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen -+for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ---- configure.ac.orig 2020-07-21 21:57:12.000000000 -0600 -+++ configure.ac 2020-07-22 15:09:48.023057483 -0600 -@@ -4563,7 +4563,7 @@ dnl ------------------------------------ - dnl Check for POSIX functions. - dnl ---------------------------------------------------------------- - --AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) -+AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) - - dnl getaddrinfo() is borked under hpux11 - if test "$ac_cv_func_getaddrinfo" != "no" ; then ---- src/config.h.in.orig 2020-07-21 21:57:12.000000000 -0600 -+++ src/config.h.in 2020-07-22 15:08:47.781071118 -0600 -@@ -417,6 +417,7 @@ things are arranged in config.h.in. In - #undef HAVE_SNPRINTF - #undef HAVE_STRERROR - #undef HAVE_STRLWR -+#undef HAVE_STRSIGNAL - #undef HAVE_STRUPR - #undef HAVE_SYMLINK - #undef HAVE_TZSET ---- src/process.c.orig 2020-07-21 21:57:12.000000000 -0600 -+++ src/process.c 2020-07-22 15:24:09.884978441 -0600 -@@ -1646,7 +1646,11 @@ const char * - signal_name (int signum) - { - if (signum >= 0 && signum < NSIG) -+#ifdef HAVE_STRSIGNAL -+ return strsignal (signum); -+#else - return (const char *) sys_siglist[signum]; -+#endif - - return (const char *) GETTEXT ("unknown signal"); - } ---- src/s/linux.h.orig 2020-07-21 21:57:12.000000000 -0600 -+++ src/s/linux.h 2020-07-22 15:11:55.884028996 -0600 -@@ -36,10 +36,6 @@ Boston, MA 02111-1307, USA. */ - - /* Deleted GNU_LIBRARY_PENDING_OUTPUT_COUNT -- unused in XEmacs */ - --/* This is needed for sysdep.c */ -- --#define HAVE_SYS_SIGLIST -- - /* #define POSIX -- not used in XEmacs */ - - /* Deleted TERM stuff -- probably hugely obsolete */ ---- src/sysdep.c.orig 2020-07-22 15:06:29.217102499 -0600 -+++ src/sysdep.c 2020-07-22 15:30:51.614011813 -0600 -@@ -3521,7 +3521,7 @@ get_random (void) - /* Strings corresponding to defined signals */ - /************************************************************************/ - --#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) -+#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) - - #if defined(WIN32_NATIVE) || defined(CYGWIN) - const char *sys_siglist[] = ---- src/syssignal.h.orig 2020-07-21 21:57:12.000000000 -0600 -+++ src/syssignal.h 2020-07-22 15:22:23.900976554 -0600 -@@ -263,10 +263,8 @@ signal_handler_t qxe_reliable_signal (in - # endif - #endif - --/* HAVE_DECL_SYS_SIGLIST is determined by configure. On Linux, it seems, -- configure incorrectly fails to find it, so s/linux.h defines -- HAVE_SYS_SIGLIST. */ --#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) -+/* Systems that have sys_siglist but do not declare it. */ -+#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) - extern const char *sys_siglist[]; - #endif - diff --git a/xemacs-21.5.34-utf8-fonts.patch b/xemacs-21.5.34-utf8-fonts.patch deleted file mode 100644 index 3f99b52..0000000 --- a/xemacs-21.5.34-utf8-fonts.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- etc/Emacs.ad.orig 2013-08-21 11:43:43.000000000 -0600 -+++ etc/Emacs.ad 2013-10-24 20:00:00.000000000 -0600 -@@ -222,36 +222,40 @@ - ! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ - ! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0 - ! --*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* --*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* --*menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -+*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* -+*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* -+ -+XEmacs*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1, \ -+ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*, \ -+ * -+*menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*, \ - -*-*-*-*-*-*-*-120-*-iso10646-1, \ - -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ - -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 --*popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -+*popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*, \ - -*-*-*-*-*-*-*-120-*-iso10646-1, \ - -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ - -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 - - ! Gui elements share this font - ! --Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-* -+Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-* - - ! Font in the Motif dialog boxes. - ! (Motif uses `fontList' while most other things use `font' - if you don't - ! know why you probably don't want to.) - ! --*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* --*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* --*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* --*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* -+*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* -+*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-*-* -+*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-*-* -+*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-*-* - - ! Font in the Athena dialog boxes. - ! I think 14-point looks nicer than 12-point. - ! Some people use 12-point anyway because you get more text, but - ! there's no purpose at all in doing this for dialog boxes. - --*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-* -+*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-* - - ! Dialog box translations. - ! ======================= ---- lwlib/xlwmenu.c.orig 2013-08-21 11:43:43.000000000 -0600 -+++ lwlib/xlwmenu.c 2013-10-24 20:00:00.000000000 -0600 -@@ -108,7 +108,7 @@ - /* We must use an iso8859-1 font here, or people without $LANG set lose. - It's fair to assume that those who do have $LANG set also have the - *fontList resource set, or at least know how to deal with this. */ -- XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1"), -+ XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-1"), - #else - fontres (XtNfont, XtCFont, XtRFontStruct, XFontStruct *, font, - "XtDefaultFont"), diff --git a/xemacs-21.5.34-xlinker.patch b/xemacs-21.5.34-xlinker.patch deleted file mode 100644 index 0b361f4..0000000 --- a/xemacs-21.5.34-xlinker.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- configure.ac.orig 2021-08-04 09:10:32.405958685 -0600 -+++ configure.ac 2021-08-04 09:27:43.671827551 -0600 -@@ -186,7 +186,7 @@ if test "$GCC" = "yes"; then - case [$]1 in - -L | -l | -u ) [$1]="$[$1] [$]1 [$]2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) [$1]="$[$1] [$]1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) [$1]="$[$1] -Xlinker [$]1" ;; - esac - shift ---- configure.orig 2021-08-04 09:10:32.515958873 -0600 -+++ configure 2021-08-04 09:29:53.325030055 -0600 -@@ -9768,7 +9768,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_switch_system="$ld_switch_system $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_switch_system="$ld_switch_system $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_switch_system="$ld_switch_system -Xlinker $1" ;; - esac - shift -@@ -9781,7 +9781,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_switch_machine="$ld_switch_machine $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_switch_machine="$ld_switch_machine $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_switch_machine="$ld_switch_machine -Xlinker $1" ;; - esac - shift -@@ -9794,7 +9794,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_switch_site="$ld_switch_site $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_switch_site="$ld_switch_site $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_switch_site="$ld_switch_site -Xlinker $1" ;; - esac - shift -@@ -9807,7 +9807,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) LDFLAGS="$LDFLAGS $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) LDFLAGS="$LDFLAGS $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) LDFLAGS="$LDFLAGS -Xlinker $1" ;; - esac - shift -@@ -9820,7 +9820,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_call_shared="$ld_call_shared $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_call_shared="$ld_call_shared $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_call_shared="$ld_call_shared -Xlinker $1" ;; - esac - shift -@@ -10104,7 +10104,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) xe_check_libs="$xe_check_libs $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) xe_check_libs="$xe_check_libs $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) xe_check_libs="$xe_check_libs -Xlinker $1" ;; - esac - shift -@@ -10188,7 +10188,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;; - esac - shift -@@ -13457,7 +13457,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;; - esac - shift -@@ -18065,7 +18065,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;; - esac - shift diff --git a/xemacs-sitestart.el b/xemacs-sitestart.el deleted file mode 100644 index 4fa0353..0000000 --- a/xemacs-sitestart.el +++ /dev/null @@ -1,156 +0,0 @@ -;;; site-start.el - loaded at startup before "~/.xemacs/init.el" -;;; -;;; The "-no-site-file" option to xemacs prevents this file from being loaded. - -;;; psgml catalog list -(setq sgml-catalog-files - (if (getenv "SGML_CATALOG_FILES") - (split-path (getenv "SGML_CATALOG_FILES")) - (list "CATALOG" "catalog" - "/etc/sgml/catalog" - "/etc/xml/catalog" - (locate-data-file "CATALOG")))) - -;; default to non-kerberos ftp -(setq efs-ftp-program-name "/usr/bin/ftp") - -;; default to unified diffs -(setq-default diff-switches "-u") - -;; decrease lazy-lock default threshold -(setq-default lazy-lock-minimum-size (* 2 1024)) - -;; load .el files in "site-start.d/" -(let ((files (directory-files - "/usr/share/xemacs/site-packages/lisp/site-start.d" t "\\.el$"))) - (mapc 'load-file files)) - -;; fix default courier italics -;; for courier, oblique usually produces better results than italic -(setq try-oblique-before-italic-fonts t) -(when window-system - (make-face-italic 'italic) - (make-face-italic 'bold-italic)) - -;; Set up language environment and coding systems -(when (featurep 'mule) - (let* ((locale (getenv "LANG")) - (lang-region (and locale - (substring locale 0 (min 5 (length locale))))) - (lang (and lang-region - (substring lang-region 0 (min 2 (length lang-region)))))) - (cond ((equal lang "af") - (set-language-environment "Afrikaans")) - ((equal lang "sq") - (set-language-environment "Albanian")) - ((equal lang "ca") - (set-language-environment "Catalan")) - ((or (equal lang-region "zh_TW") (equal lang-region "zh_HK")) - (set-language-environment "Chinese-BIG5")) - ((or (equal lang-region "zh_CN") (equal lang-region "zh_SG")) - (set-language-environment "Chinese-GB")) - ((equal lang "hr") - (set-language-environment "Croatian")) - ((equal lang "ru") - (set-language-environment "Cyrillic-KOI8")) - ((equal lang "cs") - (set-language-environment "Czech")) - ((equal lang "da") - (set-language-environment "Danish")) - ((equal lang "nl") - (set-language-environment "Dutch")) - ((equal lang "et") - (set-language-environment "Estonian")) - ((equal lang "fi") - (set-language-environment "Finnish")) - ((equal lang "fr") - (set-language-environment "French")) - ((equal lang "gl") - (set-language-environment "Galician")) - ((equal lang "de") - (set-language-environment "German")) - ((equal lang "el") - (set-language-environment "Greek")) - ((equal lang "kl") - (set-language-environment "Greenlandic")) - ((or (equal lang "he") (equal lang "iw")) - (set-language-environment "Hebrew")) - ((equal lang "hu") - (set-language-environment "Hungarian")) - ((equal lang "ga") - (set-language-environment "Irish")) - ((equal lang "it") - (set-language-environment "Italian")) - ((equal lang "ja") - (set-language-environment "Japanese")) - ((equal lang "ko") - (set-language-environment "Korean")) - ((equal lang "lt") - (set-language-environment "Lithuanian")) - ((equal lang "mt") - (set-language-environment "Maltese")) - ((or (equal lang "nb") (equal lang "nn") (equal lang "no")) - (set-language-environment "Norwegian")) - ((equal lang "pl") - (set-language-environment "Polish")) - ((equal lang "pt") - (set-language-environment "Portuguese")) - ((equal lang "ro") - (set-language-environment "Romanian")) - ((equal lang "sk") - (set-language-environment "Slovak")) - ((equal lang "sl") - (set-language-environment "Slovenian")) - ((equal lang "es") - (set-language-environment "Spanish")) - ((equal lang "sv") - (set-language-environment "Swedish")) - ((equal lang "th") - (set-language-environment "Thai-XTIS")) - ((equal lang "tr") - (set-language-environment "Turkish")) - ((equal lang "vi") - (set-language-environment "Vietnamese")) - (t - (set-language-environment "English"))) - - ;; set-language-environment changes the locale; restore it. - (setenv "LANG" locale) - (set-current-locale (or locale "C")) - - (let* ((tmp (shell-command-to-string "locale charmap")) - (tmp (substring tmp 0 (string-match "\[ \t\n\]" tmp))) - (tmp (intern (downcase tmp)))) - (when (find-coding-system tmp) - (let ((cat (or (coding-system-category tmp) tmp))) - (set-coding-priority-list (list cat)) - (set-coding-category-system cat tmp)) - (set-default-output-coding-systems tmp) - (set-keyboard-coding-system tmp) - (set-terminal-coding-system tmp) - (setq file-name-coding-system tmp) - (setq process-coding-system-alist (cons (cons ".*" tmp) '())) - (define-coding-system-alias 'native tmp))) - - ;; Register available Input Methods. - (load "leim-list" t) - (when (member lang '("ja" "ko" "zh")) - ;; ispell doesn't support CJK - (setq-default ispell-local-dictionary "english")))) - -;; Set input mode -;(let ((value (current-input-mode))) -; (set-input-mode (nth 0 value) -; (nth 1 value) -; (terminal-coding-system) -; ;; This quit value is optional -; (nth 3 value))) - -;; try to preserve user/group when saving files -(setq-default backup-by-copying-when-mismatch t) - -;; when saving a buffer always end it with a newline -(setq-default require-final-newline t) - -;; the graphical progress bar is buggy - disable it by default (#188973) -(setq-default progress-feedback-use-echo-area t) diff --git a/xemacs-snapshot.sh b/xemacs-snapshot.sh deleted file mode 100755 index fb235dc..0000000 --- a/xemacs-snapshot.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -set -e - -if [ -z "$1" -o $# -ne 1 ]; then - echo "Usage: $0 " - exit 2 -fi - -rev="$1" -tmp=$(mktemp -d) -tarball="xemacs-$(date +%Y%m%d)hg$rev.tar" - -trap cleanup EXIT -cleanup() { - set +e - [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" -} - -unset CDPATH -pwd=$(pwd) -now=$(date +%Y%m%d) - -cd "$tmp" -hg clone https://bitbucket.org/xemacs/xemacs xemacs-beta -cd xemacs-beta -hg update -r "$rev" -# Hack to avoid needing .hg/ around but still getting xemacs-extra-name right -hg identify | cut -d " " -f 1 >> version.sh.in # see configure.ac -rm -r .hg* -cd .. -tar cf "$pwd/$tarball" xemacs-beta -xz -9f "$pwd/$tarball" -cd - >/dev/null diff --git a/xemacs.appdata.xml b/xemacs.appdata.xml deleted file mode 100644 index 00c4be6..0000000 --- a/xemacs.appdata.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - xemacs.desktop - CC0 - GPL-3.0+ - XEmacs - Different version of Emacs - -

- XEmacs is a highly customizable open source text editor and application - development system. -

-

XEmacs is protected under the GNU General Public License. It is related - to other versions of Emacs, in particular GNU Emacs. Its emphasis is on - modern graphical user interface support and an open software development - model, similar to Linux. -

- - - - http://www.xemacs.org/Images/gnus.png - Gnus in XEmacs - - - http://www.xemacs.org/Images/custom.png - Customize buffer - - - james@xemacs.org - http://www.xemacs.org/ - http://tracker.xemacs.org/XEmacs/its/ - diff --git a/xemacs.desktop b/xemacs.desktop deleted file mode 100644 index 817c6d9..0000000 --- a/xemacs.desktop +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Name=XEmacs Text Editor -Name[bg]=редактор XEmacs -Name[ca]=Editor XEmacs -Name[cs]=Editor XEmacs -Name[da]=XEmacs tekstredigerer -Name[de]=XEmacs Texteditor -Name[eo]=La redaktilo XEmakso -Name[es]=Emacs para X -Name[et]=Emacs X'i kasutajaliidesega -Name[fi]=XEmacs editori -Name[fr]=Éditeur XEmacs -Name[hu]=XEmacs szövegszerkesztő -Name[is]=XEmacs-ritill -Name[it]=Emacs per X -Name[ja]=XEmacs テキスト・エディター -Name[mk]=Софистицираниот XEmacs уредувач -Name[no]=XEmacs-tekstredigerer -Name[pt]=Editor XEmacs -Name[ro]=Editorul XEmacs -Name[ru]=Редактор XEmacs -Name[sk]=Editor XEmacs -Name[sl]=Urejevalnik XEmacs -Name[uk]=Редактор XEmacs -GenericName=Text Editor -Comment=Edit text -Comment[zh_TW]=編輯文字 -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=xemacs %f -Icon=xemacs -Type=Application -Terminal=false -Categories=Application;Utility;TextEditor; -StartupWMClass=XEmacs diff --git a/xemacs.spec b/xemacs.spec deleted file mode 100644 index 32c9c3d..0000000 --- a/xemacs.spec +++ /dev/null @@ -1,1078 +0,0 @@ -# The garbage collector does not work with PIE -%undefine _hardened_build - -# TODO: review desktop entry associations (does text/* work?) -# TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el -# TODO: non-ASCII in buffer tabs - -%bcond_with gtk -%bcond_with wnn -%bcond_with xaw3d -%bcond_with xfs -%bcond_with xim -%bcond_without mule -%bcond_without nox -%ifarch ia64 -# no-expdyn-ia64 patch, https://bugzilla.redhat.com/show_bug.cgi?id=106744#c39 -%bcond_with modules -%else -%bcond_without modules -%endif - -%global snap 20200331hge2ac728aa576 - -Name: xemacs -Version: 21.5.34 -Release: 42%{?snap:.%{snap}}%{?dist} -Summary: Different version of Emacs - -%global majver %(cut -d. -f1-2 <<<%{version}) - -License: GPLv3+ -URL: http://www.xemacs.org/ -%if 0%{?snap:1} -Source0: %{name}-%{snap}.tar.xz -%else -Source0: http://ftp.xemacs.org/xemacs-%{majver}/xemacs-%{version}.tar.gz -%endif -Source1: %{name}.appdata.xml -Source2: xemacs.desktop -Source3: dotxemacs-init.el -Source4: default.el -Source5: xemacs-sitestart.el -Source6: gnuclient.desktop - -# Fedora-specific. Don't run the check-features Makefile target. It checks -# that necessary packages are installed, but they aren't installed while -# building an RPM. -Patch0: %{name}-21.5.25-mk-nochk-features.patch -# Experimental patch. Fix WNN support. This patch is no longer sufficient. -# WNN still doesn't work. -Patch1: %{name}-21.5.25-wnnfix-128362.patch -# Fedora-specific. Don't force ISO-8859 fonts. -Patch2: %{name}-21.5.34-utf8-fonts.patch -# Experimental patch, to be sent upstream eventually. Don't use -# -export-dynamic on IA64; leads to segfaults due to function pointer issues. -Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch -# Fedora-specific. Default to courier instead of lucidatypewriter. -Patch4: %{name}-21.5.28-courier-default.patch -# Fedora-specific. Recognize the Fedora X server. -Patch5: %{name}-21.5.29-x-server.patch -# Submitted upstream by Henry Thompson: fix playing sounds through ALSA -Patch6: %{name}-21.5.34-alsaplay.patch -# Submitted upstream 28 Dec 2017: do not rely on integer overflow wrapping -Patch7: %{name}-21.5.34-overflow.patch -# Submitted upstream 28 Dec 2017: better computation of data start address -Patch8: %{name}-21.5.34-data-start.patch -# Submitted upstream 22 Jul 2020: Use strsignal() in preference to sys_siglist -Patch9: %{name}-21.5.34-strsignal.patch -# Do not protect -specs=* with -Xlinker -Patch10: %{name}-21.5.34-xlinker.patch - -BuildRequires: compface-devel -BuildRequires: desktop-file-utils -%if %{with mule} -%if %{with wnn} -BuildRequires: FreeWnn-devel -%endif -%endif -BuildRequires: gcc -BuildRequires: gdbm-devel -BuildRequires: giflib-devel -BuildRequires: gmp-devel -BuildRequires: gpm-devel -BuildRequires: make -BuildRequires: openldap-devel -BuildRequires: pam-devel -BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(libjpeg) -BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libtiff-4) -BuildRequires: pkgconfig(ncurses) -BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(xau) -BuildRequires: pkgconfig(xft) -BuildRequires: pkgconfig(xpm) -BuildRequires: pkgconfig(zlib) -BuildRequires: texinfo -BuildRequires: xmkmf -%if %{with gtk} -BuildRequires: pkgconfig(gtk+-3.0) -%else -BuildRequires: xorg-x11-xbitmaps -%if %{with xaw3d} -BuildRequires: pkgconfig(xaw3d) -%else -BuildRequires: neXtaw-devel -%endif -%endif -# Note: no xemacs-packages-extra dependency here, need main pkg to build it. -Requires: xemacs-packages-base -Requires: %{name}-common = %{version}-%{release} -Requires: xorg-x11-fonts-ISO8859-1-75dpi -Requires: xorg-x11-fonts-ISO8859-1-100dpi -Requires: xorg-x11-fonts-misc -Requires(post): alternatives -Requires(post): coreutils -Requires(postun): alternatives -Requires(postun): coreutils -Provides: xemacs(bin) = %{version}-%{release} - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%global xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') -%global xbuild %(echo %{_build} | sed -e 's/^\\([^-]*-[^-]*-[^-]*\\).*/\\1/') - -%description -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains XEmacs built for X Windows%{?with_mule: with MULE support}. - -%package common -Summary: Lisp files and other common files for XEmacs -Requires: %{name}-filesystem = %{version}-%{release} -Requires(post): alternatives -Requires(preun): alternatives - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%description common -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains lisp and other common files for XEmacs. - -%package nox -Summary: Different version of Emacs built without X Windows support -# Note: no xemacs-packages* dependencies here, we need -nox to build the -# base package set. -Requires: %{name}-common = %{version}-%{release} -Requires(post): alternatives -Requires(post): coreutils -Requires(postun): alternatives -Provides: xemacs(bin) = %{version}-%{release} - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%description nox -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains XEmacs built without X Windows support. - -%package xft -Summary: Different version of Emacs built with Xft/fontconfig support -Requires: %{name}-common = %{version}-%{release} -Requires: xemacs-packages-base -Requires(post): alternatives -Requires(post): coreutils -Requires(postun): alternatives -Provides: xemacs(bin) = %{version}-%{release} - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%description xft -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains XEmacs built with Xft and fontconfig support. - -%package info -Summary: XEmacs documentation in GNU texinfo format -BuildArch: noarch -Requires(post): info -Requires(preun): info - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%description info -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains XEmacs documentation in GNU texinfo format. - -%package devel -Summary: Development files for XEmacs -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%description devel -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains XEmacs development support files. - -%package filesystem -Summary: XEmacs filesystem layout -BuildArch: noarch - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%description filesystem -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains directories that are required by other packages that -add functionality to XEmacs. - -%prep -%autosetup -p0 -n %{name}-%{?snap:beta}%{!?snap:%{version}} -find . -type f -name "*.elc" -o -name "*.info*" -delete -sed -i -e /tetris/d lisp/menubar-items.el - -sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new -touch -r lisp/setup-paths.el lisp/setup-paths.el.new -mv -f lisp/setup-paths.el.new lisp/setup-paths.el - -for f in man/internals/internals.texi man/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta -do - iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f - touch -r $f $f.utf8 - mv -f $f.utf8 $f -done - -# Get reproducible builds by setting the compiling username -mkdir ~/.xemacs -echo >> ~/.xemacs/custom.el << EOF -(custom-set-variables - '(user-mail-address "mockbuild@fedoraproject.org")) -EOF - - -%build -CFLAGS="%{build_cflags} -fno-strict-aliasing" -export CFLAGS -export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule -export LDFLAGS="%{build_ldflags}" - -# The --with-*dir args can probably go away in the future if/when upstream -# configure learns to honor standard autofoo dirs better. -common_options=" - --mandir=%{_mandir}/man1 - --with-archlibdir=%{_libdir}/xemacs-%{xver}/%{xbuild} -%if %{with modules} - --with-moduledir=%{_libdir}/xemacs-%{xver}/%{xbuild}/modules -%endif - --with-lispdir=%{_datadir}/xemacs-%{xver}/lisp - --with-etcdir=%{_datadir}/xemacs-%{xver}/etc - --with-system-packages=%{_datadir}/xemacs - --without-msw -%if %{with mule} - --with-mule - --with-unicode-internal - --without-canna -%endif - --with-clash-detection - --with-database=gdbm - --with-ldap - --without-postgresql - --with-mail-locking=lockf - --with-pop - --without-hesiod - --with-tls=openssl - --with-pdump -%if ! %{with modules} - --without-modules -%endif - --with-debug - --with-error-checking=none - --enable-bignum=gmp - --with-union-type -" - -%if %{with nox} -# build without X -%configure $common_options \ - --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox \ - --with-sound=none \ - --with-xim=no \ - --without-wnn \ - --without-x -make EMACSDEBUGPATHS=yes # toplevel parallel make fails -mv lib-src/DOC{,-nox} -mv src/xemacs{,-nox-%{xver}} -mv lib-src/config.values{,-nox} -mv Installation{,-nox} -%endif - -# build with Xft -%configure $common_options \ - --with-docdir=%{_libdir}/xemacs-%{xver}/doc-xft \ - --with-sound=nonative,alsa \ - --with-xft=all \ -%if %{with gtk} - --with-gtk \ - --with-gnome \ -%else - --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \ - --with-menubars=lucid \ - --with-widgets=athena \ - --with-dialogs=athena \ - --with-scrollbars=lucid \ - --with-xim=%{?with_xim:xlib}%{!?with_xim:no} \ -%endif -%if ! %{with wnn} - --without-wnn -%endif -make EMACSDEBUGPATHS=yes # toplevel parallel make fails -mv lib-src/DOC{,-xft} -mv src/xemacs{,-xft-%{xver}} -mv lib-src/config.values{,-xft} -mv Installation{,-xft} - -# build with X -%configure $common_options \ - --with-docdir=%{_libdir}/xemacs-%{xver}/doc \ - --with-sound=nonative,alsa \ -%if %{with xft} - --with-xft=all \ -%else -%if %{with xfs} - --with-xfs \ -%endif -%endif -%if %{with gtk} - --with-gtk \ - --with-gnome \ -%else - --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \ - --with-menubars=lucid \ - --with-widgets=athena \ - --with-dialogs=athena \ - --with-scrollbars=lucid \ - --with-xim=%{?with_xim:xlib}%{!?with_xim:no} \ -%endif -%if ! %{with wnn} - --without-wnn -%endif - -make EMACSDEBUGPATHS=yes # toplevel parallel make fails - -cat << \EOF > xemacs.pc -prefix=%{_prefix} -%if %{with modules} -includedir=%{_libdir}/xemacs-%{xver}/%{xbuild}/include -sitemoduledir=%{_libdir}/xemacs/site-modules -%endif -sitestartdir=%{_datadir}/xemacs/site-packages/lisp/site-start.d -sitepkglispdir=%{_datadir}/xemacs/site-packages/lisp - -Name: xemacs -Description: Different version of Emacs -Version: %{version} -%if %{with modules} -Cflags: -I${includedir} -%endif -EOF - -cat > macros.xemacs << EOF -%%_xemacs_version %{majver} -%%_xemacs_ev %{?epoch:%{epoch}:}%{version} -%%_xemacs_evr %{?epoch:%{epoch}:}%{version}-%{release} -%%_xemacs_sitepkgdir %{_datadir}/xemacs/site-packages -%%_xemacs_sitelispdir %{_datadir}/xemacs/site-packages/lisp -%%_xemacs_sitestartdir %{_datadir}/xemacs/site-packages/lisp/site-start.d -%%_xemacs_bytecompile /usr/bin/xemacs -q -no-site-file -batch -eval '(push "." load-path)' -f batch-byte-compile -%if %{with modules} -%%_xemacs_includedir %{_libdir}/xemacs-%{xver}/%{xbuild}/include -%%_xemacs_sitemoduledir %{_libdir}/xemacs/site-modules -%endif -EOF - -%install -%make_install - -# Compress the .el files -find %{buildroot}%{_datadir}/xemacs-%{xver} -name \*.el -exec gzip --best {} \+ - -%if %{with nox} -# install nox files -echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1 -install -pm 755 src/xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir} -ln -s xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-nox -install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox -install -pm 644 lib-src/DOC-nox \ - $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/DOC -install -pm 644 lib-src/config.values-nox \ - $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values -%endif - -# install xft files -echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-xft.1 -install -pm 755 src/xemacs-xft-%{xver} $RPM_BUILD_ROOT%{_bindir} -ln -s xemacs-xft-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-xft -install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft -install -pm 644 lib-src/DOC-xft \ - $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft/DOC -install -pm 644 lib-src/config.values-xft \ - $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft/config.values - -# these clash with GNU Emacs -mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs} -rm -f $RPM_BUILD_ROOT%{_bindir}/{ctags,rcs-checkin,b2m} -mv $RPM_BUILD_ROOT%{_mandir}/man1/etags{,.xemacs}.1 -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/ctags.1 -rm -f $RPM_BUILD_ROOT%{_infodir}/{cl,widget}.info* - -# these clash with other packages -rm -f $RPM_BUILD_ROOT%{_infodir}/info* -rm -f $RPM_BUILD_ROOT%{_infodir}/standards* -rm -f $RPM_BUILD_ROOT%{_infodir}/termcap* -rm -f $RPM_BUILD_ROOT%{_infodir}/dir - -desktop-file-install --mode=644 --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE2} - -desktop-file-install --mode=644 --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE6} - -# AppData file -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata - -# site-start.el -install -dm 755 \ - $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d -install -pm 644 %{SOURCE5} \ - $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.el - -# default.el -install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp - -# default user init file -install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el - -# icon -install -Dpm 644 etc/xemacs-icon.svg \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/xemacs.png - -# macro file -install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.%{name} - -# Empty directories for external packages to use -mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/etc -mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/info -mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lib-src -mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/man -mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/pkginfo - -# make sure nothing is 0400 -chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} -chmod a+x $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}%{_sysconfdir}/xemacs-fe.sh - -# clean up unneeded stuff (TODO: there's probably much more) -find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm -rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/%{xbuild}/gzip-el.sh -rm $RPM_BUILD_ROOT{%{_bindir}/gnuattach,%{_mandir}/man1/gnuattach.1} -pushd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc -rm -r InstallGuide tests XKeysymDB *.1 -popd - -# Generate file list and make site-packages lisp files config files. -# (Note: The double-quote before "(noreplace)" is only to work around -# a bug in rpm-spec-mode). -find $RPM_BUILD_ROOT \ - \( -path $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver} -o \ - -path $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/\* -o \ - -path $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/\* \) -a \ - \( \( -type d -not -name site-start.d -fprintf base-files "%%%%dir /%%P\n" \) -o \ - \( -type f -path $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/\*.el.gz -not -exec test -e {}c \; -fprintf base-files "%%%%config""(noreplace) /%%P\n" \) -o \ - \( -type f -fprintf base-files "/%%P\n" \) \) - -install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc - -%check -%make_build check - - -%post -%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ - %{_bindir}/xemacs-%{xver} 80 - -%postun -[ -e %{_bindir}/xemacs-%{xver} ] || \ -%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} - -%post nox -%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ - %{_bindir}/xemacs-nox-%{xver} 40 || : - -%postun nox -[ -e %{_bindir}/xemacs-nox-%{xver} ] || \ -%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || : - -%post xft -%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ - %{_bindir}/xemacs-xft-%{xver} 40 || : - -%postun xft -[ -e %{_bindir}/xemacs-xft-%{xver} ] || \ -%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-xft-%{xver} || : - -%post common -%{_sbindir}/alternatives --install %{_bindir}/etags etags \ - %{_bindir}/etags.xemacs 40 || : - -%preun common -[ $1 -ne 0 ] || \ -%{_sbindir}/alternatives --remove etags %{_bindir}/etags.xemacs || : - - -%files -%doc Installation -# gnuclient needs X libs, so not in -common -%{_bindir}/gnuclient -%{_bindir}/gnudoit -%ghost %{_bindir}/xemacs -%{_bindir}/xemacs-%{xver} -%{_libdir}/xemacs-%{xver}/doc/ -%{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/applications/%{name}.desktop -%{_datadir}/applications/gnuclient.desktop -%{_datadir}/icons/hicolor/scalable/apps/xemacs.png -%{_mandir}/man1/gnuclient.1* -%{_mandir}/man1/gnudoit.1* - -%if %{with nox} -%files nox -%doc Installation-nox -%ghost %{_bindir}/xemacs -%{_bindir}/xemacs-nox -%{_bindir}/xemacs-nox-%{xver} -%{_libdir}/xemacs-%{xver}/doc-nox/ -%{_mandir}/man1/xemacs-nox.1* -%endif - -%files xft -%doc Installation-xft -%ghost %{_bindir}/xemacs -%{_bindir}/xemacs-xft -%{_bindir}/xemacs-xft-%{xver} -%{_libdir}/xemacs-%{xver}/doc-xft/ -%{_mandir}/man1/xemacs-xft.1* - -%files common -f base-files -%doc INSTALL README PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL -%license COPYING -%{_bindir}/etags.xemacs -%{_bindir}/ootags -%{_bindir}/xemacs-script -%dir %{_libdir}/xemacs-%{xver}/ -%dir %{_libdir}/xemacs-%{xver}/%{xbuild}/ -%{_libdir}/xemacs-%{xver}/%{xbuild}/[acdfghprsvwy]* -%{_libdir}/xemacs-%{xver}/%{xbuild}/m[am]* -%{_libdir}/xemacs-%{xver}/%{xbuild}/movemail -%if %{with modules} -%{_libdir}/xemacs/ -%dir %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/ -%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.el -%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.elc -%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/eldap.ell -%endif -%{_rpmconfigdir}/macros.d/macros.%{name} -%config(noreplace) %{_sysconfdir}/skel/.xemacs/ -%{_mandir}/man1/etags.xemacs.1* -%{_mandir}/man1/gnuserv.1* -%{_mandir}/man1/xemacs.1* - -%files info -%license COPYING -%{_infodir}/*.info* - -%files devel -%if %{with modules} -%{_bindir}/ellcc -%{_libdir}/xemacs-%{xver}/%{xbuild}/include/ -%endif -%{_libdir}/pkgconfig/xemacs.pc - -%files filesystem -%dir %{_datadir}/xemacs -%dir %{_datadir}/xemacs/site-lisp -%dir %{_datadir}/xemacs/site-packages -%dir %{_datadir}/xemacs/site-packages/etc -%dir %{_datadir}/xemacs/site-packages/info -%dir %{_datadir}/xemacs/site-packages/lib-src -%dir %{_datadir}/xemacs/site-packages/lisp -%dir %{_datadir}/xemacs/site-packages/lisp/site-start.d -%dir %{_datadir}/xemacs/site-packages/man -%dir %{_datadir}/xemacs/site-packages/pkginfo - -%changelog -* Tue Sep 14 2021 Sahana Prasad - 21.5.34-42.20200331hge2ac728aa576 -- Rebuilt with OpenSSL 3.0.0 - -* Wed Aug 4 2021 Jerry James - 21.5.34-41.20200331hge2ac728aa576 -- Add -xlinker patch to fix link failure - -* Fri Jul 23 2021 Fedora Release Engineering - 21.5.34-40.20200331hge2ac728aa576 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 21.5.34-39.20200331hge2ac728aa576 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 21 2021 Jerry James - 21.5.34-38.20200331hge2ac728aa576 -- Mark as deprecated (bz 1916926) - -* Wed Jul 29 2020 Fedora Release Engineering - 21.5.34-38.20200331hge2ac728aa576 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 22 2020 Jerry James - 21.5.34-37.20200331hge2ac728aa576 -- Update to latest mercurial snapshot for miscellaneous bug fixes -- Add -strsignal patch to fix build with latest glibc - -* Tue Jul 14 2020 Tom Stellard - 21.5.34-36.20190323hgc0ed7ef9a5a1 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Fri Jan 31 2020 Fedora Release Engineering - 21.5.34-35.20190323hgc0ed7ef9a5a1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Jan 28 2020 Jerry James - 21.5.34-3420190323hgc0ed7ef9a5a1 -- Replace libdb with gdbm -- Use pkgconfig BRs - -* Sat Jul 27 2019 Fedora Release Engineering - 21.5.34-34.20190323hgc0ed7ef9a5a1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190323hgc0ed7ef9a5a1 -- Obsolete -el subpackage -- Remove needless use of %%defattr -- Simplify generation of file list -- Enable test suite - -* Thu Mar 21 2019 Jerry James - 21.5.34-33.20190323hgc0ed7ef9a5a1 -- Update to latest mercurial snapshot for miscellaneous bug fixes -- Switch from NSS to OpenSSL -- Build with openldap support -- Compress the Lisp source files - -* Sun Feb 03 2019 Fedora Release Engineering - 21.5.34-32.20171230hg92757c2b8239 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Oct 14 2018 Peter Robinson 21.5.34-31.20171230hg92757c2b8239 -- Update alternatives dep - -* Sat Jul 14 2018 Fedora Release Engineering - 21.5.34-30.20171230hg92757c2b8239 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Mar 3 2018 Jerry James - 21.5.34-29.20171230hg92757c2b8239 -- Update to latest mercurial snapshot for miscellaneous bug fixes -- Remove obsolete scriptlets -- Drop upstreamed -endian, -gcpro, and -format-overflow patches -- Install a scalable icon - -* Sun Feb 11 2018 Sandro Mani - 21.5.34-28.20171227hg27f66ce6ab71 -- Rebuild (giflib) - -* Fri Feb 09 2018 Fedora Release Engineering - 21.5.34-27.20171227hg27f66ce6ab71 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Dec 28 2017 Jerry James - 21.5.34-26.20171227hg27f66ce6ab71 -- Update to latest mercurial snapshot for Unicode support -- Add -gcpro patch to fix FTBFS -- Add -overflow patch to fix possible bad code generation -- Add -data-start patch to fix FTBFS on ppc64/ppc64le -- Add -endian patch to fix FTBFS on ppc64/s390x - -* Tue Nov 28 2017 Jerry James - 21.5.34-26.20171125hg700dd03e6a31 -- Update to latest mercurial snapshot for miscellaneous bug fixes -- Drop Canna support (bz 1517235) - -* Sat Aug 5 2017 Jerry James - 21.5.34-25.20170628hg97140cfdeca7 -- Update to latest mercurial snapshot for miscellaneous bug fixes - -* Thu Aug 03 2017 Fedora Release Engineering - 21.5.34-24.20170124hgf412e9f093d4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 21.5.34-23.20170124hgf412e9f093d4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Feb 22 2017 Jerry James - 21.5.34-22.20170124hgf412e9f093d4 -- Rebuild for NSS 3.29.1 - -* Sat Feb 11 2017 Fedora Release Engineering - 21.5.34-21.20170124hgf412e9f093d4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 24 2017 Jerry James - 21.5.34-20.20170124hgf412e9f093d4 -- Update to latest mercurial snapshot to really fix bz 1408201 -- Drop upstreamed -with-output-to-string patch - -* Sat Jan 14 2017 Jerry James - 21.5.34-19.20170114hg29e551281d78 -- Update to latest mercurial snapshot (bz 1408201) -- Use glibc malloc on all platforms -- Add -with-output-to-string patch - -* Tue Oct 18 2016 Jerry James - 21.5.34-18.20161013hg39f002ba1b8c -- Update to latest mercurial snapshot - -* Fri Jun 3 2016 Jerry James - 21.5.34-17.20160603hga561e02bb626 -- Update to fix NSS breakage -- Drop upstreamed -tls and -setsid patches - -* Sat May 28 2016 Jerry James - 21.5.34-16.20160507hgd5b51c618ef8 -- Update to latest mercurial snapshot -- Fix M-x shell under tcsh (bz 1222897, 1260785) - -* Sat Feb 20 2016 Jerry James - 21.5.34-15.20160104hg4d03958b4080 -- Update to latest mercurial snapshot - -* Fri Feb 05 2016 Fedora Release Engineering - 21.5.34-14.20150929hga76c9268bb72 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Dec 30 2015 Michal Toman - 21.5.34-13.20150929hga76c9268bb72 -- Use system malloc on 32-bit MIPS (bz 1294893) - -* Sat Oct 3 2015 Jerry James - 21.5.34-12.20150929hga76c9268bb72 -- Update to snapshot: fixes multiple bugs -- Add -alsaplay patch to fix playing sounds through ALSA - -* Fri Jun 19 2015 Fedora Release Engineering - 21.5.34-11.20150420hg23178aa71f8b -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Apr 20 2015 Jerry James - 21.5.34-10.20150420hg23178aa71f8b -- Update to snapshot: fixes multiple bugs -- Drop upstreamed -c11 patch -- Enable NSS support - -* Mon Feb 9 2015 Jerry James - 21.5.34-9.20140605hgacf1c26e3019 -- Add -c11 patch to fix build failure with gcc 5.0 -- Set compiling username to get reproducible builds -- Use license macro - -* Mon Aug 18 2014 Fedora Release Engineering - 21.5.34-8.20140605hgacf1c26e3019 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 21.5.34-7.20140605hgacf1c26e3019 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jun 5 2014 Jerry James - 21.5.34-6.20140605hgacf1c26e3019 -- Update to snapshot: fixes bz 1095405 and allows diagnosis of bz 1078159 -- Update snapshot creating script to use bitbucket and maximally compress -- Don't need to exclude texinfo info files; upstream has dropped them - -* Wed Feb 5 2014 Jerry James - 21.5.34-5 -- Disable XIM by default. It hasn't worked since the release of Fedora 19 due - to a fixed size buffer inside libX11 that is too small (see _XimProtoCreateIC - in modules/im/ximcp/imDefIc.c), and nobody has complained. -- Update location of rpm macro file for rpm >= 4.11 - -* Tue Nov 12 2013 Jerry James - 21.5.34-4 -- Add an AppData file - -* Fri Oct 25 2013 Jerry James - 21.5.34-3 -- Update the -utf8-fonts patch to remove more references to iso8859 fonts - -* Wed Oct 2 2013 Jerry James - 21.5.34-2 -- Don't package the texinfo info files; they clash with texinfo 5.2 - -* Thu Aug 22 2013 Jerry James - 21.5.34-1 -- New upstream version -- Drop upstreamed -menubar, -aarch64, and -texinfo patches -- Drop unnecessary sed BR - -* Sun Aug 04 2013 Fedora Release Engineering - 21.5.33-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jun 19 2013 Jerry James - 21.5.33-6 -- Rebuild for libpng 1.6 - -* Mon Apr 8 2013 Jerry James - 21.5.33-5 -- Add -texinfo patch to fix problems with texinfo 5 (bz 923365) -- Add -aarch64 patch (bz 926766) -- Build with libdb version 5 -- Emacs started shipping cl and widget info files, so we drop them - -* Tue Feb 5 2013 Jerry James - 21.5.33-4 -- Update -menubar patch so :visible keyword is accepted in menus (bz 890565) - -* Mon Jan 21 2013 Jerry James - 21.5.33-3 -- Add -menubar patch to fix bz 890565 - -* Mon Jan 21 2013 Adam Tkac - 21.5.33-2 -- rebuild due to "jpeg8-ABI" feature drop - -* Mon Jan 7 2013 Jerry James - 21.5.33-1 -- New upstream version -- Drop upstreamed view-mode patch - -* Fri Dec 21 2012 Adam Tkac - 21.5.32-2 -- rebuild against new libjpeg - -* Mon Aug 6 2012 Jerry James - 21.5.32-1 -- New upstream version -- Drop upstreamed patches -- Running autoconf no longer necessary -- Drop conditionals for ancient versions of Fedora -- Package X versions of lib-src binaries to get gnuclient linked with -lXau - -* Sun Jul 22 2012 Fedora Release Engineering - 21.5.31-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 7 2012 Jerry James - 21.5.31-4 -- Rebuild for GCC 4.7 -- Minor spec file cleanups - -* Mon Nov 7 2011 Jerry James - 21.5.31-3 -- Rebuild with new libpng - -* Wed Oct 26 2011 Marcela Mašláňová - 21.5.31-2.2 -- rebuild with new gmp without compat lib - -* Wed Oct 12 2011 Peter Schiffer - 21.5.31-2.1 -- rebuild with new gmp - -* Fri Aug 5 2011 Jerry James - 21.5.31-2 -- Build --with-union-type to avoid a make-int bug in lisp-disunion.h -- Add view-mode patch (bz 709399) -- Add get-other-frame patch from upstream -- Add lib-src patch to eliminate unnecessary linkage - -* Tue May 3 2011 Jerry James - 21.5.31-1 -- Update to 21.5.31 -- License is now GPLv3+ -- Drop upstreamed patches: x-paths, image-overflow, no-xft, png, tty-font, - etags-memmove, arabic, dired, infodir -- Rebase and renumber remaining patches -- Drop workaround for ancient alternatives bug - -* Tue Mar 1 2011 Jerry James - 21.5.29-18 -- Make -filesystem subpackage be noarch. - -* Tue Mar 1 2011 Jerry James - 21.5.29-17 -- Add filesystem subpackage (bz 672093). -- Add gnuclient desktop file. -- Fix CFLAGS so -fno-strict-aliasing actually gets used. -- Add . to the default load-path in _xemacs_bytecompile. -- Update Requires for pre/post(un) scripts. - -* Mon Feb 07 2011 Fedora Release Engineering - 21.5.29-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Dec 1 2010 Jerry James - 21.5.29-15 -- Don't create /var/lock/xemacs; it is not used (bz 656723). -- Drop the BuildRoot tag. -- Ship COPYING with the -info subpackage. - -* Wed Nov 10 2010 Jerry James - 21.5.29-14 -- Create and own subdirectories of site-packages - -* Tue Jul 6 2010 Jerry James - 21.5.29-13 -- Add db4 support (bz 581614). -- Add -xft subpackage (bz 356961). -- Recognize Fedora's X server. - -* Tue Mar 2 2010 Jerry James - 21.5.29-12 -- Remove the bitmap-fonts dependency. - -* Thu Jan 7 2010 Jerry James - 21.5.29-11 -- New upstream patch for bz 547840. -- Add dired patch for large files (bz 550145). -- Replace "lzma" with "xz" for snapshots. - -* Mon Dec 21 2009 Jerry James - 21.5.29-10 -- Don't crash with a Persian keyboard layout (bz 547840) - -* Tue Dec 8 2009 Jerry James - 21.5.29-9 -- Add patch to use memmove in etags (bz 545399). - -* Mon Nov 9 2009 Jerry James - 21.5.29-8 -- Move macros.xemacs to the -common subpackage (bz 533611). -- Updated TTY font patch from upstream. - -* Tue Nov 3 2009 Jerry James - 21.5.29-7 -- Make the desktop file consistent with Emacs (bz 532296). - -* Wed Oct 28 2009 Jerry James - 21.5.29-6 -- Bring back the courier font patch; that was a red herring. -- Really, seriously fix bz 512623 with a TTY font patch. -- Fix the version number in macros.xemacs. -- Build with bignum support. -- Turn off OSS support. - -* Wed Sep 23 2009 Jerry James - 21.5.29-5 -- Final fix for bz 512623, which is actually two bugs, because ... -- ... the courier font patch breaks TTY font detection. Removed that patch - and Require bitmap-fonts to supply the original font name. -- Add macros.xemacs (bz 480546) -- Add png patch to fix a problem with reading PNG files - -* Wed Aug 26 2009 Jerry James - 21.5.29-4 -- Use upstream's attempt at fixing #512623 instead of mine, which didn't work. - -* Mon Aug 24 2009 Jerry James - 21.5.29-3 -- Fix image overflow bug (CVE-2009-2688). -- Fix calling xft-font-create-object in non-Xft builds (#512623). -- Rebase patches to eliminate fuzz/offsets. - -* Mon Jul 27 2009 Fedora Release Engineering - 21.5.29-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed May 20 2009 Ville Skyttä - 21.5.29-1 -- Update to 21.5.29; gtk-gcc4, finder-lisp-dir, 3d-athena, autoconf262, - doc-encodings, revert-modified, and xemacs-base-autoloads patches applied - upstream. - -* Thu Mar 12 2009 Ville Skyttä - 21.5.28-13 -- Add possibility to build upstream hg snapshots. -- Add dependency on xorg-x11-fonts-misc (#478370, Carl Brune). -- Include Installation{,-nox} in docs. - -* Sun Mar 8 2009 Ville Skyttä - 21.5.28-12 -- Make XFontSet support optional at build time and disable it by default - to work around #478370. - -* Thu Feb 26 2009 Ville Skyttä - 21.5.28-11 -- Apply upstream autoload changes to be able to build recent XEmacs packages. -- Make support for XIM optional at build time, still enabled by default. -- Drop support for building without stack protector compiler flags. -- Make -info subpackage noarch when built for Fedora >= 10. -- Improve icon cache and desktop database refresh scriptlets. -- Use %%global instead of %%define. - -* Thu Feb 26 2009 Fedora Release Engineering - 21.5.28-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Jul 20 2008 Ville Skyttä - 21.5.28-9 -- Rebuild. - -* Sun Jul 6 2008 Ville Skyttä - 21.5.28-8 -- Apply upstream fix for detection of 3D Athena widget sets. - -* Sun Jul 6 2008 Ville Skyttä - 21.5.28-7 -- Fix build with autoconf >= 2.62 (#449626). - -* Tue Feb 19 2008 Fedora Release Engineering - 21.5.28-6 -- Autorebuild for GCC 4.3 - -* Fri Aug 17 2007 Ville Skyttä - 21.5.28-5 -- Turn on syntax highlighting by default only if lazy-lock is available. -- Requires(post): coreutils in main package and -nox. -- Scriptlet cleanups. -- License: GPLv2+ - -* Sat Jun 30 2007 Ville Skyttä - 21.5.28-4 -- Turn on syntax highlighting with lazy-lock by default. -- Drop Application and X-Fedora categories and Encoding from desktop entry. -- Move diff-switches default from skeleton init.el to site-start.el. - -* Sun Jun 24 2007 Ville Skyttä - 21.5.28-3 -- Apply upstream fix for #245017. - -* Wed Jun 6 2007 Ville Skyttä - 21.5.28-2 -- Set more dirs explicitly until upstream configure honors them better. -- Borrow DESTDIR install patch from openSUSE. -- Add pkgconfig file to -devel. - -* Mon May 21 2007 Ville Skyttä - 21.5.28-1 -- 21.5.28, module path fix applied upstream. -- Patch to retain courier as the default font. -- Fix some corrupt characters in docs. - -* Fri May 18 2007 Ville Skyttä - 21.5.27-9 -- Require one of the actual editor variants in -common. -- Require -common in -el, drop duplicate dir ownerships. - -* Wed Jan 24 2007 Ville Skyttä - 21.5.27-8 -- Fix canna_api.ell install/load paths (#222559). -- Fix site-start.el locale setup when the LANG env var is unset. - -* Thu Jan 4 2007 Ville Skyttä - 21.5.27-7 -- Don't run autoconf during build. - -* Wed Jan 3 2007 Ville Skyttä - 21.5.27-6 -- Fix site-start.el coding system setup in non-UTF8 locales (#213582). -- Fix "--without modules" build. - -* Mon Oct 2 2006 Ville Skyttä - 21.5.27-5 -- Rebuild. - -* Wed Sep 20 2006 Ville Skyttä - 21.5.27-4 -- Disable graphical progress bar by default (#188973). -- Make Wnn support optional at build time, disabled by default. - -* Sun Sep 10 2006 Ville Skyttä - 21.5.27-3 -- Adjust to split xemacs-packages-{base,extra}. -- Provide xemacs(bin) in main package and -nox. - -* Sat Sep 2 2006 Ville Skyttä - 21.5.27-2 -- Fix build when previous revision of the same XEmacs version is installed. -- BuildRequire compface-devel instead of compface. -- Turn error checking off. -- Specfile cleanups. - -* Tue May 16 2006 Ville Skyttä - 21.5.27-1 -- 21.5.27, maximize patch included upstream. -- Drop no longer needed find-paths patch. -- Fix alternatives setup. - -* Sun May 7 2006 Ville Skyttä - 21.5.26-5 -- Apply upstream fix for window maximization problems (#111225). - -* Sun Apr 23 2006 Ville Skyttä - 21.5.26-4 -- Bring StartupWMClass in desktop entry up to date. -- Fix non-MULE build. - -* Sat Apr 15 2006 Ville Skyttä - 21.5.26-3 -- Don't expect to find ellcc if building without modules (#188929). -- New --with/--without rpmbuild flags: - - xft: enable/disable Xft support, default disabled. - - nox: enable/disable building the non-X version, default enabled - - modules: enable/disable module support, default arch-dependent. -- Re-enable XFontSet support for menubars for non-Xft builds (from openSUSE). -- Move gnuserv to -common, gnudoit to base package, drop gnuattach. -- Split ellcc and headers to -devel subpackage. -- Drop unneeded libXaw-devel build dependency. -- Move -nox "man page" to -nox subpackage. -- Fix GTK build and glade detection for it. -- Avoid -common dependency on ALSA. - -* Thu Apr 6 2006 Ville Skyttä - 21.5.26-2 -- Borrow Mike Fabian's site-start.el work from the SuSE package. - -* Tue Apr 4 2006 Ville Skyttä - 21.5.26-1 -- 21.5.26 (WIP). -- Make %%{_bindir}/xemacs an alternative (main/nox). -- Convert some info docs to UTF-8. - -* Fri Mar 31 2006 Ville Skyttä - 21.5.25-1 -- 21.5.25 (WIP). -- Trim pre-21.5 %%changelog entries.