[arch-commits] CVS update of extra/lib/wvstreams (PKGBUILD gcc-4.3.patch)

[Jan de Groot]

    Date: Sunday, March 23, 2008 @ 13:09:10
  Author: jgc
    Path: /home/cvs-extra/extra/lib/wvstreams

   Added: gcc-4.3.patch (1.1)
Modified: PKGBUILD (1.21 -> 1.22)

upgpkg: wvstreams 4.4.1-2
    Add gcc 4.3 patch


---------------+
 PKGBUILD      |   16 +++++++++-------
 gcc-4.3.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 7 deletions(-)


Index: extra/lib/wvstreams/PKGBUILD
diff -u extra/lib/wvstreams/PKGBUILD:1.21 extra/lib/wvstreams/PKGBUILD:1.22
--- extra/lib/wvstreams/PKGBUILD:1.21	Sun Oct 28 15:44:11 2007
+++ extra/lib/wvstreams/PKGBUILD	Sun Mar 23 13:09:09 2008
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD,v 1.21 2007/10/28 19:44:11 andyrtr Exp $
+# $Id: PKGBUILD,v 1.22 2008/03/23 17:09:09 jgc Exp $
 # Maintainer: dorphell <dorphell at archlinux.org>
 pkgname=wvstreams
 pkgver=4.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A network programming library written in C++"
 arch=(i686 x86_64)
+url="http://alumnit.ca/wiki/?page=WvStreams"
 license=('LGPL')
 depends=('zlib' 'pam' 'xplc' "openssl>=0.9.8f" 'readline')
-source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-url="http://alumnit.ca/wiki/?page=WvStreams"
-md5sums=('907b0cba8931553d848620ea16f006b9')
+source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
+	gcc-4.3.patch)
+md5sums=('907b0cba8931553d848620ea16f006b9' '004949f9b334fefa844eee704159d3f4')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   if [ "$CARCH" = "x86_64" ]; then
     export CFLAGS="$CFLAGS -fPIC"
   fi
+  patch -Np1 -i ${startdir}/src/gcc-4.3.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --without-gtk --without-vorbis --without-qt \
-    --without-swig --with-openssl 
+    --without-swig --with-openssl  || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${startdir}/pkg install || return 1
 }
Index: extra/lib/wvstreams/gcc-4.3.patch
diff -u /dev/null extra/lib/wvstreams/gcc-4.3.patch:1.1
--- /dev/null	Sun Mar 23 13:09:10 2008
+++ extra/lib/wvstreams/gcc-4.3.patch	Sun Mar 23 13:09:09 2008
@@ -0,0 +1,45 @@
+--- wvstreams-4.4.1.orig/utils/wvcrash.cc
++++ wvstreams-4.4.1/utils/wvcrash.cc
+@@ -385,10 +385,10 @@
+ #if WVCRASH_USE_SIGALTSTACK
+     struct sigaction act;
+     
++    memset(&act,0,sizeof(act));
+     act.sa_handler = wvcrash;
+     sigfillset(&act.sa_mask);
+     act.sa_flags = SA_ONSTACK | SA_RESTART;
+-    act.sa_restorer = NULL;
+     
+     if (sigaction(sig, &act, NULL))
+         fprintf(stderr, "Failed to setup wvcrash handler for signal %d: %s\n",
+--- wvstreams-4.4.1.orig/include/wvserialize.h
++++ wvstreams-4.4.1/include/wvserialize.h
+@@ -349,7 +349,7 @@
+  * except as the last character.
+  */
+ template <>
+-extern WvString _wv_deserialize<WvString>(WvBuf &buf);
++WvString _wv_deserialize<WvString>(WvBuf &buf);
+ 
+ 
+ /** Deserialize a WvBuf. */
+--- wvstreams-4.4.1.orig/include/uniconfkey.h
++++ wvstreams-4.4.1/include/uniconfkey.h
+@@ -327,7 +327,7 @@
+      */
+     UniConfKey last(int n = 1) const
+     {
+-        return range(numsegments() - n, INT_MAX);
++        return range(numsegments() - n, __INT_MAX__);
+     }
+ 
+     /**
+@@ -338,7 +338,7 @@
+      */
+     UniConfKey removefirst(int n = 1) const
+     {
+-        return range(n, INT_MAX);
++        return range(n, __INT_MAX__);
+     }
+ 
+     /**