diff options
Diffstat (limited to 'source/a/cups/cups.SlackBuild')
| -rwxr-xr-x | source/a/cups/cups.SlackBuild | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/source/a/cups/cups.SlackBuild b/source/a/cups/cups.SlackBuild index 7af4bd81..afac9132 100755 --- a/source/a/cups/cups.SlackBuild +++ b/source/a/cups/cups.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ # CUPS build script by volkerdi@slackware.com. -VERSION=1.4.6 -BUILD=${BUILD:-1} +VERSION=1.5.4 +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -53,13 +53,11 @@ mkdir -p $TMP $PKG cd $TMP rm -rf cups-$VERSION tar xvf $CWD/cups-$VERSION-source.tar.?z* || exit 1 -cd cups-$VERSION +cd cups-$VERSION || exit 1 -# Fix the USB backend to use either usblp or libusb: -zcat $CWD/usb-backend-both-usblp-and-libusb.dpatch.gz | patch -p1 --verbose || exit 1 - -# Fix locking to avoid crashes with OpenSSL: -zcat $CWD/cups.fix_broken_locking.diff.gz | patch -p1 --verbose || 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/usb-backend-reset-after-job-only-for-specific-devices.patch.gz | patch -p0 --verbose || exit 1 sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure ./configure \ @@ -78,6 +76,9 @@ mkdir -p $PKG/etc/cups mkdir -p $PKG/var/spool make BUILDROOT=$PKG install || exit 1 +# Hey, what's with the gigantic test files? Bloat is bad. +rm -f $PKG/usr/share/cups/ipptool/*.{pdf,ps,jpg} + # I've added so many things like /etc/init.d/ to Slackware that CUPS # is now installing init scripts to the Red Hat locations. We'll move # them to the usual locations: @@ -88,17 +89,6 @@ chmod 644 $PKG/etc/rc.d/rc.cups.new # Clear out the additions: rm -rf $PKG/etc/init.d $PKG/etc/rc{0,2,3,5}.d -### OBSOLETE. The USB backend is patched to support usblp again. ### -## From 1.4.x, CUPS no longer uses usblp, and having the module loaded -## will interfere with USB printers. So, we will add a blacklist rule -## so that the module is not loaded: -#mkdir -p $PKG/etc/modprobe.d -#cat << EOF > $PKG/etc/modprobe.d/cups.blacklist.usblp.conf.new -## Do not load the kernel usblp module, since it interferes with -## versions of CUPS 1.4.0 and newer: -#blacklist usblp -#EOF - # I'm not sure if overwriting this blindly could have ill effects, # but it never hurts to play it safe. According to the dbus-daemon # manpage, only files ending in .conf will be used, so there won't |