Hello community, here is the log from the commit of package xemacs for openSUSE:Factory checked in at 2017-03-24 02:22:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xemacs (Old) and /work/SRC/openSUSE:Factory/.xemacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xemacs" Fri Mar 24 02:22:08 2017 rev:86 rq:481689 version:21.5.34 Changes: -------- --- /work/SRC/openSUSE:Factory/xemacs/xemacs.changes 2015-11-28 20:10:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xemacs.new/xemacs.changes 2017-03-24 02:22:11.719473743 +0100 @@ -1,0 +2,5 @@ +Mon Mar 20 15:21:17 UTC 2017 - [email protected] + +- Add patch xemacs-21.5.34-sbrk.patch to avoid redefinition of sbrk + +------------------------------------------------------------------- New: ---- xemacs-21.5.34-sbrk.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs.spec ++++++ --- /var/tmp/diff_new_pack.7ZOM2Q/_old 2017-03-24 02:22:12.899306804 +0100 +++ /var/tmp/diff_new_pack.7ZOM2Q/_new 2017-03-24 02:22:12.899306804 +0100 @@ -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 @@ 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 @@ %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 @@ %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 @@ --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 ++++++ xemacs-21.5.34-sbrk.patch ++++++ --- 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
