pool/emacs
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 33451 from editors

Browse Source 
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
This commit is contained in:
OBS User autobuild 2010-02-25 10:16:03 +00:00 committed by Git OBS Bridge
parent 5c909ca26f
commit d020b10733
3 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
emacs-23.1-fix_cpp.patch
View File

@ -1,27 +0,0 @@
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

5
emacs.changes
View File

@ -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

2
emacs.spec
View File

@ -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