[arch-commits] Commit in mcpp/repos (4 files)

Jan de Groot jgc at archlinux.org
Sun Mar 8 13:21:20 UTC 2009


    Date: Sunday, March 8, 2009 @ 09:21:19
  Author: jgc
Revision: 29373

Merged revisions 22401,29371 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/mcpp/trunk

........
  r22401 | jgc | 2008-12-26 17:33:40 +0000 (Fri, 26 Dec 2008) | 1 line
  
  upgpkg: mcpp 2.7.2-1
........
  r29371 | jgc | 2009-03-08 13:20:21 +0000 (Sun, 08 Mar 2009) | 3 lines
  
  upgpkg: mcpp 2.7.2-2
      Add mcpplib
  double the size of NAMLEN so longer locale names are supported
........

Added:
  mcpp/repos/extra-i686/namlen.patch
    (from rev 29371, mcpp/trunk/namlen.patch)
Modified:
  mcpp/repos/extra-i686/	(properties)
  mcpp/repos/extra-i686/PKGBUILD
Deleted:
  mcpp/repos/extra-i686/mcpp-2.6.4-patch

------------------+
 PKGBUILD         |   12 ++++++++----
 mcpp-2.6.4-patch |   22 ----------------------
 namlen.patch     |   11 +++++++++++
 3 files changed, 19 insertions(+), 26 deletions(-)


Property changes on: mcpp/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mcpp/trunk:1-22398
   + /mcpp/trunk:1-29372
Deleted: svn:mergeinfo
   - 

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-08 13:20:31 UTC (rev 29372)
+++ extra-i686/PKGBUILD	2009-03-08 13:21:19 UTC (rev 29373)
@@ -3,18 +3,22 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=mcpp
 pkgver=2.7.2
-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 )
 depends=(glibc)
-md5sums=('512de48c87ab023a69250edc7a0c7b05')
+options=(!libtool)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz 
+	namlen.patch)
+md5sums=('512de48c87ab023a69250edc7a0c7b05'
+	 '0bfc6177a58e912a9e23e368578dd3fe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
+  patch -Np1 -i "${srcdir}/namlen.patch" || return 1
+  ./configure --prefix=/usr --enable-mcpplib --disable-static || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
 

Deleted: extra-i686/mcpp-2.6.4-patch
===================================================================
--- extra-i686/mcpp-2.6.4-patch	2009-03-08 13:20:31 UTC (rev 29372)
+++ extra-i686/mcpp-2.6.4-patch	2009-03-08 13:21:19 UTC (rev 29373)
@@ -1,22 +0,0 @@
-*** 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 */

Copied: mcpp/repos/extra-i686/namlen.patch (from rev 29371, mcpp/trunk/namlen.patch)
===================================================================
--- extra-i686/namlen.patch	                        (rev 0)
+++ extra-i686/namlen.patch	2009-03-08 13:21:19 UTC (rev 29373)
@@ -0,0 +1,11 @@
+--- mcpp-2.7.2/src/mbchar.c	2008-03-08 13:06:13.000000000 +0000
++++ mcpp-2.7.2/src/mbchar.c	2009-03-08 13:14:17.000000000 +0000
+@@ -345,7 +345,7 @@
+ static size_t   mb_read_utf8( int c1, char ** in_pp, char ** out_pp);
+                 /* For UTF8 mbchar encoding         */
+ 
+-#define NAMLEN          20
++#define NAMLEN          40
+ #define UPPER           1               /* To upper */
+ #define LOWER           0               /* To lower */
+ 




More information about the arch-commits mailing list