diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-05-23 03:36:06 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-23 23:21:46 -0500 |
| commit | 1e0351b4ecd87a51bbf9f5b69e3cafd3a50beafc (patch) | |
| tree | a14b842257eb118f4f68254f1fe88b8d06976170 | |
| parent | 38858efa6be7d4cb5dfdaba65bc9a549783ca480 (diff) | |
| download | slackbuilds-1e0351b4ecd87a51bbf9f5b69e3cafd3a50beafc.tar.gz | |
graphics/inkscape: Miscellaneous cleanups
| -rw-r--r--[-rwxr-xr-x] | graphics/inkscape/inkscape.SlackBuild | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild index ef31b82ff2..dff5a46ca6 100755..100644 --- a/graphics/inkscape/inkscape.SlackBuild +++ b/graphics/inkscape/inkscape.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for inkscape -# Copyright 2006-2010 Robby Workman, Northport, AL, USA +# Copyright 2006,2007,2008,2009,2010 Robby Workman, Northport, AL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,10 +24,19 @@ PRGNAM=inkscape VERSION=0.47 -ARCH=${ARCH:-i486} 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 @@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -55,8 +67,8 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . -# Uncomment for use on -current -#patch -p1 < $CWD/inkscape-poppler-0.12.2.patch +# Fixup for the poppler API changes +patch -p1 < $CWD/inkscape-poppler-0.12.2.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -75,10 +87,7 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | 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 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ |