libraries/libgnomecanvas: Updated for version 2.30.1.

3 files changed, 28 insertions, 16 deletions

diff --git a/libraries/libgnomecanvas/README b/libraries/libgnomecanvas/README
index b356af0715..5035cbf767 100644
--- a/libraries/libgnomecanvas/README
+++ b/libraries/libgnomecanvas/README
@@ -1,8 +1,7 @@
-The GNOME canvas is an engine for structured graphics that offers
-a rich imaging model, high performance rendering, and a powerful,
-high-level API.  It offers a choice of two rendering back-ends, one
-based on Xlib for extremely fast display, and another based on Libart,
-a sophisticated, antialiased, alpha-compositing engine. Applications
-have a choice between the Xlib imaging model or a superset of the
-PostScript imaging model, depending on the level of graphic
-sophistication required.
+The GNOME canvas is an engine for structured graphics that offers a rich 
+imaging model, high performance rendering, and a powerful, high-level API. 
+It offers a choice of two rendering back-ends:  one based on Xlib for 
+extremely fast display, and another based on Libart, a sophisticated, 
+antialiased, alpha-compositing engine.  Applications have a choice between 
+the Xlib imaging model or a superset of the PostScript imaging model, 
+depending on the level of graphic sophistication required.
diff --git a/libraries/libgnomecanvas/libgnomecanvas.SlackBuild b/libraries/libgnomecanvas/libgnomecanvas.SlackBuild
index 868fa8826b..c14b0f46cb 100644
--- a/libraries/libgnomecanvas/libgnomecanvas.SlackBuild
+++ b/libraries/libgnomecanvas/libgnomecanvas.SlackBuild
@@ -10,11 +10,20 @@
 # Maintained by Erik Hanson <erik@slackbuilds.org>
 
 PRGNAM=libgnomecanvas
-VERSION=${VERSION:-2.20.1.1}
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.30.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -29,6 +38,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -eu
@@ -50,10 +62,11 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --enable-glade \
   --enable-static=no \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/libraries/libgnomecanvas/libgnomecanvas.info b/libraries/libgnomecanvas/libgnomecanvas.info
index 7dd5aabbdc..e110797da3 100644
--- a/libraries/libgnomecanvas/libgnomecanvas.info
+++ b/libraries/libgnomecanvas/libgnomecanvas.info
@@ -1,10 +1,10 @@
 PRGNAM="libgnomecanvas"
-VERSION="2.20.1.1"
+VERSION="2.30.1"
 HOMEPAGE="http://directory.fsf.org/all/libgnomecanvas.html"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.20/libgnomecanvas-2.20.1.1.tar.bz2"
-MD5SUM="948ed771d2957d24a0c9a414e9581055"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.30/libgnomecanvas-2.30.1.tar.bz2"
+MD5SUM="362ab7b81024b3c3b4a712e7df01b169"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="dsomero"
+APPROVED="rworkman"