[arch-commits] Commit in wvstreams/trunk (3 files)

[Andrea Scarpino]

    Date: Saturday, October 31, 2009 @ 14:51:48
  Author: andrea
Revision: 57500

upgpkg: wvstreams 4.6.1-1
    upstream release

Modified:
  wvstreams/trunk/PKGBUILD
Deleted:
  wvstreams/trunk/gcc-4.3.patch
  wvstreams/trunk/wvstreams-4.3-64bit.patch

---------------------------+
 PKGBUILD                  |   15 ++++++++------
 gcc-4.3.patch             |   45 --------------------------------------------
 wvstreams-4.3-64bit.patch |   14 -------------
 3 files changed, 9 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-31 18:46:05 UTC (rev 57499)
+++ PKGBUILD	2009-10-31 18:51:48 UTC (rev 57500)
@@ -1,16 +1,17 @@
 # $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=wvstreams
-pkgver=4.6
-pkgrel=2
+pkgver=4.6.1
+pkgrel=1
 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)
-md5sums=('4ee8ccfe6dfc29bf952d58fa23626c97')
+md5sums=('2760dac31a43d452a19a3147bfde571c')
 options=('!makeflags')
 
 build() {
@@ -21,7 +22,9 @@
   make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive" VERBOSE=1 || return 1
   make DESTDIR=${pkgdir} install || return 1
   
-  # building with dbus support requres static dbus libs
-  # but --without-dus still installs the pkg-config file
+  # FS#15974
+  # --without-dbus still installs the pkg-config file
   rm ${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc
+  # --without-qt still installs the pkg-config file
+  rm ${pkgdir}/usr/lib/pkgconfig/libwvqt.pc
 }

Deleted: gcc-4.3.patch
===================================================================
--- gcc-4.3.patch	2009-10-31 18:46:05 UTC (rev 57499)
+++ gcc-4.3.patch	2009-10-31 18:51:48 UTC (rev 57500)
@@ -1,45 +0,0 @@
---- 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__);
-     }
- 
-     /**

Deleted: wvstreams-4.3-64bit.patch
===================================================================
--- wvstreams-4.3-64bit.patch	2009-10-31 18:46:05 UTC (rev 57499)
+++ wvstreams-4.3-64bit.patch	2009-10-31 18:51:48 UTC (rev 57500)
@@ -1,14 +0,0 @@
-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);
- }
- 
-