3 files changed, 55 insertions, 12 deletions
diff --git a/system/gtk-vnc/README b/system/gtk-vnc/README
index d042c314b9bca..905a48097208a 100644
--- a/system/gtk-vnc/README
+++ b/system/gtk-vnc/README
@@ -3,3 +3,7 @@ coroutines allowing it to be completely asynchronous while
 remaining single threaded. It provides a core C library, and
 bindings for Python (PyGTK)
 
+This script builds both the gtk+2 and gtk+3 versions of the
+library: to avoid building the gtk+3 version, pass "GTK3=no"
+launching the SlackBuild, like this
+  GTK3=no ./gtk-vnc.SlackBuild
diff --git a/system/gtk-vnc/gtk-vnc.SlackBuild b/system/gtk-vnc/gtk-vnc.SlackBuild
index d90ee35060e6a..a98983f1442e2 100644
--- a/system/gtk-vnc/gtk-vnc.SlackBuild
+++ b/system/gtk-vnc/gtk-vnc.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Ash Wiren   ash@spooksoftware.com
 
 PRGNAM=gtk-vnc
-VERSION=${VERSION:-0.3.9}
+VERSION=${VERSION:-0.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -38,25 +38,60 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# These might be useful when all needed headers will be there
+# in that case add also --enable-plugin=yes
+#export MOZILLA_PLUGIN_CFLAGS="-I/usr/include/nspr -I/usr/include/nss -I/usr/include/seamonkey"
+#export MOZILLA_PLUGIN_LIBS="-L/usr/lib$LIBDIRSUFFIX -L/usr/lib$LIBDIRSUFFIX/seamonkey"
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find . \
+rm -rf $PRGNAM-$VERSION{,-3}
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+chown -R root:root $PRGNAM-$VERSION
+find $PRGNAM-$VERSION \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# We will build both the gtk+3 and gtk+2 libs with -j1 to avoid surprises
+# To avoid building the gtk3 version, pass GTK3=no to the script
+if [ "${GTK3:-yes}" = "yes" ]; then
+(
+cp -a $PRGNAM-$VERSION{,-3}
+cd $PRGNAM-$VERSION-3
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-examples \
+  --with-libview \
+  --with-python \
+  --with-gtk=3.0 \
+  --enable-vala \
+  --enable-introspection \
+  --build=$ARCH-slackware-linux
+
+make -j1
+make install DESTDIR=$PKG
+)
+fi
+
+cd $PRGNAM-$VERSION
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  -prefix=/usr \
+  --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
@@ -64,9 +99,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-examples \
   --with-libview \
+  --with-python \
+  --with-gtk=2.0 \
+  --enable-vala \
+  --enable-introspection \
   --build=$ARCH-slackware-linux
 
-make
+make -j1
 make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/system/gtk-vnc/gtk-vnc.info b/system/gtk-vnc/gtk-vnc.info
index 60954c40d2c27..4065f3f21a321 100644
--- a/system/gtk-vnc/gtk-vnc.info
+++ b/system/gtk-vnc/gtk-vnc.info
@@ -1,10 +1,10 @@
 PRGNAM="gtk-vnc"
-VERSION="0.3.9"
+VERSION="0.5.1"
 HOMEPAGE="http://live.gnome.org/gtk-vnc/"
-DOWNLOAD="http://ftp.acc.umu.se/pub/GNOME/sources/gtk-vnc/0.3/gtk-vnc-0.3.9.tar.gz"
-MD5SUM="26690465f413a017ae95514af9f4e41d"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gtk-vnc/0.5/gtk-vnc-0.5.1.tar.xz"
+MD5SUM="626f919138b8362ba82faa969fa371f3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vala"
 MAINTAINER="Ash Wiren"
 EMAIL="ash@spooksoftware.com"