diff options
| -rw-r--r-- | graphics/simple-scan/README | 7 | ||||
| -rw-r--r-- | graphics/simple-scan/doinst.sh | 14 | ||||
| -rw-r--r-- | graphics/simple-scan/simple-scan.SlackBuild | 49 | ||||
| -rw-r--r-- | graphics/simple-scan/simple-scan.info | 9 | ||||
| -rw-r--r-- | graphics/simple-scan/slack-desc | 11 |
5 files changed, 51 insertions, 39 deletions
diff --git a/graphics/simple-scan/README b/graphics/simple-scan/README index 375d326826..a528281730 100644 --- a/graphics/simple-scan/README +++ b/graphics/simple-scan/README @@ -1,2 +1,9 @@ simple-scan is a simple scanning utility designed to be less overwhelming than xsane for casual/occasional scanning jobs. + +colord and packagekit are optional dependencies and can be +turned on by invoking the script as follows: + +colord=yes ./simple-scan.SlackBuild OR +packagekit=yes ./simple-scan.SlackBuild OR +colord=yes packagekit=yes ./simple-scan.SlackBuild diff --git a/graphics/simple-scan/doinst.sh b/graphics/simple-scan/doinst.sh index e123fd7296..ed2846092a 100644 --- a/graphics/simple-scan/doinst.sh +++ b/graphics/simple-scan/doinst.sh @@ -1,11 +1,3 @@ -schema_install() { - SCHEMA="$1" - GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \ - chroot . gconftool-2 --makefile-install-rule \ - /etc/gconf/schemas/$SCHEMA \ - 1>/dev/null -} - if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi @@ -20,4 +12,8 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then fi fi - +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi diff --git a/graphics/simple-scan/simple-scan.SlackBuild b/graphics/simple-scan/simple-scan.SlackBuild index c1a3533e04..88786c149c 100644 --- a/graphics/simple-scan/simple-scan.SlackBuild +++ b/graphics/simple-scan/simple-scan.SlackBuild @@ -3,7 +3,8 @@ # Slackware Package Build Script for simple-scan # Home Page https://launchpad.net/simple-scan -# Copyright (c) 2010-2011, Nishant Limbachia, Hoffman Estates, IL, USA (nishant _AT_ mnspace _DOT_ net) +# Copyright (c) 2010-2016, Nishant Limbachia, Hoffman Estates, IL, USA +# [nishant _AT_ mnspace _DOT_ net] # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,14 +25,14 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=simple-scan -VERSION=${VERSION:-2.32.0.2} +PRGNAM="simple-scan" +VERSION=${VERSION:-3.21.90} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +43,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -65,11 +66,24 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root.root . 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 750 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 640 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +if [ "${colord:-no}" = "no" ]; then + colord_option="--disable-colord" +else + colord_option="--enable-colord" +fi + +if [ "${packagekit:-no}" = "no" ]; then + packagekit_option="--disable-packagekit" +else + packagekit_option="--enable-packagekit" +fi + +LDFLAGS="-L/usr/lib$LIBDIRSUFFIX" \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -77,27 +91,24 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var \ --mandir=/usr/man \ - --disable-scrollkeeper \ + $colord_option \ + $packagekit_option \ + --disable-schemas-compile \ --build=$ARCH-slackware-linux +make clean make make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS ChangeLog COPYING INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION 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 mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -for i in $PKG/etc/gconf/schemas/* ; do - echo "schema_install $(basename $i)" >> $PKG/install/doinst.sh -done - cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} - diff --git a/graphics/simple-scan/simple-scan.info b/graphics/simple-scan/simple-scan.info index f582e1cf40..5059258522 100644 --- a/graphics/simple-scan/simple-scan.info +++ b/graphics/simple-scan/simple-scan.info @@ -1,11 +1,10 @@ PRGNAM="simple-scan" -VERSION="2.32.0.2" +VERSION="3.21.90" HOMEPAGE="https://launchpad.net/simple-scan" -DOWNLOAD="https://launchpad.net/simple-scan/2.32/2.32.0.2/+download/simple-scan-2.32.0.2.tar.bz2" -MD5SUM="8435b0a31aba1255caf685eb57b18e06" +DOWNLOAD="https://launchpad.net/simple-scan/3.21/3.21.90/+download/simple-scan-3.21.90.tar.xz" +MD5SUM="5b9993cb9f5f41bcd5ad24c41ac52d0c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="libgusb vala" MAINTAINER="Nishant Limbachia" EMAIL="nishant@mnspace.net" - diff --git a/graphics/simple-scan/slack-desc b/graphics/simple-scan/slack-desc index 39ac07dfb9..2101726e60 100644 --- a/graphics/simple-scan/slack-desc +++ b/graphics/simple-scan/slack-desc @@ -1,9 +1,9 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| simple-scan: simple-scan (simple scanning utility) @@ -17,4 +17,3 @@ simple-scan: simple-scan: simple-scan: simple-scan: - |