3 files changed, 31 insertions, 12 deletions
diff --git a/libraries/wvstreams/wvstreams-4.6.1-glibc212.patch b/libraries/wvstreams/wvstreams-4.6.1-glibc212.patch
new file mode 100644
index 000000000000..473d3e832933
--- /dev/null
+++ b/libraries/wvstreams/wvstreams-4.6.1-glibc212.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/333301
+
+--- ipstreams/wvunixdgsocket.cc
++++ ipstreams/wvunixdgsocket.cc
+@@ -1,5 +1,5 @@
+ #include "wvunixdgsocket.h"
+-#ifdef MACOS
++#if defined(MACOS) || defined(__GNUC__)
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #endif
+--- streams/wvatomicfile.cc
++++ streams/wvatomicfile.cc
+@@ -11,7 +11,8 @@
+ #include "wvfileutils.h"
+ #include "wvstrutils.h"
+ 
+-#ifdef MACOS
++#if defined(MACOS) || defined(__GNUC__)
++#include <sys/types.h>
+ #include <sys/stat.h>
+ #endif
+ 
diff --git a/libraries/wvstreams/wvstreams.SlackBuild b/libraries/wvstreams/wvstreams.SlackBuild
index e04ca62c0a06..ebe4b85968f1 100644
--- a/libraries/wvstreams/wvstreams.SlackBuild
+++ b/libraries/wvstreams/wvstreams.SlackBuild
@@ -5,16 +5,14 @@
 # Written by Vincent Batts, vbatts@batts.mine.nu
 
 PRGNAM=wvstreams
-VERSION=4.6
+VERSION=4.6.1
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -53,9 +51,11 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Fix a build error with glibc-2.12.x
+patch -p0 < $CWD/wvstreams-4.6.1-glibc212.patch
+
 # configure doesn't support disabling static libraries
 # Don't manually remove them either, as wvdial won't build then :)
-# * Build without dbus support, since it requires the static dbus lib
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -65,7 +65,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --disable-testgui \
-  --without-dbus \
   --build=$ARCH-slackware-linux
 
 make
@@ -77,10 +76,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Let's not clobber the config file
 mv $PKG/etc/uniconf.conf $PKG/etc/uniconf.conf.new
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/libraries/wvstreams/wvstreams.info b/libraries/wvstreams/wvstreams.info
index 1471ad97ccbc..b15e94e81061 100644
--- a/libraries/wvstreams/wvstreams.info
+++ b/libraries/wvstreams/wvstreams.info
@@ -1,8 +1,8 @@
 PRGNAM="wvstreams"
-VERSION="4.6"
+VERSION="4.6.1"
 HOMEPAGE="http://alumnit.ca/wiki/index.php?page=WvStreams"
-DOWNLOAD="http://wvstreams.googlecode.com/files/wvstreams-4.6.tar.gz"
-MD5SUM="4ee8ccfe6dfc29bf952d58fa23626c97"
+DOWNLOAD="http://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz"
+MD5SUM="2760dac31a43d452a19a3147bfde571c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Vincent Batts"