[arch-commits] Commit in commoncpp2/trunk (PKGBUILD commoncpp2-1.7.3-gcc44.patch)

[Giovanni Scafora]

    Date: Sunday, July 5, 2009 @ 19:00:52
  Author: giovanni
Revision: 44972

upgpkg: commoncpp2 1.7.3-1
    New version 1.7.3

Added:
  commoncpp2/trunk/commoncpp2-1.7.3-gcc44.patch
Modified:
  commoncpp2/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   20 +++++++++++---------
 commoncpp2-1.7.3-gcc44.patch |   21 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-05 21:40:09 UTC (rev 44971)
+++ PKGBUILD	2009-07-05 23:00:52 UTC (rev 44972)
@@ -9,20 +9,22 @@
 arch=('i686' 'x86_64')
 url='http://www.gnu.org/software/commoncpp/'
 license=('GPL' 'custom')
-depends=('gcc-libs')
+depends=('gcc-libs' 'zlib' 'bash')
 options=('!libtool' '!makeflags')
-source=(http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz)
-md5sums=('ca741179a728d264eb276ae471ebaf70')
-sha1sums=('737f6044c3dc3c01c401c0a292a800ed81162217')
+source=(http://ftp.gnu.org/pub/gnu/commoncpp/${pkgname}-${pkgver}.tar.gz
+        commoncpp2-1.7.3-gcc44.patch)
+md5sums=('ca741179a728d264eb276ae471ebaf70'
+         '120dc19fa21b78a18caf2e1db8a66a97')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/commoncpp2-1.7.3-gcc44.patch || return 1
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=$pkgdir install
+  make DESTDIR=${pkgdir} install
   
-  gzip -9 $pkgdir/usr/share/info/commoncpp2.info
-  rm $pkgdir/usr/share/info/dir
+  gzip -9 ${pkgdir}/usr/share/info/commoncpp2.info
+  rm ${pkgdir}/usr/share/info/dir
   
-  install -D -m644 COPYING.addendum $pkgdir/usr/share/licenses/$pkgname/COPYING.addendum
+  install -D -m644 COPYING.addendum ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }

Added: commoncpp2-1.7.3-gcc44.patch
===================================================================
--- commoncpp2-1.7.3-gcc44.patch	                        (rev 0)
+++ commoncpp2-1.7.3-gcc44.patch	2009-07-05 23:00:52 UTC (rev 44972)
@@ -0,0 +1,21 @@
+diff -up commoncpp2-1.7.3/src/cidr.cpp.orig commoncpp2-1.7.3/src/cidr.cpp
+--- commoncpp2-1.7.3/src/cidr.cpp.orig	2009-04-06 21:24:07.857718325 +0200
++++ commoncpp2-1.7.3/src/cidr.cpp	2009-04-06 21:50:26.874088776 +0200
+@@ -202,7 +202,7 @@ void IPV4Cidr::set(const char *cp)
+ #if defined(_MSC_VER) && _MSC_VER >= 1500
+ 	ep = (char *)strchr(cp, '/');
+ #else
+- 	ep = strchr(cp, '/');
++ 	ep = (char *)strchr(cp, '/');
+ #endif
+ 
+ 	if(ep)
+@@ -332,7 +332,7 @@ void IPV6Cidr::set(const char *cp)
+ 	memset(&netmask, 0, sizeof(netmask));
+ 	bitset((bit_t *)&netmask, getMask(cp));
+ 	setString(cbuf, sizeof(cbuf), cp);
+-	ep = strchr(cp, '/');
++	ep = (char *)strchr(cp, '/');
+ 	if(ep)
+ 		*ep = 0;
+