[packages/xemacs] - rel 6; drop files conflicting with emacs-common; fix build

[arekm]

commit e59b6d615b665309ab8820b15d0bf22b086be4ee
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Oct 19 16:55:56 2019 +0200

    - rel 6; drop files conflicting with emacs-common; fix build

 xemacs-align.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
 xemacs.spec        | 13 ++++++++++---
 2 files changed, 52 insertions(+), 3 deletions(-)
---
diff --git a/xemacs.spec b/xemacs.spec
index 5a2c653..e02d94c 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -17,7 +17,7 @@ Summary(ru.UTF-8):	Версия GNU Emacs для X Window System
 Summary(uk.UTF-8):	Версія GNU Emacs для X Window System
 Name:		xemacs
 Version:	%{ver}.%{sver}
-Release:	5
+Release:	6
 License:	GPL
 Group:		Applications/Editors/Emacs
 Source0:	http://ftp.xemacs.org/xemacs/xemacs-%{ver}/%{name}-%{version}.tar.gz
@@ -32,6 +32,7 @@ Source7:	%{name}-ogony-nomule.el
 Source8:	%{name}.png
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-fix_ldflafs.patch
+Patch2:		%{name}-align.patch
 Patch3:		%{name}-no-memory-warnings.patch
 Patch6:		%{name}-do-not-create-backups-in-temp-directories.patch
 Patch7:		%{name}-level3.patch
@@ -173,6 +174,7 @@ w okienku xterma).
 %setup -q -a2
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %ifarch alpha ia64
 # disable memory_warnings() - it doesn't support memory model used on alpha
 %patch3 -p1
@@ -243,7 +245,8 @@ export CFLAGS CPPFLAGS LDFLAGS
 	--without-msw \
 	--disable-kkcc \
 	--with-error-checking=none \
-	--with-debug=no
+	--with-debug=no \
+	--with-system-malloc
 
 
 %{__make} -j1 \
@@ -305,8 +308,9 @@ cp lib-src/gnuserv lib-src/gnuserv-nox
 	--with-error-checking=none \
 	--with-debug=no \
 %if !%{with pdump}
-	--pdump=no
+	--pdump=no \
 %endif
+	--with-system-malloc
 
 
 # if you want to xemacs sings and plays sounds add option
@@ -383,6 +387,9 @@ rm -rf	$RPM_BUILD_ROOT%{_libdir}/%{name}-%{xver}/*-linux/include \
 	$RPM_BUILD_ROOT%{_infodir}/dir* \
 	$RPM_BUILD_ROOT%{_infodir}/{info,standards,texinfo}.info*
 
+# clash with emacs
+rm -f $RPM_BUILD_ROOT%{_infodir}/{cl,widget}.info*
+
 find $RPM_BUILD_ROOT -regex '.*~$' -exec rm -f {} \;
 
 %clean
diff --git a/xemacs-align.patch b/xemacs-align.patch
new file mode 100644
index 0000000..9c03d19
--- /dev/null
+++ b/xemacs-align.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User Jerry James <james at xemacs.org>
+# Date 1429564151 21600
+# Node ID 23178aa71f8b985a32f9b80e5c6da660700a0315
+# Parent  d3d073aceaea16ee1625363380337b3dad916861
+Define ALIGNOF using C11 and C++11 operators.
+See <CAHCOHQmG51R61KwGUNY7T5t9tXxzbyg=aGijUKYstbE+wL2-6Q at mail.gmail.com> in
+xemacs-patches for more information.
+
+diff --git a/src/lisp.h b/src/lisp.h
+--- a/src/lisp.h
++++ b/src/lisp.h
+@@ -1154,6 +1154,8 @@
+ 
+ /* ------------------------ alignment definitions ------------------- */
+ 
++#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \
++    (!defined (__cplusplus) || __cplusplus < 201103L)
+ /* 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 +1165,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 +1173,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)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xemacs.git/commitdiff/e59b6d615b665309ab8820b15d0bf22b086be4ee