Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at Thu Feb 25 11:16:02 CET 2010. -------- --- emacs/emacs.changes 2010-02-09 17:04:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/emacs/emacs.changes 2010-02-24 19:14:07.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 24 18:13:47 UTC 2010 - coolo@novell.com + +- apply patch from cvs to fix build with gcc 4.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- emacs-23.1-fix_cpp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.tZ9ptn/_old 2010-02-25 11:15:50.000000000 +0100 +++ /var/tmp/diff_new_pack.tZ9ptn/_new 2010-02-25 11:15:50.000000000 +0100 @@ -24,7 +24,7 @@ License: GPLv2+ Group: Productivity/Editors/Emacs Version: 23.1 -Release: 7 +Release: 8 Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc Requires: emacs-info = %{version} Requires: emacs_program = %{version}-%{release} @@ -57,6 +57,7 @@ Patch16: emacs-23.1-flyspell.patch Patch17: emacs-23.1-bnc558884.patch Patch18: emacs-sparc.diff +Patch19: emacs-23.1-fix_cpp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global bug_345669 0 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} @@ -243,6 +244,7 @@ %patch15 -p0 -b .iconic %patch16 -p0 -b .flyspell %patch17 -p0 -b .gtkmenus +%patch19 -p1 -b .configure %patch if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then install-mh -auto < /dev/null ++++++ emacs-23.1-fix_cpp.patch ++++++ 2009-10-23 Jim Meyering <meyering@redhat.com> * configure.in: Invoke $CPP with -P when creating Makefile and src/Makefile. Without this, gcc 4.4.2 converts each backslash-newline pair in the input to a bare newline, yielding invalid Makefiles. --- emacs-23.1.orig/configure.in 2010-02-24 18:49:14.000000000 +0100 +++ emacs-23.1/configure.in 2010-02-24 18:51:16.000000000 +0100 @@ -2984,7 +2984,7 @@ echo creating lib-src/Makefile sed -e '1,/start of cpp stuff/d'\ -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ < Makefile.c > junk.c - $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ + $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c cat junk1.c junk2.c > Makefile.new rm -f junk.c junk1.c junk2.c @@ -3000,7 +3000,7 @@ echo creating src/Makefile sed -e '1,/start of cpp stuff/d'\ -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ < Makefile.c > junk.c - $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ + $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c cat junk1.c junk2.c > Makefile.new rm -f junk.c junk1.c junk2.c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org