From 5c909ca26fa06a66452304643ff4627336e42cca407567ae260d21972a315dd0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 25 Feb 2010 07:42:29 +0000 Subject: [PATCH 1/3] Accepting request 33402 from home:coolo:branches:openSUSE:Factory Copy from home:coolo:branches:openSUSE:Factory/emacs via accept of submit request 33402 revision 2. Request was accepted with message: Thanks for the fix. OBS-URL: https://build.opensuse.org/request/show/33402 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=20 --- emacs-23.1-fix_cpp.patch | 27 +++++++++++++++++++++++++++ emacs.changes | 5 +++++ emacs.spec | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 emacs-23.1-fix_cpp.patch diff --git a/emacs-23.1-fix_cpp.patch b/emacs-23.1-fix_cpp.patch new file mode 100644 index 0000000..1c500d6 --- /dev/null +++ b/emacs-23.1-fix_cpp.patch @@ -0,0 +1,27 @@ +2009-10-23 Jim Meyering + + * 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 diff --git a/emacs.changes b/emacs.changes index 30203d9..17b94e0 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 24 18:13:47 UTC 2010 - coolo@novell.com + +- apply patch from cvs to fix build with gcc 4.5 + ------------------------------------------------------------------- Tue Feb 9 17:03:02 CET 2010 - prusnak@suse.cz diff --git a/emacs.spec b/emacs.spec index e1a56c8..08b4684 100644 --- a/emacs.spec +++ b/emacs.spec @@ -57,6 +57,7 @@ Patch15: emacs-22.2-iconic.patch 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 @@ Authors: %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 From d020b107331430c7bb32213102b3dd59bf2ea309510dba4fc03d9cd51feb5cb0 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 25 Feb 2010 10:16:03 +0000 Subject: [PATCH 2/3] Accepting request 33451 from editors checked in (request 33451) OBS-URL: https://build.opensuse.org/request/show/33451 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=21 --- emacs-23.1-fix_cpp.patch | 27 --------------------------- emacs.changes | 5 ----- emacs.spec | 2 -- 3 files changed, 34 deletions(-) delete mode 100644 emacs-23.1-fix_cpp.patch diff --git a/emacs-23.1-fix_cpp.patch b/emacs-23.1-fix_cpp.patch deleted file mode 100644 index 1c500d6..0000000 --- a/emacs-23.1-fix_cpp.patch +++ /dev/null @@ -1,27 +0,0 @@ -2009-10-23 Jim Meyering - - * 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 diff --git a/emacs.changes b/emacs.changes index 17b94e0..30203d9 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Feb 24 18:13:47 UTC 2010 - coolo@novell.com - -- apply patch from cvs to fix build with gcc 4.5 - ------------------------------------------------------------------- Tue Feb 9 17:03:02 CET 2010 - prusnak@suse.cz diff --git a/emacs.spec b/emacs.spec index 08b4684..e1a56c8 100644 --- a/emacs.spec +++ b/emacs.spec @@ -57,7 +57,6 @@ Patch15: emacs-22.2-iconic.patch 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)} @@ -244,7 +243,6 @@ Authors: %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 From 0e9ceaca4779a6740a6ad9eb52d60c3dcba0ac84b1291d0f9015ce3469b05ce7 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 25 Feb 2010 10:16:05 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/emacs revision 43.0 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=82e95a6e04f3db298c208a9a03304ee0 --- emacs-23.1-fix_cpp.patch | 27 +++++++++++++++++++++++++++ emacs.changes | 5 +++++ emacs.spec | 4 +++- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 emacs-23.1-fix_cpp.patch diff --git a/emacs-23.1-fix_cpp.patch b/emacs-23.1-fix_cpp.patch new file mode 100644 index 0000000..1c500d6 --- /dev/null +++ b/emacs-23.1-fix_cpp.patch @@ -0,0 +1,27 @@ +2009-10-23 Jim Meyering + + * 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 diff --git a/emacs.changes b/emacs.changes index 30203d9..17b94e0 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 24 18:13:47 UTC 2010 - coolo@novell.com + +- apply patch from cvs to fix build with gcc 4.5 + ------------------------------------------------------------------- Tue Feb 9 17:03:02 CET 2010 - prusnak@suse.cz diff --git a/emacs.spec b/emacs.spec index e1a56c8..e3efb0d 100644 --- a/emacs.spec +++ b/emacs.spec @@ -24,7 +24,7 @@ Url: http://www.gnu.org/software/emacs/ 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 @@ Patch15: emacs-22.2-iconic.patch 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 @@ Authors: %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