libraries/libgnomecanvas: Updated for version 2.20.1.1

4 files changed, 35 insertions, 18 deletions

diff --git a/libraries/libgnomecanvas/README b/libraries/libgnomecanvas/README
index ff282c1347..02f7e9254c 100644
--- a/libraries/libgnomecanvas/README
+++ b/libraries/libgnomecanvas/README
@@ -8,3 +8,5 @@ the Xlib imaging model or a superset of the PostScript imaging
 model, depending on the level of graphic sophistication
 required.
 
+gail (also available at http://www.slackbuilds.org/) is
+required to build this package.
diff --git a/libraries/libgnomecanvas/libgnomecanvas.SlackBuild b/libraries/libgnomecanvas/libgnomecanvas.SlackBuild
index db03a81d98..5dfd77d39f 100644
--- a/libraries/libgnomecanvas/libgnomecanvas.SlackBuild
+++ b/libraries/libgnomecanvas/libgnomecanvas.SlackBuild
@@ -1,14 +1,17 @@
 #!/bin/sh
+
+# Slackware build script for libgnomecanvas
 #
 # Written by James Rich james@chowhouse.com
-
+#
 # Modified by the SlackBuilds.org project
 # (assumed to be public domain per our submission policy)
+# Script maintained by Frank Caraballo <fecaraballo{at}gmail{dot}com>
 
 PRGNAM=libgnomecanvas
-VERSION=2.14.0
+VERSION=2.20.1.1
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -26,33 +29,45 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
-tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION || exit 1
 
 chown -R root:root .
-chmod -R a-s,u+rw,go+r-w .
+find . \
+ \( -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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
-  --localstatedir=/var/lib/gnome
+  --localstatedir=/var/lib/gnome \
+  --program-prefix="" \
+  --program-suffix="" \
+  --enable-shared=yes \
+  --enable-static=no \
+  || exit 1
 
 make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README COPYING.LIB AUTHORS docs/reference/libgnomecanvas* \
+cp -a AUTHORS ChangeLog COPYING.LIB INSTALL NEWS README docs/reference/libgnomecanvas* \
   $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 ( cd $PKG/usr/doc/$PRGNAM-$VERSION
   ln -s ../../share/gtk-doc/html/libgnomecanvas html
 )
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG -type f -size 0c -exec rm {} \; 2>/dev/null
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/libgnomecanvas/libgnomecanvas.info b/libraries/libgnomecanvas/libgnomecanvas.info
index 89d9fd0737..67bef01296 100644
--- a/libraries/libgnomecanvas/libgnomecanvas.info
+++ b/libraries/libgnomecanvas/libgnomecanvas.info
@@ -1,8 +1,8 @@
 PRGNAM="libgnomecanvas"
-VERSION="2.14.0"
+VERSION="2.20.1.1"
 HOMEPAGE="http://directory.fsf.org/all/libgnomecanvas.html"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.14/libgnomecanvas-2.14.0.tar.bz2"
-MD5SUM="516c46fb4a1401b05cfef58c350fbd3d"
-MAINTAINER="James Rich"
-EMAIL="james@chowhouse.com"
-APPROVED="rworkman"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.20/libgnomecanvas-2.20.1.1.tar.bz2"
+MD5SUM="948ed771d2957d24a0c9a414e9581055"
+MAINTAINER="Frank Caraballo"
+EMAIL="fecaraballo{at}gmail{dot}com"
+APPROVED="David Somero"
diff --git a/libraries/libgnomecanvas/slack-desc b/libraries/libgnomecanvas/slack-desc
index 13159e7434..3a4e8769a3 100644
--- a/libraries/libgnomecanvas/slack-desc
+++ b/libraries/libgnomecanvas/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-libgnomecanvas: libgnomecanvas
+libgnomecanvas: libgnomecanvas (GNOME canvas library)
 libgnomecanvas:
 libgnomecanvas: The GNOME canvas is an engine for structured graphics that
 libgnomecanvas: offers a rich imaging model, high performance rendering, and a