September 2015 - crux-commits

ports/opt (3.1): cups: update to 2.1.0
by crux＠crux.nu 11 Sep '15

11 Sep '15

commit 1309ccd6a30f67fbbd75096d38c0ed8e05f5f360 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Sep 11 14:50:44 2015 +0200 cups: update to 2.1.0 diff --git a/cups/.footprint b/cups/.footprint index cef6c84..5bdd15f 100644 --- a/cups/.footprint +++ b/cups/.footprint @@ -1,11 +1,13 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/lp etc/cups/ -rw-r----- root/lp etc/cups/cups-files.conf +-rw-r----- root/lp etc/cups/cups-files.conf.default -rw-r----- root/lp etc/cups/cupsd.conf -rw-r----- root/lp etc/cups/cupsd.conf.default drwxr-xr-x root/lp etc/cups/interfaces/ drwxr-xr-x root/lp etc/cups/ppd/ -rw-r----- root/lp etc/cups/snmp.conf +-rw-r----- root/lp etc/cups/snmp.conf.default drwx------ root/lp etc/cups/ssl/ drwxr-xr-x root/root etc/modprobe.d/ -rw-r--r-- root/root etc/modprobe.d/cups.conf diff --git a/cups/.md5sum b/cups/.md5sum index 6d9a3ac..7d7c2f8 100644 --- a/cups/.md5sum +++ b/cups/.md5sum @@ -1,2 +1,2 @@ a416044375fa7c0318fcfdc5ecb0028f cups -f5c847d9a4fac6c4c66fb0526a7afaae cups-2.0.4-source.tar.bz2 +c4e57a66298bfdba66bb3d5bedd317a4 cups-2.1.0-source.tar.bz2 diff --git a/cups/Pkgfile b/cups/Pkgfile index f62a5ab..3e49475 100644 --- a/cups/Pkgfile +++ b/cups/Pkgfile @@ -4,7 +4,7 @@ # Depends on: acl tcp_wrappers libusb zlib name=cups -version=2.0.4 +version=2.1.0 release=1 source=(http://www.cups.org/software/$version/$name-$version-source.tar.bz2 cups)

1 0

ports/opt (3.1): poppler-qt4: update to 0.36.0
by crux＠crux.nu 11 Sep '15

11 Sep '15

commit f3742607c66ecbbd648efb0ef59ecba1867ad3ee Author: Juergen Daubert <jue(a)jue.li> Date: Fri Sep 11 13:32:59 2015 +0200 poppler-qt4: update to 0.36.0 diff --git a/poppler-qt4/.footprint b/poppler-qt4/.footprint index 17c8941..374a5fd 100644 --- a/poppler-qt4/.footprint +++ b/poppler-qt4/.footprint @@ -13,8 +13,8 @@ drwxr-xr-x root/root usr/include/poppler/qt4/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libpoppler-qt4.a -rwxr-xr-x root/root usr/lib/libpoppler-qt4.la -lrwxrwxrwx root/root usr/lib/libpoppler-qt4.so -> libpoppler-qt4.so.4.7.0 -lrwxrwxrwx root/root usr/lib/libpoppler-qt4.so.4 -> libpoppler-qt4.so.4.7.0 --rwxr-xr-x root/root usr/lib/libpoppler-qt4.so.4.7.0 +lrwxrwxrwx root/root usr/lib/libpoppler-qt4.so -> libpoppler-qt4.so.4.8.0 +lrwxrwxrwx root/root usr/lib/libpoppler-qt4.so.4 -> libpoppler-qt4.so.4.8.0 +-rwxr-xr-x root/root usr/lib/libpoppler-qt4.so.4.8.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/poppler-qt4.pc diff --git a/poppler-qt4/.md5sum b/poppler-qt4/.md5sum index 9d0cc03..d4d0ed4 100644 --- a/poppler-qt4/.md5sum +++ b/poppler-qt4/.md5sum @@ -1 +1 @@ -561ef4454bfabe59ef1b8b9cd4aa4c4b poppler-0.35.0.tar.xz +9f72a76e6ca899dd81b03537c4ce3680 poppler-0.36.0.tar.xz diff --git a/poppler-qt4/Pkgfile b/poppler-qt4/Pkgfile index 326717d..ec807a8 100644 --- a/poppler-qt4/Pkgfile +++ b/poppler-qt4/Pkgfile @@ -4,7 +4,7 @@ # Depends on: qt4 poppler name=poppler-qt4 -version=0.35.0 +version=0.36.0 release=1 source=(http://poppler.freedesktop.org/poppler-$version.tar.xz)

1 0

ports/opt (3.1): poppler-glib: update to 0.36.0
by crux＠crux.nu 11 Sep '15

11 Sep '15

commit bed4aaf077931c16c9d55b69d5c1b1ce6c64a128 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Sep 11 13:32:47 2015 +0200 poppler-glib: update to 0.36.0 diff --git a/poppler-glib/.md5sum b/poppler-glib/.md5sum index 9d0cc03..d4d0ed4 100644 --- a/poppler-glib/.md5sum +++ b/poppler-glib/.md5sum @@ -1 +1 @@ -561ef4454bfabe59ef1b8b9cd4aa4c4b poppler-0.35.0.tar.xz +9f72a76e6ca899dd81b03537c4ce3680 poppler-0.36.0.tar.xz diff --git a/poppler-glib/Pkgfile b/poppler-glib/Pkgfile index 44dcd93..ce06dbd 100644 --- a/poppler-glib/Pkgfile +++ b/poppler-glib/Pkgfile @@ -4,7 +4,7 @@ # Depends on: glib poppler name=poppler-glib -version=0.35.0 +version=0.36.0 release=1 source=(http://poppler.freedesktop.org/poppler-$version.tar.xz)

1 0

ports/opt (3.1): [notify] poppler: update to 0.36.0
by crux＠crux.nu 11 Sep '15

11 Sep '15

commit bd02eae9ad99eadbee021cb644d5de4d7a347e7a Author: Juergen Daubert <jue(a)jue.li> Date: Fri Sep 11 13:28:42 2015 +0200 [notify] poppler: update to 0.36.0 ABI has been changed, rebuild of direct dependent ports like cups-filters required diff --git a/poppler/.footprint b/poppler/.footprint index 709da01..fd18db7 100644 --- a/poppler/.footprint +++ b/poppler/.footprint @@ -157,9 +157,9 @@ lrwxrwxrwx root/root usr/lib/libpoppler-cpp.so.0 -> libpoppler-cpp.so.0.2.1 -rwxr-xr-x root/root usr/lib/libpoppler-cpp.so.0.2.1 -rw-r--r-- root/root usr/lib/libpoppler.a -rwxr-xr-x root/root usr/lib/libpoppler.la -lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.54.0.0 -lrwxrwxrwx root/root usr/lib/libpoppler.so.54 -> libpoppler.so.54.0.0 --rwxr-xr-x root/root usr/lib/libpoppler.so.54.0.0 +lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.55.0.0 +lrwxrwxrwx root/root usr/lib/libpoppler.so.55 -> libpoppler.so.55.0.0 +-rwxr-xr-x root/root usr/lib/libpoppler.so.55.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/poppler-cairo.pc -rw-r--r-- root/root usr/lib/pkgconfig/poppler-cpp.pc diff --git a/poppler/.md5sum b/poppler/.md5sum index 9d0cc03..d4d0ed4 100644 --- a/poppler/.md5sum +++ b/poppler/.md5sum @@ -1 +1 @@ -561ef4454bfabe59ef1b8b9cd4aa4c4b poppler-0.35.0.tar.xz +9f72a76e6ca899dd81b03537c4ce3680 poppler-0.36.0.tar.xz diff --git a/poppler/Pkgfile b/poppler/Pkgfile index dff625f..ebc1b4b 100644 --- a/poppler/Pkgfile +++ b/poppler/Pkgfile @@ -5,7 +5,7 @@ # Depends on: cairo lcms2 name=poppler -version=0.35.0 +version=0.36.0 release=1 source=(http://poppler.freedesktop.org/$name-$version.tar.xz)

1 0

ports/opt (3.1): poppler-qt4: update to 0.36.0
by crux＠crux.nu 11 Sep '15

11 Sep '15

commit f3742607c66ecbbd648efb0ef59ecba1867ad3ee Author: Juergen Daubert <jue(a)jue.li> Date: Fri Sep 11 13:32:59 2015 +0200 poppler-qt4: update to 0.36.0 diff --git a/poppler-qt4/.footprint b/poppler-qt4/.footprint index 17c8941..374a5fd 100644 --- a/poppler-qt4/.footprint +++ b/poppler-qt4/.footprint @@ -13,8 +13,8 @@ drwxr-xr-x root/root usr/include/poppler/qt4/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libpoppler-qt4.a -rwxr-xr-x root/root usr/lib/libpoppler-qt4.la -lrwxrwxrwx root/root usr/lib/libpoppler-qt4.so -> libpoppler-qt4.so.4.7.0 -lrwxrwxrwx root/root usr/lib/libpoppler-qt4.so.4 -> libpoppler-qt4.so.4.7.0 --rwxr-xr-x root/root usr/lib/libpoppler-qt4.so.4.7.0 +lrwxrwxrwx root/root usr/lib/libpoppler-qt4.so -> libpoppler-qt4.so.4.8.0 +lrwxrwxrwx root/root usr/lib/libpoppler-qt4.so.4 -> libpoppler-qt4.so.4.8.0 +-rwxr-xr-x root/root usr/lib/libpoppler-qt4.so.4.8.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/poppler-qt4.pc diff --git a/poppler-qt4/.md5sum b/poppler-qt4/.md5sum index 9d0cc03..d4d0ed4 100644 --- a/poppler-qt4/.md5sum +++ b/poppler-qt4/.md5sum @@ -1 +1 @@ -561ef4454bfabe59ef1b8b9cd4aa4c4b poppler-0.35.0.tar.xz +9f72a76e6ca899dd81b03537c4ce3680 poppler-0.36.0.tar.xz diff --git a/poppler-qt4/Pkgfile b/poppler-qt4/Pkgfile index 326717d..ec807a8 100644 --- a/poppler-qt4/Pkgfile +++ b/poppler-qt4/Pkgfile @@ -4,7 +4,7 @@ # Depends on: qt4 poppler name=poppler-qt4 -version=0.35.0 +version=0.36.0 release=1 source=(http://poppler.freedesktop.org/poppler-$version.tar.xz)

1 0

ports/opt (3.1): poppler-glib: update to 0.36.0
by crux＠crux.nu 11 Sep '15

11 Sep '15

commit bed4aaf077931c16c9d55b69d5c1b1ce6c64a128 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Sep 11 13:32:47 2015 +0200 poppler-glib: update to 0.36.0 diff --git a/poppler-glib/.md5sum b/poppler-glib/.md5sum index 9d0cc03..d4d0ed4 100644 --- a/poppler-glib/.md5sum +++ b/poppler-glib/.md5sum @@ -1 +1 @@ -561ef4454bfabe59ef1b8b9cd4aa4c4b poppler-0.35.0.tar.xz +9f72a76e6ca899dd81b03537c4ce3680 poppler-0.36.0.tar.xz diff --git a/poppler-glib/Pkgfile b/poppler-glib/Pkgfile index 44dcd93..ce06dbd 100644 --- a/poppler-glib/Pkgfile +++ b/poppler-glib/Pkgfile @@ -4,7 +4,7 @@ # Depends on: glib poppler name=poppler-glib -version=0.35.0 +version=0.36.0 release=1 source=(http://poppler.freedesktop.org/poppler-$version.tar.xz)

1 0

ports/opt (3.1): [notify] poppler: update to 0.36.0
by crux＠crux.nu 11 Sep '15

11 Sep '15

commit bd02eae9ad99eadbee021cb644d5de4d7a347e7a Author: Juergen Daubert <jue(a)jue.li> Date: Fri Sep 11 13:28:42 2015 +0200 [notify] poppler: update to 0.36.0 ABI has been changed, rebuild of direct dependent ports like cups-filters required diff --git a/poppler/.footprint b/poppler/.footprint index 709da01..fd18db7 100644 --- a/poppler/.footprint +++ b/poppler/.footprint @@ -157,9 +157,9 @@ lrwxrwxrwx root/root usr/lib/libpoppler-cpp.so.0 -> libpoppler-cpp.so.0.2.1 -rwxr-xr-x root/root usr/lib/libpoppler-cpp.so.0.2.1 -rw-r--r-- root/root usr/lib/libpoppler.a -rwxr-xr-x root/root usr/lib/libpoppler.la -lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.54.0.0 -lrwxrwxrwx root/root usr/lib/libpoppler.so.54 -> libpoppler.so.54.0.0 --rwxr-xr-x root/root usr/lib/libpoppler.so.54.0.0 +lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.55.0.0 +lrwxrwxrwx root/root usr/lib/libpoppler.so.55 -> libpoppler.so.55.0.0 +-rwxr-xr-x root/root usr/lib/libpoppler.so.55.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/poppler-cairo.pc -rw-r--r-- root/root usr/lib/pkgconfig/poppler-cpp.pc diff --git a/poppler/.md5sum b/poppler/.md5sum index 9d0cc03..d4d0ed4 100644 --- a/poppler/.md5sum +++ b/poppler/.md5sum @@ -1 +1 @@ -561ef4454bfabe59ef1b8b9cd4aa4c4b poppler-0.35.0.tar.xz +9f72a76e6ca899dd81b03537c4ce3680 poppler-0.36.0.tar.xz diff --git a/poppler/Pkgfile b/poppler/Pkgfile index dff625f..ebc1b4b 100644 --- a/poppler/Pkgfile +++ b/poppler/Pkgfile @@ -5,7 +5,7 @@ # Depends on: cairo lcms2 name=poppler -version=0.35.0 +version=0.36.0 release=1 source=(http://poppler.freedesktop.org/$name-$version.tar.xz)

1 0

ports/xorg (3.1): mesa3d: update to 10.6.7
by crux＠crux.nu 11 Sep '15

11 Sep '15

commit fa045d531fcb7c1f73858a7fcf0245b4194a4718 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Sep 11 13:26:11 2015 +0200 mesa3d: update to 10.6.7 diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum index 730ded9..9e14f46 100644 --- a/mesa3d/.md5sum +++ b/mesa3d/.md5sum @@ -1 +1 @@ -ce091e6e969392f7c63ca8c0275bbc0f mesa-10.6.6.tar.xz +88cbe0c09cac2f3fdfc94035a95ce84a mesa-10.6.7.tar.xz diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile index aea8e48..91adc13 100644 --- a/mesa3d/Pkgfile +++ b/mesa3d/Pkgfile @@ -4,7 +4,7 @@ # Depends on: elfutils expat libdrm libvdpau llvm xorg-dri3proto xorg-glproto xorg-libxdamage xorg-libxshmfence xorg-libxvmc xorg-presentproto name=mesa3d -version=10.6.6 +version=10.6.7 release=1 source=(ftp://ftp.freedesktop.org/pub/mesa/$version/mesa-$version.tar.xz)

1 0

ports/core (3.1): man-db: update to 2.7.3
by crux＠crux.nu 11 Sep '15

11 Sep '15

commit 7e88b08f3b15966f5fa90d2ccd83548e42aec6a0 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Sep 11 11:08:42 2015 +0200 man-db: update to 2.7.3 diff --git a/man-db/.footprint b/man-db/.footprint index 763ce28..e4d7e94 100644 --- a/man-db/.footprint +++ b/man-db/.footprint @@ -15,12 +15,12 @@ drwxr-xr-x root/root usr/etc/ -rw-r--r-- root/root usr/etc/man_db.conf drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/man-db/ --rwxr-xr-x root/root usr/lib/man-db/libman-2.7.2.so +-rwxr-xr-x root/root usr/lib/man-db/libman-2.7.3.so -rwxr-xr-x root/root usr/lib/man-db/libman.la -lrwxrwxrwx root/root usr/lib/man-db/libman.so -> libman-2.7.2.so --rwxr-xr-x root/root usr/lib/man-db/libmandb-2.7.2.so +lrwxrwxrwx root/root usr/lib/man-db/libman.so -> libman-2.7.3.so +-rwxr-xr-x root/root usr/lib/man-db/libmandb-2.7.3.so -rwxr-xr-x root/root usr/lib/man-db/libmandb.la -lrwxrwxrwx root/root usr/lib/man-db/libmandb.so -> libmandb-2.7.2.so +lrwxrwxrwx root/root usr/lib/man-db/libmandb.so -> libmandb-2.7.3.so drwxr-xr-x root/root usr/lib/man-db/man-db/ -rwxr-xr-x root/root usr/lib/man-db/man-db/globbing -rwxr-xr-x root/root usr/lib/man-db/man-db/manconv diff --git a/man-db/.md5sum b/man-db/.md5sum index e281dfe..57d1a09 100644 --- a/man-db/.md5sum +++ b/man-db/.md5sum @@ -1,2 +1,2 @@ -4b9480e4f1da04abb22ae7a9345ace6b man-db-2.7.2.tar.xz +df898c82d766dad6492a5a96d5a26647 man-db-2.7.3.tar.xz 43dcb76783c4b2f0578b43a43124f9e9 mandb.cron diff --git a/man-db/Pkgfile b/man-db/Pkgfile index 7057086..ee30e71 100644 --- a/man-db/Pkgfile +++ b/man-db/Pkgfile @@ -4,7 +4,7 @@ # Depends on: zlib gdbm libpipeline name=man-db -version=2.7.2 +version=2.7.3 release=1 source=(http://download.savannah.gnu.org/releases/$name/$name-$version.tar.… \ mandb.cron)

1 0

ports/opt (3.1): cups-filters: apply upstream patch to fix cups-browsed for systems without dbus
by crux＠crux.nu 10 Sep '15

10 Sep '15

commit f4a2c9146fc180a6ca331c257f256a23077dde20 Author: Juergen Daubert <jue(a)jue.li> Date: Thu Sep 10 18:02:19 2015 +0200 cups-filters: apply upstream patch to fix cups-browsed for systems without dbus diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index 4b6ebc0..4b07675 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -1,2 +1,3 @@ 7540a6989be0042429f41770b1cdf215 cups-browsed +ae85325dea633cc1ae42ea51cda29fad cups-filters-1.0.75-browsed_without_dbus.patch 928b349db6b310fa14a4cabacabbdb55 cups-filters-1.0.75.tar.xz diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index 0e5f3e7..b256a4e 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -5,13 +5,16 @@ name=cups-filters version=1.0.75 -release=1 +release=2 source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz - cups-browsed) + cups-browsed + $name-$version-browsed_without_dbus.patch) build () { cd $name-$version + patch -p0 -i $SRC/$name-$version-browsed_without_dbus.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/man \ diff --git a/cups-filters/cups-filters-1.0.75-browsed_without_dbus.patch b/cups-filters/cups-filters-1.0.75-browsed_without_dbus.patch new file mode 100644 index 0000000..3270efb --- /dev/null +++ b/cups-filters/cups-filters-1.0.75-browsed_without_dbus.patch @@ -0,0 +1,222 @@ +# https://bugs.linuxfoundation.org/show_bug.cgi?id=1316#c0 + +=== modified file 'NEWS' +--- NEWS 2015-09-07 23:55:59 +0000 ++++ NEWS 2015-09-10 01:58:49 +0000 +@@ -1,6 +1,18 @@ + NEWS - OpenPrinting CUPS Filters v1.0.75 - 2015-09-07 + ----------------------------------------------------- + ++CHANGES IN V1.0.76 ++ ++ - cups-browsed: Make absence of CUPS notifications via D-Bus ++ non-fatal and fall back to the old behavior of cups-browsed ++ (fail-over instead of load balancing for equally-named ++ remote queues, do not remove generated queue if it is ++ default instead of default printer management). This solves ++ problems of CUPS and/or cups-browsed built without D-Bus ++ support or absence of D-Bus on the system (Bug #1316). ++ - cups-browsed: Do not use g_warning() function, sneaked in by ++ copy and paste of CUPS subscription functions. ++ + CHANGES IN V1.0.75 + + - texttopdf: Really support BoldItalic (original texttops just maps + +=== modified file 'utils/cups-browsed.c' +--- utils/cups-browsed.c 2015-08-25 16:23:45 +0000 ++++ utils/cups-browsed.c 2015-09-10 01:58:49 +0000 +@@ -245,6 +245,8 @@ + + static GList *browse_data = NULL; + ++static CupsNotifier *cups_notifier = NULL; ++ + static GMainLoop *gmainloop = NULL; + #ifdef HAVE_AVAHI + static AvahiGLibPoll *glib_poll = NULL; +@@ -1569,8 +1571,8 @@ + + resp = cupsDoRequest (CUPS_HTTP_DEFAULT, req, "/"); + if (!resp || cupsLastError() != IPP_OK) { +- g_warning ("Error subscribing to CUPS notifications: %s\n", +- cupsLastErrorString ()); ++ debug_printf ("cups-browsed: Error subscribing to CUPS notifications: %s\n", ++ cupsLastErrorString ()); + return 0; + } + +@@ -1578,8 +1580,9 @@ + if (attr) + id = ippGetInteger (attr, 0); + else +- g_warning ("ipp-create-printer-subscription response doesn't contain " +- "subscription id.\n"); ++ debug_printf ("cups-browsed: " ++ "ipp-create-printer-subscription response doesn't contain " ++ "subscription id.\n"); + + ippDelete (resp); + return id; +@@ -1604,8 +1607,8 @@ + + resp = cupsDoRequest (CUPS_HTTP_DEFAULT, req, "/"); + if (!resp || cupsLastError() != IPP_OK) { +- g_warning ("Error renewing CUPS subscription %d: %s\n", +- id, cupsLastErrorString ()); ++ debug_printf ("cups-browsed: Error renewing CUPS subscription %d: %s\n", ++ id, cupsLastErrorString ()); + return FALSE; + } + +@@ -1643,8 +1646,8 @@ + + resp = cupsDoRequest (CUPS_HTTP_DEFAULT, req, "/"); + if (!resp || cupsLastError() != IPP_OK) { +- g_warning ("Error subscribing to CUPS notifications: %s\n", +- cupsLastErrorString ()); ++ debug_printf ("cups-browsed: Error subscribing to CUPS notifications: %s\n", ++ cupsLastErrorString ()); + return; + } + +@@ -1929,6 +1932,10 @@ + + int + queue_creation_handle_default(const char *printer) { ++ /* No default printer management if we cannot get D-Bus notifications ++ from CUPS */ ++ if (cups_notifier == NULL) ++ return 0; + /* If this queue is recorded as the former default queue (and the current + default is local), set it as default (the CUPS notification handler + will record the local default printer then) */ +@@ -1952,6 +1959,10 @@ + + int + queue_removal_handle_default(const char *printer) { ++ /* No default printer management if we cannot get D-Bus notifications ++ from CUPS */ ++ if (cups_notifier == NULL) ++ return 0; + /* If the queue is the default printer, get back + to the recorded local default printer, record this queue for getting the + default set to this queue again if it re-appears. */ +@@ -2737,6 +2748,17 @@ + back to the last local default printer */ + queue_removal_handle_default(p->name); + ++ /* If we do not have a subscription to CUPS' D-Bus notifications and ++ so no default printer management, we simply do not remove this ++ CUPS queue if it is the default printer, to not cause a change ++ of the default printer or the loss of the information that this ++ printer is the default printer. */ ++ if (cups_notifier == NULL && is_cups_default_printer(p->name)) { ++ /* Schedule the removal of the queue for later */ ++ p->timeout = current_time + TIMEOUT_RETRY; ++ break; ++ } ++ + /* No jobs, remove the CUPS queue */ + request = ippNewRequest(CUPS_DELETE_PRINTER); + /* Printer URI: ipp://localhost:631/printers/<queue name> */ +@@ -2821,9 +2843,12 @@ + for load balancing. In this case we will assign an implicitclass:... + device URI, which makes cups-browsed find the best destination for + each job. */ +- if (p->num_duplicates > 0) { ++ if (cups_notifier != NULL && p->num_duplicates > 0) { + /* We have duplicates, so we use the device URI +- implicitclass:<queue name> */ ++ implicitclass:<queue name> ++ We never use the implicitclass backend if we do not have D-Bus ++ notification from CUPS as we cannot assign a destination printer ++ to an incoming job then. */ + snprintf(device_uri, sizeof(device_uri), "implicitclass:%s", + p->name); + debug_printf("cups-browsed: Print queue %s has duplicates, using implicit class device URI %s\n", +@@ -4895,7 +4920,6 @@ + const char *val; + remote_printer_t *p; + GDBusProxy *proxy = NULL; +- CupsNotifier *cups_notifier = NULL; + GError *error = NULL; + int subscription_id = 0; + +@@ -4988,25 +5012,25 @@ + setenv("CUPS_SERVER", "localhost", 1); + + if (BrowseLocalProtocols & BROWSE_DNSSD) { +- fprintf(stderr, "Local support for DNSSD not implemented\n"); ++ fprintf(stderr, "cups-browsed: Local support for DNSSD not implemented\n"); + BrowseLocalProtocols &= ~BROWSE_DNSSD; + } + + if (BrowseLocalProtocols & BROWSE_LDAP) { +- fprintf(stderr, "Local support for LDAP not implemented\n"); ++ fprintf(stderr, "cups-browsed: Local support for LDAP not implemented\n"); + BrowseLocalProtocols &= ~BROWSE_LDAP; + } + + #ifndef HAVE_AVAHI + if (BrowseRemoteProtocols & BROWSE_DNSSD) { +- fprintf(stderr, "Remote support for DNSSD not supported\n"); ++ fprintf(stderr, "cups-browsed: Remote support for DNSSD not supported\n"); + BrowseRemoteProtocols &= ~BROWSE_DNSSD; + } + #endif /* HAVE_AVAHI */ + + #ifndef HAVE_LDAP + if (BrowseRemoteProtocols & BROWSE_LDAP) { +- fprintf(stderr, "Remote support for LDAP not supported\n"); ++ fprintf(stderr, "cups-browsed: Remote support for LDAP not supported\n"); + BrowseRemoteProtocols &= ~BROWSE_LDAP; + } + #endif /* HAVE_LDAP */ +@@ -5188,14 +5212,16 @@ + NULL, + &error); + if (error) { +- g_warning ("Error creating cups notify handler: %s", error->message); ++ fprintf (stderr, "cups-browsed: Error creating cups notify handler: %s", error->message); + g_error_free (error); +- goto fail; +- } +- g_signal_connect (cups_notifier, "printer-state-changed", +- G_CALLBACK (on_printer_state_changed), NULL); +- g_signal_connect (cups_notifier, "printer-deleted", +- G_CALLBACK (on_printer_deleted), NULL); ++ cups_notifier = NULL; ++ } ++ if (cups_notifier != NULL) { ++ g_signal_connect (cups_notifier, "printer-state-changed", ++ G_CALLBACK (on_printer_state_changed), NULL); ++ g_signal_connect (cups_notifier, "printer-deleted", ++ G_CALLBACK (on_printer_deleted), NULL); ++ } + + /* If auto shutdown is active and we do not find any printers initially, + schedule the shutdown in autoshutdown_timeout seconds */ +@@ -5217,10 +5243,6 @@ + + /* Clean up things */ + +- cancel_subscription (subscription_id); +- if (cups_notifier) +- g_object_unref (cups_notifier); +- + if (proxy) + g_object_unref (proxy); + +@@ -5232,6 +5254,10 @@ + } + handle_cups_queues(NULL); + ++ cancel_subscription (subscription_id); ++ if (cups_notifier) ++ g_object_unref (cups_notifier); ++ + if (BrowsePoll) { + size_t index; + for (index = 0; +

1 0