diff options
| -rw-r--r-- | graphics/simple-scan/README | 7 | ||||
| -rw-r--r-- | graphics/simple-scan/simple-scan.SlackBuild | 37 | ||||
| -rw-r--r-- | graphics/simple-scan/simple-scan.info | 8 |
3 files changed, 11 insertions, 41 deletions
diff --git a/graphics/simple-scan/README b/graphics/simple-scan/README index a528281730..375d326826 100644 --- a/graphics/simple-scan/README +++ b/graphics/simple-scan/README @@ -1,9 +1,2 @@ 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/simple-scan.SlackBuild b/graphics/simple-scan/simple-scan.SlackBuild index c72239bd83..f781cab523 100644 --- a/graphics/simple-scan/simple-scan.SlackBuild +++ b/graphics/simple-scan/simple-scan.SlackBuild @@ -3,7 +3,7 @@ # Slackware Package Build Script for simple-scan # Home Page https://launchpad.net/simple-scan -# Copyright (c) 2010-2016, Nishant Limbachia, Hoffman Estates, IL, USA +# Copyright (c) 2010-2017, Nishant Limbachia, Hoffman Estates, IL, USA # [nishant _AT_ mnspace _DOT_ net] # All rights reserved. # @@ -26,7 +26,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM="simple-scan" -VERSION=${VERSION:-3.22.0.1} +VERSION=${VERSION:-3.25.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,40 +71,17 @@ find -L . \ \( -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 +meson --prefix $PKG/usr build -LDFLAGS="-L/usr/lib$LIBDIRSUFFIX" \ -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - $colord_option \ - $packagekit_option \ - --disable-schemas-compile \ - --build=$ARCH-slackware-linux +# Fix for meson-0.44.0, thanks to Andrew Clemons +sed -i 's,../src/src/,../src/,g' build/build.ninja -make clean -make -make install-strip DESTDIR=$PKG +ninja -C build all install mkdir -p $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 +mv $PKG/usr/share/man $PKG/usr/man mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/graphics/simple-scan/simple-scan.info b/graphics/simple-scan/simple-scan.info index 3db78ce566..5c6d85d344 100644 --- a/graphics/simple-scan/simple-scan.info +++ b/graphics/simple-scan/simple-scan.info @@ -1,10 +1,10 @@ PRGNAM="simple-scan" -VERSION="3.22.0.1" +VERSION="3.25.1" HOMEPAGE="https://launchpad.net/simple-scan" -DOWNLOAD="https://launchpad.net/simple-scan/3.22/3.22.0.1/+download/simple-scan-3.22.0.1.tar.xz" -MD5SUM="994e76360ceec45dbf744d9a1adab846" +DOWNLOAD="https://launchpad.net/simple-scan/3.25/3.25.1/+download/simple-scan-3.25.1.tar.xz" +MD5SUM="6bff2b9bdfb529e21582f4a65c3f2d27" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libgusb vala" +REQUIRES="colord packagekit meson libgusb vala" MAINTAINER="Nishant Limbachia" EMAIL="nishant@mnspace.net" |