system/gtk-vnc: Script cleanup + New Maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 39 insertions, 17 deletions

diff --git a/system/gtk-vnc/README b/system/gtk-vnc/README
index 905a48097208..6cd1c485a3b8 100644
--- a/system/gtk-vnc/README
+++ b/system/gtk-vnc/README
@@ -4,6 +4,9 @@ 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
+library.  To avoid building the gtk+3 version, pass "GTK3=no"
+when launching the SlackBuild.  For example:
+    GTK3=no ./gtk-vnc.SlackBuild
+
+NOTE: gtk-vnc requires cairo 1.12.16 or greater to perform
+correctly, especially with pygtk bindings.
diff --git a/system/gtk-vnc/gtk-vnc.SlackBuild b/system/gtk-vnc/gtk-vnc.SlackBuild
index 4e3dbf39ce10..992fc9fad3e8 100644
--- a/system/gtk-vnc/gtk-vnc.SlackBuild
+++ b/system/gtk-vnc/gtk-vnc.SlackBuild
@@ -2,7 +2,27 @@
 
 # Slackware build script for gtk-vnc
 
-# Written by Ash Wiren <ash@spooksoftware.com>
+# Copyright 2014 Will Brokenbourgh U.S.A.
+# 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.
+
+# ** Version 2014-01-11: Fixed broken 'GTK3=no' processing
 
 PRGNAM=gtk-vnc
 VERSION=${VERSION:-0.5.3}
@@ -49,13 +69,13 @@ cd $TMP
 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 750 -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 {} \;
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Cut away jobs number from the MAKEFLAGS
+# Strip jobs number from the MAKEFLAGS
 MAKEFLAGS=$(echo "$MAKEFLAGS" | sed "s/-j[0-999]//g")
 
 cp -a $PRGNAM-$VERSION $PRGNAM-$VERSION-3
@@ -79,16 +99,14 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-introspection \
   --build=$ARCH-slackware-linux
 
+# Building with -j1 to avoid surprises
 make -j1
 make install DESTDIR=$PKG
 
-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
+cd ../$PRGNAM-$VERSION-3
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -107,12 +125,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-introspection \
   --build=$ARCH-slackware-linux
 
+# Building with -j1 to avoid surprises
 make -j1
 make install DESTDIR=$PKG
 
 fi
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/gtk-vnc/gtk-vnc.info b/system/gtk-vnc/gtk-vnc.info
index ebff5309feb6..9f7f8e14527c 100644
--- a/system/gtk-vnc/gtk-vnc.info
+++ b/system/gtk-vnc/gtk-vnc.info
@@ -6,5 +6,5 @@ MD5SUM="1dccd918a4d633020e4afaf6c9352cde"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="vala"
-MAINTAINER="Ash Wiren"
-EMAIL="ash@spooksoftware.com"
+MAINTAINER="Will Brokenbourgh"
+EMAIL="will_brokenbourgh@yahoo.com"