[arch-commits] Commit in emacs/trunk (2 files)

[Juergen Hoetzel]

    Date: Thursday, April 29, 2010 @ 17:42:57
  Author: juergen
Revision: 79004

fix FS#19283 (Invoke CPP with -P)

Added:
  emacs/trunk/0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch
Modified:
  emacs/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch |   35 ++++++++++
 PKGBUILD                                                        |   22 +++---
 2 files changed, 46 insertions(+), 11 deletions(-)

Added: 0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch
===================================================================
--- 0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch	                        (rev 0)
+++ 0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch	2010-04-29 21:42:57 UTC (rev 79004)
@@ -0,0 +1,35 @@
+diff -ub src/emacs-23.1/configure src/emacs-23.1.fixed/configure
+--- src/emacs-23.1/configure	2009-07-29 17:12:00.000000000 +0200
++++ src/emacs-23.1.fixed/configure	2010-04-29 23:13:41.493641756 +0200
+@@ -25742,7 +25742,7 @@
+   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
+@@ -25758,7 +25758,7 @@
+   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
+Common subdirectories: src/emacs-23.1/doc and src/emacs-23.1.fixed/doc
+Common subdirectories: src/emacs-23.1/etc and src/emacs-23.1.fixed/etc
+Common subdirectories: src/emacs-23.1/info and src/emacs-23.1.fixed/info
+Common subdirectories: src/emacs-23.1/leim and src/emacs-23.1.fixed/leim
+Common subdirectories: src/emacs-23.1/lib-src and src/emacs-23.1.fixed/lib-src
+Common subdirectories: src/emacs-23.1/lisp and src/emacs-23.1.fixed/lisp
+Common subdirectories: src/emacs-23.1/lwlib and src/emacs-23.1.fixed/lwlib
+Common subdirectories: src/emacs-23.1/m4 and src/emacs-23.1.fixed/m4
+Common subdirectories: src/emacs-23.1/msdos and src/emacs-23.1.fixed/msdos
+Common subdirectories: src/emacs-23.1/nextstep and src/emacs-23.1.fixed/nextstep
+Common subdirectories: src/emacs-23.1/nt and src/emacs-23.1.fixed/nt
+Common subdirectories: src/emacs-23.1/oldXMenu and src/emacs-23.1.fixed/oldXMenu
+Common subdirectories: src/emacs-23.1/site-lisp and src/emacs-23.1.fixed/site-lisp
+Common subdirectories: src/emacs-23.1/src and src/emacs-23.1.fixed/src

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-29 20:33:48 UTC (rev 79003)
+++ PKGBUILD	2010-04-29 21:42:57 UTC (rev 79004)
@@ -10,27 +10,27 @@
 license=('GPL')
 options=(docs)
 depends=('dbus-core' 'librsvg' 'gpm'  'giflib' 'libtiff'  'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme')
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop libpng14.patch)
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop libpng14.patch 0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch)
 md5sums=('a620d4452769d04ad8864d662f34f8dd' '8af038d2ba4561271e935bb444ceb4e3'\
-         'd3e657091f41504fba7bdb0e96ec9b38')
-sha1sums=('e993445d14d2fdedd1418bc32c8c4ea30442bc51' '50060b676382719955c4e43e28a597ec0bc5805a'\
-         'f206f65465f32c96e08aeb37ffb5008fb818f59d')
+         'd3e657091f41504fba7bdb0e96ec9b38' '8afbea5b319862c1449cc6534e0908de')
 install=emacs.install
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  patch -p1 < ../libpng14.patch || return 1
+  patch -p1 < $startdir/src/libpng14.patch 
+  # Patch from Upstream dev: Invoke $CPP with -P when creating Makefile
+  patch -p2 -i $startdir/src/0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch
   mandir=/usr/share/man
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
   --localstatedir=/var --mandir=${mandir} --without-sound -with-x-toolkit=gtk
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make 
+  make DESTDIR=$startdir/pkg install 
 
   # remove conflict with ctags package
-  mv $startdir/pkg/usr/bin/{ctags,ctags.emacs} || return 1
-  mv $startdir/pkg/usr/bin/{etags,etags.emacs} || return 1
-  mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1} || return 1
-  mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1} || return 1
+  mv $startdir/pkg/usr/bin/{ctags,ctags.emacs} 
+  mv $startdir/pkg/usr/bin/{etags,etags.emacs} 
+  mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1} 
+  mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1} 
   # fix all the 777 perms on directories
   find $startdir/pkg/usr/share/emacs/$pkgver -type d -exec chmod 755 {} \;
   # fix user/root permissions on usr/share files