From a1fda691eae13d28a10021c3fcab2f7ffd238c38 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <ponce@slackbuilds.org>
Date: Mon, 23 Sep 2013 09:13:46 +0200
Subject: system/gtk-vnc: Updated for version 0.5.3.

Enforce single make job, build gtk2 version first

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 system/gtk-vnc/gtk-vnc.SlackBuild | 31 +++++++++++++++++--------------
 system/gtk-vnc/gtk-vnc.info       |  6 +++---
 2 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'system/gtk-vnc')

diff --git a/system/gtk-vnc/gtk-vnc.SlackBuild b/system/gtk-vnc/gtk-vnc.SlackBuild
index 607177ca0f..45b70425ab 100644
--- a/system/gtk-vnc/gtk-vnc.SlackBuild
+++ b/system/gtk-vnc/gtk-vnc.SlackBuild
@@ -2,11 +2,11 @@
 
 # Slackware build script for gtk-vnc
 
-# Written by Ash Wiren   ash@spooksoftware.com
+# Written by Ash Wiren <ash@spooksoftware.com>
 
 PRGNAM=gtk-vnc
-VERSION=${VERSION:-0.5.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.5.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
@@ -60,12 +60,9 @@ find $PRGNAM-$VERSION \
 # Cut away jobs number from the MAKEFLAGS
 MAKEFLAGS=$(echo "$MAKEFLAGS" | sed "s/-j[0-999]//g")
 
-# 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
+cp -a $PRGNAM-$VERSION $PRGNAM-$VERSION-3
+
+cd $PRGNAM-$VERSION
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -79,17 +76,21 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-examples \
   --with-libview \
   --with-python \
-  --with-gtk=3.0 \
+  --with-gtk=2.0 \
   --enable-vala \
   --enable-introspection \
   --build=$ARCH-slackware-linux
 
 make -j1
 make install DESTDIR=$PKG
-)
-fi
 
-cd $PRGNAM-$VERSION
+cd ..
+
+# 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
+
+cd $PRGNAM-$VERSION-3
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -103,7 +104,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-examples \
   --with-libview \
   --with-python \
-  --with-gtk=2.0 \
+  --with-gtk=3.0 \
   --enable-vala \
   --enable-introspection \
   --build=$ARCH-slackware-linux
@@ -111,6 +112,8 @@ CXXFLAGS="$SLKCFLAGS" \
 make -j1
 make install DESTDIR=$PKG
 
+fi
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/system/gtk-vnc/gtk-vnc.info b/system/gtk-vnc/gtk-vnc.info
index 4065f3f21a..ebff5309fe 100644
--- a/system/gtk-vnc/gtk-vnc.info
+++ b/system/gtk-vnc/gtk-vnc.info
@@ -1,8 +1,8 @@
 PRGNAM="gtk-vnc"
-VERSION="0.5.1"
+VERSION="0.5.3"
 HOMEPAGE="http://live.gnome.org/gtk-vnc/"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gtk-vnc/0.5/gtk-vnc-0.5.1.tar.xz"
-MD5SUM="626f919138b8362ba82faa969fa371f3"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gtk-vnc/0.5/gtk-vnc-0.5.3.tar.xz"
+MD5SUM="1dccd918a4d633020e4afaf6c9352cde"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="vala"
-- 
cgit v1.2.3