[arch-commits] CVS update of extra/devel/mcpp (PKGBUILD mcpp-2.6.4-patch)

[Alexander Baldeck]

    Date: Thursday, October 18, 2007 @ 07:44:11
  Author: alexander
    Path: /home/cvs-extra/extra/devel/mcpp

   Added: mcpp-2.6.4-patch (1.1)
Modified: PKGBUILD (1.7 -> 1.8)

* added upstream patch to fix issues with xrdb


------------------+
 PKGBUILD         |   13 ++++++++-----
 mcpp-2.6.4-patch |   22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)


Index: extra/devel/mcpp/PKGBUILD
diff -u extra/devel/mcpp/PKGBUILD:1.7 extra/devel/mcpp/PKGBUILD:1.8
--- extra/devel/mcpp/PKGBUILD:1.7	Wed Aug 22 11:26:48 2007
+++ extra/devel/mcpp/PKGBUILD	Thu Oct 18 07:44:11 2007
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD,v 1.7 2007/08/22 15:26:48 alexander Exp $
-# Maintainer: Alexander Baldeck <alexander at arclinux.org>
+# $Id: PKGBUILD,v 1.8 2007/10/18 11:44:11 alexander Exp $
+# Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=mcpp
 pkgver=2.6.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Matsui's CPP implementation precisely conformed to standards"
 arch=(i686 x86_64)
 license=('custom:')
 url="http://mcpp.sourceforge.net"
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz \
+        mcpp-2.6.4-patch)
 depends=(glibc)
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np0 -i ${startdir}/src/mcpp-2.6.4-patch || return 1
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=${startdir}/pkg install
@@ -21,4 +23,5 @@
   install -m644 ${startdir}/src/${pkgname}-${pkgver}/LICENSE \
                 ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE
 }
-md5sums=('c0f5aa9b13e36ea0f2ab9358c5d65153')
+md5sums=('c0f5aa9b13e36ea0f2ab9358c5d65153'
+         '80890eb2988d7e80964b814cf134f842')
Index: extra/devel/mcpp/mcpp-2.6.4-patch
diff -u /dev/null extra/devel/mcpp/mcpp-2.6.4-patch:1.1
--- /dev/null	Thu Oct 18 07:44:10 2007
+++ extra/devel/mcpp/mcpp-2.6.4-patch	Thu Oct 18 07:44:11 2007
@@ -0,0 +1,22 @@
+*** src/support.c.orig	2007-05-18 21:31:17.000000000 +0900
+--- src/support.c	2007-09-17 22:11:27.000000000 +0900
+***************
+*** 1678,1686 ****
+                      , NULL, (long) c, NULL);
+          case '\t':                          /* Horizontal space     */
+          case ' ':
+!             if (mcpp_mode == OLD_PREP) {
+!                 if ((*(tp - 1) != ' ' && *(tp - 1) != COM_SEP))
+!                     *(tp - 1) = ' ';        /* Squeeze COM_SEP with spaces  */
+              } else {
+                  if (*(tp - 1) != ' ')
+                      *tp++ = ' ';            /* Squeeze white spaces */
+--- 1678,1685 ----
+                      , NULL, (long) c, NULL);
+          case '\t':                          /* Horizontal space     */
+          case ' ':
+!             if (mcpp_mode == OLD_PREP && (*(tp - 1) == COM_SEP)) {
+!                 *(tp - 1) = ' ';            /* Squeeze COM_SEP with spaces  */
+              } else {
+                  if (*(tp - 1) != ' ')
+                      *tp++ = ' ';            /* Squeeze white spaces */