diff options
Diffstat (limited to 'extra/cups/PKGBUILD')
| -rw-r--r-- | extra/cups/PKGBUILD | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 9c7fb3531..991c98f64 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188723 2013-06-18 15:31:30Z andyrtr $ +# $Id: PKGBUILD 190057 2013-07-13 17:35:12Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.6.2 -pkgrel=3 +pkgver=1.6.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" @@ -27,13 +27,10 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b cups-1.6.0-fix-install-perms.patch cups-1.6.2-statedir.patch # Debian - usb-backend-more-quirk-rules.patch cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch get-ppd-file-for-statically-configured-ipp-shared-queues.patch - ppd-poll-with-client-conf.patch - usb-backend-do-not-crash-if-usb-disabled-in-bios.patch) -#options=('!emptydirs') -md5sums=('8b8e40560b67e28607b1f04dafd9a94d' + ppd-poll-with-client-conf.patch) +md5sums=('3c50d396fef2ba721224fe65880fe3c3' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17' '3ba9e3410df1dc3015463d615ef91b3b' @@ -46,15 +43,14 @@ md5sums=('8b8e40560b67e28607b1f04dafd9a94d' 'f30c2a161caaf27854581507cde8cac6' '5117f65342fcc69c6a506529e4daca9e' '9247e218eea94ebda0aebc8ee0e77db8' - '52675e2d7a7f77005f1fc0212b86dbe3' 'cb58bf4e0b80eaee383712e5c84a1ab4' 'b578bcd17949a7203237ba1e31f78ef9' - '0becd6ab8782b97f19a02c1dc174c75e' - 'f1f0ee65296d438a8c83467ff03f652d') + '0becd6ab8782b97f19a02c1dc174c75e') -build() { - cd ${srcdir}/${pkgbase}-${pkgver} +prepare() { + cd ${pkgbase}-${pkgver} + # add systemd socket support - Fedora patch, also used in Gentoo # modified now to the changes done by Gentoo in their svn ebuild # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1 @@ -74,9 +70,6 @@ build() { # Ensure attributes are valid UTF-8 in dbus notifier patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch - # More USB quirks for the libusb-based backend (STR #4311) - # Fixed in 1.6.3 - patch -Np1 -i ${srcdir}/usb-backend-more-quirk-rules.patch # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll. patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch # Applications could not get the PPD file for statically-configured IPP-shared print queues @@ -84,9 +77,6 @@ build() { # If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs # for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server Bug: http://www.cups.org/str.php?L2763 patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch - # Add more error handling to the libusb-based USB backend, especially to avoid a crash when USB is disabled in the BIOS. Also - # discard that error when counting warning messages. - patch -Np1 -i ${srcdir}/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch # fix permissions on some files - alternative: cups-0755.patch by FC patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch # move /var/run -> /run for pid file @@ -101,6 +91,10 @@ build() { # Rebuild configure script for not zipping man-pages. aclocal -I config-scripts autoconf -I config-scripts +} + +build() { + cd ${pkgbase}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --sbindir=/usr/bin \ @@ -122,7 +116,7 @@ build() { } check() { - cd "$srcdir/$pkgbase-$pkgver" + cd ${pkgbase}-${pkgver} #httpAddrGetList(workstation64): FAIL #1 TESTS FAILED! #make[1]: *** [testhttp] Error 1 @@ -134,7 +128,7 @@ pkgdesc="The CUPS Printing System - client libraries and headers" depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi') backup=(etc/cups/client.conf) - cd ${srcdir}/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} make BUILDROOT=${pkgdir} install-headers install-libs # put this into the libs pkg to make other software find the libs(no pkg-config file included) mkdir -p ${pkgdir}/usr/bin @@ -166,7 +160,7 @@ backup=(etc/cups/cupsd.conf depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme') optdepends=('xdg-utils: xdg .desktop file support') - cd ${srcdir}/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} make BUILDROOT=${pkgdir} install-data install-exec # this one we ship in the libcups pkg |