Accepting request 481689 from M17N

- Add patch xemacs-21.5.34-sbrk.patch to avoid redefinition of sbrk

OBS-URL: https://build.opensuse.org/request/show/481689
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xemacs?expand=0&rev=86

xemacs-21.5.34-sbrk.patch

@@ -0,0 +1,21 @@
+--- src/gmalloc.c
++++ src/gmalloc.c	2017-03-20 15:02:35.000000000 +0000
+@@ -1199,18 +1199,6 @@ along with the GNU C Library.  If not, s
+ #include <malloc.h>
+ #endif
+ 
+-/* #ifndef	__GNU_LIBRARY__ */
+-#define	__sbrk	sbrk
+-/* #endif */
+-
+-#ifdef __GNU_LIBRARY__
+-/* It is best not to declare this and cast its result on foreign operating
+-   systems with potentially hostile include files.  */
+-#if !(defined(linux) && defined(sparc))
+-extern __ptr_t __sbrk __P ((int increment));
+-#endif
+-#endif
+-
+ #ifndef NULL
+ #define NULL 0
+ #endif

xemacs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 20 15:21:17 UTC 2017 - werner@suse.de
+
+- Add patch xemacs-21.5.34-sbrk.patch to avoid redefinition of sbrk
+
 -------------------------------------------------------------------
 Fri Nov 27 13:35:03 UTC 2015 - werner@suse.de
 

xemacs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xemacs
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -96,6 +96,8 @@ Patch57:        xemacs-21.5.34-Xaw3D_I18N.patch
 Patch58:        xemacs-21.5.34-custom-fonts.patch
 # PATCH-FIX-SUSE do wait on alsa
 Patch59:        xemacs-21.5.34-alsaplay.patch
+# PATCH-FIX-SUSE avoid redefinition of sbrk
+Patch60:        xemacs-21.5.34-sbrk.patch
 Requires(pre):  permissions
 Requires:       ctags
 Requires:       efont-unicode
@@ -188,6 +190,7 @@ echo Use xfs, that is XFontSet support for internationalized menubar.
 %patch57 -p0
 %patch58 -p0
 %patch59 -p1
+%patch60 -p0
 %patch0 -p1
 find lisp/ etc/ -name '*.elc' | xargs -r rm -f
 find . -name CVS -type d | xargs rm -rf
@@ -306,6 +309,9 @@ SPECIAL="--with-database=berkdb,gdbm \
 %if %kkcc_broken
 	 --disable-kkcc \
 %endif
+%if 0%{?suse_version} > 1320
+	 --with-system-malloc \
+%endif
 %ifnarch s390
 	 --enable-sound=native \
 	 --with-gpm \
@@ -372,6 +378,12 @@ COMP="--with-gcc \
       --with-cflags=\"${CFLAGS}\" \
 "
 eval ./configure $SYS $COMP $PREFIX $SPECIAL $X11 $MULE $FONTS $MAIL
+if grep -q _DEFAULT_SOURCE /usr/include/features.h ; then
+    sed -ri '/^(#[[:blank:]]*define[[:blank:]]+_(BSD|SVID)_SOURCE)/{
+	s/_BSD_SOURCE/_DEFAULT_SOURCE/
+	s/_SVID_SOURCE/_DEFAULT_SOURCE/
+    }' src/config.h
+fi
 make %{?_smp_mflags}
 
 %install