[arch-commits] CVS update of arch/build/lib/wvstreams (2 files)

[andyrtr at archlinux.org]

    Date: Wednesday, June 13, 2007 @ 08:39:54
  Author: andyrtr
    Path: /home/cvs-arch/arch/build/lib/wvstreams

   Added: wvstreams-4.3-64bit.patch (1.1)
Modified: PKGBUILD (1.16 -> 1.17)

updatepkg 4.3


---------------------------+
 PKGBUILD                  |   22 +++++++++++-----------
 wvstreams-4.3-64bit.patch |   14 ++++++++++++++
 2 files changed, 25 insertions(+), 11 deletions(-)


Index: arch/build/lib/wvstreams/PKGBUILD
diff -u arch/build/lib/wvstreams/PKGBUILD:1.16 arch/build/lib/wvstreams/PKGBUILD:1.17
--- arch/build/lib/wvstreams/PKGBUILD:1.16	Sun Mar 18 18:21:33 2007
+++ arch/build/lib/wvstreams/PKGBUILD	Wed Jun 13 08:39:54 2007
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD,v 1.16 2007/03/18 22:21:33 jgc Exp $
+# $Id: PKGBUILD,v 1.17 2007/06/13 12:39:54 andyrtr Exp $
 # Maintainer: dorphell <dorphell at archlinux.org>
 pkgname=wvstreams
-pkgver=4.2.2
-pkgrel=3
+pkgver=4.3
+pkgrel=1
 pkgdesc="A network programming library written in C++"
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('zlib' 'openslp' 'pam' 'xplc' 'db>=4.5')
-source=(http://open.nit.ca/download/${pkgname}-${pkgver}.tar.gz
-	wvstreams-gcc41.patch)
+source=(http://alumnit.ca/download/${pkgname}-${pkgver}.tar.gz
+	wvstreams-4.3-64bit.patch)
 url="http://open.nit.ca/wiki/?page=WvStreams"
-md5sums=('103230cb9926cb8f3f4d8dc8584f3b9c'
-	  '70ee4d4f49f23fa5a89f32d2ff2ac9f5')
-sha1sums=('a44a9ded6339fb2c53eb472d0763e4cf6b0c0534'
-	  '127958ec3f5a1d74b08c71f9801846c23326bd2f')
+md5sums=('eb34544384c951fd14470d583273e02a'
+         'b3e08e99de6c41b2078129630d8c62e0')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/wvstreams-gcc41.patch || return 1
-  [ "$CARCH" = "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
+  if [ "$CARCH" = "x86_64" ]; then
+    patch -Np1 -i ${startdir}/src/wvstreams-4.3-64bit.patch || return 1 
+    export CFLAGS="$CFLAGS -fPIC"
+  fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --without-gtk --without-vorbis --without-qt \
     --without-swig
Index: arch/build/lib/wvstreams/wvstreams-4.3-64bit.patch
diff -u /dev/null arch/build/lib/wvstreams/wvstreams-4.3-64bit.patch:1.1
--- /dev/null	Wed Jun 13 08:39:54 2007
+++ arch/build/lib/wvstreams/wvstreams-4.3-64bit.patch	Wed Jun 13 08:39:54 2007
@@ -0,0 +1,14 @@
+diff -Nru wvstreams-4.3.orig/utils/wvcrash.cc wvstreams-4.3/utils/wvcrash.cc
+--- wvstreams-4.3.orig/utils/wvcrash.cc	2007-02-07 21:06:12.000000000 +0200
++++ wvstreams-4.3/utils/wvcrash.cc	2007-03-12 14:23:47.000000000 +0200
+@@ -91,8 +91,8 @@
+     char digits[] = "0123456789ABCDEF";
+     
+     write(fd, "0x", 2);
+-    for (int shift=28; shift>=0; shift-=4)
+-        write(fd, &digits[(((unsigned)addr)>>shift)&0xF], 1);
++    for (int shift = (sizeof(addr) << 3) - 4; shift>=0; shift-=4)
++        write(fd, &digits[(((ptrdiff_t)addr)>>shift)&0xF], 1);
+ }
+ 
+