1 files changed, 18 insertions, 11 deletions
diff --git a/office/evince/evince.SlackBuild b/office/evince/evince.SlackBuild
index 0213ee19d2..2a6fb34265 100644..100755
--- a/office/evince/evince.SlackBuild
+++ b/office/evince/evince.SlackBuild
@@ -24,11 +24,20 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=evince
-VERSION=${VERSION:-2.26.2}
-ARCH=${ARCH:-i486}
+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
+
 NLS=${NLS:-YES}
 
 CWD=$(pwd)
@@ -45,6 +54,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -53,7 +65,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -69,9 +81,6 @@ if [ "NLS" != "YES" ]; then
       -e 's/ENABLE_NLS 1/ENABLE_NLS 0/g' configure
 fi
 
-# Remove some hard deps that aren't  :-)
-patch -p1 < $CWD/rem_unused_makedeps.patch 
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -111,12 +120,10 @@ sed -i "/NoDisplay=true/d" $PKG/usr/share/applications/evince.desktop
 rm -rf $PKG/*.schemas
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man || exit 1
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 rm -rf $PKG/{usr/share/gtk-doc,etc}
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION