network/spice-gtk: Updated for version 0.21, cleanups.

Build the GTK+3 version by default, removed bashisms,
removed the libcacard optional dependency

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

3 files changed, 36 insertions, 17 deletions

diff --git a/network/spice-gtk/README b/network/spice-gtk/README
index 93ed321ed1..45f8343bb0 100644
--- a/network/spice-gtk/README
+++ b/network/spice-gtk/README
@@ -1,5 +1,7 @@
 spice-gtk (spice gtk client/libraries)
 
 A Gtk client and libraries for spice remote desktop servers.
+By default the GTK+3 version is built: if you need the GTK+2 one,
+pass to the build script the variable GTK=2
 
-libcacard and usbredir are optional dependencies.
+usbredir is an optional dependency.
diff --git a/network/spice-gtk/spice-gtk.SlackBuild b/network/spice-gtk/spice-gtk.SlackBuild
index 019d0f153b..b2537ea6d3 100644
--- a/network/spice-gtk/spice-gtk.SlackBuild
+++ b/network/spice-gtk/spice-gtk.SlackBuild
@@ -1,11 +1,29 @@
 #!/bin/sh
 
 # Slackware build script for spice-gtk
-# Written by Matteo Bernardini <ponce@slackbuilds.org>
+# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org> Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=spice-gtk
-VERSION=${VERSION:-0.14}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.21}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -35,12 +53,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# check if libcacard is there
-if pkg-config --exists libcacard ; then
-  with_cacard="--enable-smartcard"
-else
-  with_cacard="--disable-smartcard"
-fi
+# enable support for usbredir if available
+if pkg-config --exists libusbredirhost; then usbredir="en"; else usbredir="dis"; fi
+if [ "$GTK" = "2" ]; then gtkver="2"; else gtkver="3"; fi
 
 DOCS="AUTHORS COPYING NEWS README THANKS TODO"
 
@@ -60,8 +75,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-rm gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c # force vala regen
+rm gtk/controller/controller.c gtk/controller/controller.vala.stamp gtk/controller/menu.c
 export VALAC=$(which valac)
+export VAPIGEN=$(which vapigen)
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -74,10 +90,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --disable-static \
   --enable-shared \
-  --with-gtk=2.0 \
+  --with-gtk=$gtkver.0 \
   --with-audio=gstreamer \
-  --build=$ARCH-slackware-linux \
-  $with_cacard
+  --disable-maintainer-mode \
+  --${usbredir}able-usbredir \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
diff --git a/network/spice-gtk/spice-gtk.info b/network/spice-gtk/spice-gtk.info
index a7e6e0f421..df4740e031 100644
--- a/network/spice-gtk/spice-gtk.info
+++ b/network/spice-gtk/spice-gtk.info
@@ -1,8 +1,8 @@
 PRGNAM="spice-gtk"
-VERSION="0.14"
+VERSION="0.21"
 HOMEPAGE="http://spice-space.org"
-DOWNLOAD="http://spice-space.org/download/gtk/spice-gtk-0.14.tar.bz2"
-MD5SUM="c105e3b7f9c9eb293b0d6a8d35f6a5fd"
+DOWNLOAD="http://spice-space.org/download/gtk/spice-gtk-0.21.tar.bz2"
+MD5SUM="290d1ad5ab8f1e5708fa2549dde2e024"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="spice vala"