summaryrefslogtreecommitdiff
path: root/extra/cups
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-01-23 03:40:09 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-01-23 03:40:09 +0000
commit1a04b89cbb8e27e4622005c896745498af51ef45 (patch)
tree5991cef855e2a5ae07d66cccd5b47ba681007483 /extra/cups
parentc9e4976968b0f847cc693453df1e947531af2e76 (diff)
Thu Jan 23 03:35:13 UTC 2014
Diffstat (limited to 'extra/cups')
-rw-r--r--extra/cups/PKGBUILD15
-rw-r--r--extra/cups/cups-systemd-socket.patch3
2 files changed, 11 insertions, 7 deletions
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 5bbee3ddd..854c84593 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 204308 2014-01-17 05:30:06Z andyrtr $
+# $Id: PKGBUILD 204552 2014-01-22 13:21:08Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.7.1
-pkgrel=1
+pkgrel=3
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'openssl' 'cups-filters' 'bc'
- 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus' 'avahi' 'hicolor-icon-theme' 'systemd' 'inetutils')
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'openssl'
+ 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus'
+ 'avahi' 'hicolor-icon-theme' 'systemd' 'inetutils' 'libpaper' 'valgrind')
source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
cups.logrotate cups.pam
@@ -36,7 +37,7 @@ md5sums=('55277c40fd4b7183dc3671d39c5c42b7'
'3ba9e3410df1dc3015463d615ef91b3b'
'cc4101beccb5ed6deb1c92707a575925'
'90c30380d4c8cd48a908cfdadae1ea24'
- '555a1c71151ce990e176315b46e3de2f'
+ 'be0ce5a9bcf5079af1a260fef395e146'
'8fe27d4248cacbc02824e7937cab4088'
'df0c367c0022e3c7d8e01827e8a6c5e7'
'f30c2a161caaf27854581507cde8cac6'
@@ -110,6 +111,7 @@ build() {
--enable-ssl=yes --enable-openssl \
--enable-threads \
--enable-avahi\
+ --enable-libpaper \
--with-php=/usr/bin/php-cgi \
--with-optim="$CFLAGS"
make
@@ -156,7 +158,8 @@ backup=(etc/cups/cupsd.conf
etc/logrotate.d/cups
etc/pam.d/cups
etc/xinetd.d/cups-lpd)
-depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus' 'systemd' 'hicolor-icon-theme')
+depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord'
+ 'libusb' 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme')
optdepends=('xdg-utils: xdg .desktop file support')
cd ${pkgbase}-${pkgver}
diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch
index cfbe93354..4c3de1188 100644
--- a/extra/cups/cups-systemd-socket.patch
+++ b/extra/cups/cups-systemd-socket.patch
@@ -117,12 +117,13 @@ diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.s
diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in
--- cups-1.7rc1/data/cups.socket.in.systemd-socket 2013-07-12 11:16:53.259546235 +0200
+++ cups-1.7rc1/data/cups.socket.in 2013-07-12 11:16:53.259546235 +0200
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,9 @@
+[Unit]
+Description=CUPS Printing Service Sockets
+
+[Socket]
+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
++ListenStream=@DEFAULT_IPP_PORT@
+
+[Install]
+WantedBy=sockets.target