From 646a5c1cbfd95873950a87b5f75d52073a967023 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 28 May 2018 19:12:29 +0000 Subject: Mon May 28 19:12:29 UTC 2018 a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded. --- source/xap/sane/sane.SlackBuild | 38 ++++++++++++++++++++++++++------------ source/xap/sane/slack-desc | 6 +++--- 2 files changed, 29 insertions(+), 15 deletions(-) (limited to 'source/xap/sane') diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild index 7a43a1a5c..e14b943b1 100755 --- a/source/xap/sane/sane.SlackBuild +++ b/source/xap/sane/sane.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2018 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.0.25 -BACKVER=1.0.25 +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=sane +VERSION=1.0.27 +BACKVER=1.0.27 FRONTVER=1.0.14 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -35,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i586" ]; then @@ -51,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-sane @@ -62,7 +72,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf sane-backends-$BACKVER tar xvf $CWD/sane-backends-$BACKVER.tar.xz || exit 1 -cd sane-backends-$BACKVER +cd sane-backends-$BACKVER || exit 1 chown -R root:root . # Put the SANE_CAP_ALWAYS_SETTABLE definition back until @@ -75,13 +85,14 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --mandir=/usr/man \ - --with-docdir=/usr/doc/sane-$VERSION \ + --docdir=/usr/doc/sane-$VERSION \ --localstatedir=/var/lib \ --enable-locking \ --with-lockdir=/var/lock/sane \ --with-group=scanner \ - --enable-libusb_1_0 \ - --build=$ARCH-slackware-linux + --with-usb \ + --without-api-spec \ + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install || exit 1 @@ -113,7 +124,7 @@ install -D -m644 tools/sane-backends.pc \ cd $TMP rm -rf sane-frontends-$FRONTVER tar xvf $CWD/sane-frontends-$FRONTVER.tar.xz || exit 1 -cd sane-frontends-$FRONTVER +cd sane-frontends-$FRONTVER || exit 1 chown -R root:root . CFLAGS="$SLKCFLAGS" \ @@ -123,7 +134,7 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --mandir=/usr/man \ --with-docdir=/usr/doc/sane-$VERSION \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install || exit 1 @@ -139,6 +150,9 @@ chmod 775 $PKG/var/lock/sane find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # List additional backends in /etc/sane.d/dll.conf. # I don't think it will hurt anything to do this, even # if these backends turn out not to be available: diff --git a/source/xap/sane/slack-desc b/source/xap/sane/slack-desc index 787dbd6f2..44ef6348e 100644 --- a/source/xap/sane/slack-desc +++ b/source/xap/sane/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# 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 +# 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------------------------------------------------------| -- cgit v1.2.3-65-gdbad