diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2016-06-30 20:26:57 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:31:18 +0200 |
commit | d31c50870d0bee042ce660e445c9294a59a3a65b (patch) | |
tree | 6bfc0de3c95267b401b620c2c67859557dc60f97 /source/a/cups/cups.SlackBuild | |
parent | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff) | |
download | current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.xz |
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016
Slackware 14.2 x86_64 stable is released!
The long development cycle (the Linux community has lately been living in
"interesting times", as they say) is finally behind us, and we're proud to
announce the release of Slackware 14.2. The new release brings many updates
and modern tools, has switched from udev to eudev (no systemd), and adds
well over a hundred new packages to the system. Thanks to the team, the
upstream developers, the dedicated Slackware community, and everyone else
who pitched in to help make this release a reality.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Have fun! :-)
Diffstat (limited to '')
-rwxr-xr-x | source/ap/cups/cups.SlackBuild (renamed from source/a/cups/cups.SlackBuild) | 61 |
1 files changed, 44 insertions, 17 deletions
diff --git a/source/a/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild index 0bb759ee5..58b3a2594 100755 --- a/source/a/cups/cups.SlackBuild +++ b/source/ap/cups/cups.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2015 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,22 +22,37 @@ # CUPS build script by volkerdi@slackware.com. -VERSION=1.5.4 -BUILD=${BUILD:-3} +PKGNAM=cups +VERSION=${VERSION:-$(echo $PKGNAM-*-source.tar.xz | cut -f 2 -d -)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi -if [ "$ARCH" = "x86_64" ]; then +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else + SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi @@ -52,28 +67,26 @@ mkdir -p $TMP $PKG cd $TMP rm -rf cups-$VERSION -tar xvf $CWD/cups-$VERSION-source.tar.?z* || exit 1 +tar xvf $CWD/cups-$VERSION-source.tar.xz || exit 1 cd cups-$VERSION || exit 1 -# Fix for CUPS 1.5.4. Don't reload the obsolete usblp module, as this -# can cause partial printing with certain printers. -zcat $CWD/cups-1.5.4-usb-quirks.diff.gz | patch -p1 --verbose || exit 1 - sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --enable-ssl \ - --enable-openssl=yes \ - --enable-gnutls=no \ + --enable-gnutls=yes \ --enable-cdsassl=no \ --docdir=/usr/doc \ --without-php \ --disable-pam \ + --disable-avahi \ + --disable-dnssd \ --build=$ARCH-slackware-linux make $NUMJOBS || exit 1 -mkdir -p $PKG/etc/cups -mkdir -p $PKG/var/spool make BUILDROOT=$PKG install || exit 1 # Blacklist the usblp module just to make sure that it doesn't cause @@ -83,6 +96,18 @@ cp -a $CWD/cups-blacklist-usblp.conf $PKG/lib/modprobe.d chown root:root $PKG/lib/modprobe.d/cups-blacklist-usblp.conf chmod 644 $PKG/lib/modprobe.d/cups-blacklist-usblp.conf +# Remove files that overlap with the cups-filters package: +( cd $PKG + rm -f \ + usr/share/cups/banners/classified \ + usr/share/cups/banners/confidential \ + usr/share/cups/banners/secret \ + usr/share/cups/banners/standard \ + usr/share/cups/banners/topsecret \ + usr/share/cups/banners/unclassified \ + usr/share/cups/data/testprint +) + # Hey, what's with the gigantic test files? Bloat is bad. rm -f $PKG/usr/share/cups/ipptool/*.{pdf,ps,jpg} @@ -145,13 +170,15 @@ fi ( cd $PKG/usr/doc find . -name "*.pdf" -exec rm -f {} \; ) -# Apply no-clobber fix to conffiles: +# Handle .conf files with config() in the install script. +# Not .conf.default copies, though. ( cd $PKG/etc/cups - for file in * ; do + for file in *.conf ; do if [ -f $file ]; then mv $file $file.new fi - done ) + done +) # Strip stuff: find $PKG | xargs file | grep -e "executable" -e "shared object" \ |