diff options
| author | Juergen Daubert <jue@jue.li> | 2014-05-29 12:56:12 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2014-05-29 12:56:12 +0200 |
| commit | cf8fd195e30cc638e1daa7ea7ae04088e5e5b2d2 (patch) | |
| tree | e455b2c31d91daf8bbca7656e38f09978295e259 /cups | |
| parent | a2c6a27cdef8b47e4e8884b6d693d7653b14a499 (diff) | |
| download | opt-cf8fd195e30cc638e1daa7ea7ae04088e5e5b2d2.tar.gz opt-cf8fd195e30cc638e1daa7ea7ae04088e5e5b2d2.tar.xz | |
cups: update to 1.7.3
Diffstat (limited to 'cups')
| -rw-r--r-- | cups/.md5sum | 3 | ||||
| -rw-r--r-- | cups/Pkgfile | 11 | ||||
| -rw-r--r-- | cups/cups-dnssd.patch | 44 |
3 files changed, 51 insertions, 7 deletions
diff --git a/cups/.md5sum b/cups/.md5sum index 88257c043..cbaff7768 100644 --- a/cups/.md5sum +++ b/cups/.md5sum @@ -1,3 +1,4 @@ 01b6a755c5b0fb7df2d2c94571f67e1d cups -55277c40fd4b7183dc3671d39c5c42b7 cups-1.7.1-source.tar.bz2 +d498c3020acda0904ab0c13b6389a1ec cups-1.7.3-source.tar.bz2 fd78a2c51a2e206ea85d21d2dc9dde69 cups-config.patch +e579b616ea59ab462cff1b1361d4d741 cups-dnssd.patch diff --git a/cups/Pkgfile b/cups/Pkgfile index 0eae89353..a43cf5c64 100644 --- a/cups/Pkgfile +++ b/cups/Pkgfile @@ -4,18 +4,17 @@ # Depends on: acl tcp_wrappers libusb openssl zlib name=cups -version=1.7.1 +version=1.7.3 release=1 source=(http://www.cups.org/software/$version/$name-$version-source.tar.bz2 - cups-config.patch cups) + cups-config.patch cups + cups-dnssd.patch) build () { cd $name-$version patch -p1 -i $SRC/cups-config.patch - - # Don' use clang to build - sed -i 's/clang / /g' configure + patch -p1 -i $SRC/cups-dnssd.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -34,7 +33,7 @@ build () { --enable-tcp-wrappers \ --enable-acl \ --disable-pam \ - --disable-dbus + --disable-dbus make make BUILDROOT=$PKG install diff --git a/cups/cups-dnssd.patch b/cups/cups-dnssd.patch new file mode 100644 index 000000000..a120f20f7 --- /dev/null +++ b/cups/cups-dnssd.patch @@ -0,0 +1,44 @@ +commit 8441e27ce4008828cbdd25bdd6249c0019853b92 +Author: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> +Date: Fri May 9 20:57:11 2014 +0000 + + CUPS did not compile when Avahi or mDNSResponder was not present (STR #4402) + + + + git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11871 a1ca3aef-8c08-0410-bb20-df032aa958be + +diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c +index 495bf1b..4e417b0 100644 +--- a/scheduler/dirsvc.c ++++ b/scheduler/dirsvc.c +@@ -237,11 +237,13 @@ cupsdStartBrowsing(void) + if (BrowseLocalProtocols & BROWSE_SMB) + update_smb(1); + ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + /* + * Register the individual printers + */ + + dnssdRegisterAllPrinters(0); ++#endif /* HAVE_DNSSD || HAVE_AVAHI */ + } + + +@@ -255,6 +257,7 @@ cupsdStopBrowsing(void) + if (!Browsing || !BrowseLocalProtocols) + return; + ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + /* + * De-register the individual printers + */ +@@ -265,7 +268,6 @@ cupsdStopBrowsing(void) + * Shut down browsing sockets... + */ + +-#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDMaster) + dnssdStop(); + #endif /* HAVE_DNSSD || HAVE_AVAHI */ |