commit 1dc5a55b5b9d136fef378d72cfecbd936d8a5313 Author: Juergen Daubert <jue@jue.li> Date: Fri Mar 22 09:34:18 2013 +0100 cups-filters: update to 1.0.31 diff --git a/cups-filters/.footprint b/cups-filters/.footprint index 24fc4af..382b668 100644 --- a/cups-filters/.footprint +++ b/cups-filters/.footprint @@ -52,6 +52,8 @@ lrwxrwxrwx root/root usr/lib/libfontembed.so.1 -> libfontembed.so.1.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libcupsfilters.pc -rw-r--r-- root/root usr/lib/pkgconfig/libfontembed.pc +drwxr-xr-x root/root usr/sbin/ +-rwxr-xr-x root/root usr/sbin/cups-browsed drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/cups/ drwxr-xr-x root/root usr/share/cups/banners/ diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index 6f71484..75611a0 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -1,2 +1 @@ -c6cca1041657a23192547010f8f2cca8 cups-filters-1.0.30.tar.xz -ccea97e72f40c79a4fdc2af467c059dd cups-filters-build_without_avahi.patch +ebf24dac0de3e84ca1fdecf99277d27e cups-filters-1.0.31.tar.xz diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index 7269e08..b638cc2 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -4,23 +4,19 @@ # Depends on: cups poppler qpdf name=cups-filters -version=1.0.30 +version=1.0.31 release=1 -source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz - $name-build_without_avahi.patch) +source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz) build () { cd $name-$version - patch -p0 -i $SRC/$name-build_without_avahi.patch - - autoconf ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/man \ --without-php \ --disable-avahi \ - --with-browseremoteprotocols=none + --without-rcdir make make DESTDIR=$PKG install diff --git a/cups-filters/cups-filters-build_without_avahi.patch b/cups-filters/cups-filters-build_without_avahi.patch deleted file mode 100644 index 828a9a8..0000000 --- a/cups-filters/cups-filters-build_without_avahi.patch +++ /dev/null @@ -1,155 +0,0 @@ -=== modified file 'NEWS' ---- NEWS 2013-03-07 18:20:26 +0000 -+++ NEWS 2013-03-08 17:00:06 +0000 -@@ -1,6 +1,12 @@ - NEWS - OpenPrinting CUPS Filters v1.0.30 - 2013-03-07 - ----------------------------------------------------- - -+CHANGES IN V1.0.31 -+ -+ - Fixed build system to allow building without Avahi. In this case -+ a cups-browsed with only CUPS broadcasting/browsing will get -+ built. Thanks to Tim Waugh from Red Hat (Bug #1101). -+ - CHANGES IN V1.0.30 - - - cups-browsed: Do not remove a generated local print queue when - -=== modified file 'configure.ac' ---- configure.ac 2013-03-07 18:20:26 +0000 -+++ configure.ac 2013-03-08 17:00:06 +0000 -@@ -207,6 +207,8 @@ - dnl Avahi for cups-browsed - AVAHI_LIBS="" - AVAHI_CFLAGS="" -+AVAHI_GLIB_CFLAGS="" -+AVAHI_GLIB_LIBS="" - - AC_ARG_ENABLE([avahi], - [AS_HELP_STRING([--disable-avahi], [Disable DNS Service Discovery support using Avahi.])], -@@ -231,6 +233,7 @@ - AC_DEFINE(HAVE_AVAHI, [], [Define if you have the avahi library]) - else - AC_MSG_RESULT(no) -+ enable_avahi=no - fi - fi - -@@ -241,7 +244,10 @@ - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - --PKG_CHECK_MODULES(AVAHI_GLIB, [avahi-glib]) -+if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then -+ PKG_CHECK_MODULES(AVAHI_GLIB, [avahi-glib]) -+fi -+ - AC_SUBST(AVAHI_GLIB_CFLAGS) - AC_SUBST(AVAHI_GLIB_LIBS) - - -=== modified file 'utils/cups-browsed.c' ---- utils/cups-browsed.c 2013-03-07 18:10:09 +0000 -+++ utils/cups-browsed.c 2013-03-08 17:00:06 +0000 -@@ -36,12 +36,14 @@ - - #include <glib.h> - -+#ifdef HAVE_AVAHI - #include <avahi-client/client.h> - #include <avahi-client/lookup.h> - - #include <avahi-glib/glib-watch.h> - #include <avahi-common/malloc.h> - #include <avahi-common/error.h> -+#endif /* HAVE_AVAHI */ - - #include <cups/cups.h> - -@@ -99,7 +101,9 @@ - static cups_array_t *browseallow; - - static GMainLoop *gmainloop = NULL; -+#ifdef HAVE_AVAHI - static AvahiGLibPoll *glib_poll = NULL; -+#endif /* HAVE_AVAHI */ - static guint queues_timer_id = (guint) -1; - static int browsesocket = -1; - -@@ -557,6 +561,7 @@ - } - } - -+#ifdef HAVE_AVAHI - static void resolve_callback( - AvahiServiceResolver *r, - AVAHI_GCC_UNUSED AvahiIfIndex interface, -@@ -905,6 +910,7 @@ - } - - } -+#endif /* HAVE_AVAHI */ - - void - found_cups_printer (const char *remote_host, const char *uri, -@@ -1712,9 +1718,11 @@ - } - - int main(int argc, char*argv[]) { -+#ifdef HAVE_AVAHI - AvahiClient *client = NULL; - AvahiServiceBrowser *sb1 = NULL, *sb2 = NULL; - int error; -+#endif /* HAVE_AVAHI */ - int ret = 1; - http_t *http; - cups_dest_t *dests, -@@ -1741,6 +1749,13 @@ - BrowseLocalProtocols &= ~BROWSE_DNSSD; - } - -+#ifndef HAVE_AVAHI -+ if (BrowseRemoteProtocols & BROWSE_DNSSD) { -+ fprintf(stderr, "Remote support for DNSSD not supported\n"); -+ BrowseRemoteProtocols &= ~BROWSE_DNSSD; -+ } -+#endif /* HAVE_AVAHI */ -+ - /* Wait for CUPS daemon to start */ - while ((http = httpConnectEncrypt(cupsServer(), ippPort(), - cupsEncryption())) == NULL) -@@ -1815,6 +1830,7 @@ - debug_printf("cups-browsed: Using signal handler SIGNAL\n"); - #endif /* HAVE_SIGSET */ - -+#ifdef HAVE_AVAHI - if (BrowseRemoteProtocols & BROWSE_DNSSD) { - /* Allocate main loop object */ - if (!(glib_poll = avahi_glib_poll_new(NULL, G_PRIORITY_DEFAULT))) { -@@ -1866,6 +1882,7 @@ - } - } - } -+#endif /* HAVE_AVAHI */ - - if (BrowseLocalProtocols & BROWSE_CUPS || - BrowseRemoteProtocols & BROWSE_CUPS) { -@@ -1955,7 +1972,8 @@ - p->timeout = time(NULL) + TIMEOUT_IMMEDIATELY; - } - handle_cups_queues(NULL); -- -+ -+#ifdef HAVE_AVAHI - /* Free the data structures for Bonjour browsing */ - if (sb1) - avahi_service_browser_free(sb1); -@@ -1967,6 +1985,7 @@ - - if (glib_poll) - avahi_glib_poll_free(glib_poll); -+#endif /* HAVE_AVAHI */ - - if (browsesocket != -1) - close (browsesocket); -