jjames pushed to xemacs (master). "Update to snapshot: fixes multiple bugs. (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 20 23:14:56 UTC 2015
>From ac99c27d0e311f73ae0cba7e741218107586407a Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry at gmail.com>
Date: Mon, 20 Apr 2015 17:14:33 -0600
Subject: Update to snapshot: fixes multiple bugs.
Also:
- Drop upstreamed -c11 patch.
- Enable NSS support.
diff --git a/.gitignore b/.gitignore
index 36a65a5..6fffc09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/xemacs-21.5.34.tar.gz
/xemacs-20140605hgacf1c26e3019.tar.xz
+/xemacs-20150420hg23178aa71f8b.tar.xz
diff --git a/sources b/sources
index 04c7317..aec377b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-acbecd8dd6a032de44bcdb69b51d5708 xemacs-20140605hgacf1c26e3019.tar.xz
+dcb37b2e5ead9980e4a935c9a98b7058 xemacs-20150420hg23178aa71f8b.tar.xz
diff --git a/xemacs-21.5.34-c11.patch b/xemacs-21.5.34-c11.patch
deleted file mode 100644
index fef4dd5..0000000
--- a/xemacs-21.5.34-c11.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/lisp.h.orig 2014-06-05 09:02:17.000000000 -0600
-+++ src/lisp.h 2015-02-09 12:30:00.000000000 -0700
-@@ -1154,6 +1154,9 @@
-
- /* ------------------------ alignment definitions ------------------- */
-
-+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ < 201112L) || \
-+ (defined (__cplusplus) && __cplusplus < 201103L) || \
-+ (! defined (__STDC_VERSION__) && ! defined (__cplusplus))
- /* No type has a greater alignment requirement than max_align_t.
- (except perhaps for types we don't use, like long double) */
- typedef union
-@@ -1163,6 +1166,7 @@
- struct { void (*f)(void); } f;
- struct { double d; } d;
- } max_align_t;
-+#endif
-
- /* ALIGNOF returns the required alignment of a type -- i.e. a value such
- that data of this type must begin at a memory address which is a
-@@ -1170,7 +1174,11 @@
- as the type itself. */
-
- #ifndef ALIGNOF
--# if defined (__GNUC__) && (__GNUC__ >= 2)
-+# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-+# define ALIGNOF(type) _Alignof(type)
-+# elif defined (__cplusplus) && __cplusplus >= 201103L
-+# define ALIGNOF(type) alignof(type)
-+# elif defined (__GNUC__) && (__GNUC__ >= 2)
- /* gcc has an extension that gives us exactly what we want. */
- # define ALIGNOF(type) __alignof__ (type)
- # elif ! defined (__cplusplus)
diff --git a/xemacs.appdata.xml b/xemacs.appdata.xml
index ca12e2e..b623940 100644
--- a/xemacs.appdata.xml
+++ b/xemacs.appdata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<application>
<id type="desktop">xemacs.desktop</id>
- <licence>CC0</licence>
+ <metadata_license>CC0</metadata_license>
+ <project_license>GPL-3.0+</project_license>
+ <name>XEmacs</name>
+ <summary>Different version of Emacs</summary>
<description>
<p>
XEmacs is a highly customizable open source text editor and application
diff --git a/xemacs.spec b/xemacs.spec
index b813691..f7fd4a8 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -1,3 +1,6 @@
+# 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
@@ -16,11 +19,11 @@
%bcond_without modules
%endif
-%global snap 20140605hgacf1c26e3019
+%global snap 20150420hg23178aa71f8b
Name: xemacs
Version: 21.5.34
-Release: 9%{?snap:.%{snap}}%{?dist}
+Release: 10%{?snap:.%{snap}}%{?dist}
Summary: Different version of Emacs
%global majver %(cut -d. -f1-2 <<<%{version})
@@ -57,12 +60,11 @@ Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch
Patch4: %{name}-21.5.28-courier-default.patch
# Fedora-specific. Recognize the Fedora X server.
Patch5: %{name}-21.5.29-x-server.patch
-# To be sent upstsream: adapt to changes in C11
-Patch6: %{name}-21.5.34-c11.patch
BuildRequires: texinfo
BuildRequires: ncurses-devel
BuildRequires: gpm-devel
+BuildRequires: nss-devel
BuildRequires: pam-devel
BuildRequires: zlib-devel
BuildRequires: libjpeg-devel
@@ -238,7 +240,6 @@ add functionality to XEmacs.
%prep
%setup -q -n %{name}-%{?snap:beta}%{!?snap:%{version}}
find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f
-rm -f configure.in
sed -i -e /tetris/d lisp/menubar-items.el
%patch0
%patch1
@@ -246,13 +247,13 @@ sed -i -e /tetris/d lisp/menubar-items.el
%patch3
%patch4
%patch5
-%patch6
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/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta ; do
+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
@@ -298,6 +299,7 @@ common_options="
--with-mail-locking=lockf
--with-pop
--without-hesiod
+ --with-tls=nss \
%ifarch alpha ia64 ppc64
--with-system-malloc
%endif
@@ -669,6 +671,11 @@ fi
%dir %{_datadir}/xemacs/site-packages/pkginfo
%changelog
+* Mon Apr 20 2015 Jerry James <loganjerry at gmail.com> - 21.5.34-10.20150420hg23178aa71f8b
+- Update to snapshot: fixes multiple bugs
+- Drop upstreamed -c11 patch
+- Enable NSS support
+
* Mon Feb 9 2015 Jerry James <loganjerry at gmail.com> - 21.5.34-9.20140605hgacf1c26e3019
- Add -c11 patch to fix build failure with gcc 5.0
- Set compiling username to get reproducible builds
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xemacs.git/commit/?h=master&id=ac99c27d0e311f73ae0cba7e741218107586407a
More information about the scm-commits
mailing list