September 2015 - crux-commits

ports/opt (3.2): libtiff: updated to 4.0.6
by crux＠crux.nu 13 Sep '15

13 Sep '15

commit 17cc8143fcd1d538cd3cd2deafe676a34767af45 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Sep 13 19:01:51 2015 +0200 libtiff: updated to 4.0.6 diff --git a/libtiff/.footprint b/libtiff/.footprint index 081d57f..fbaf8da 100644 --- a/libtiff/.footprint +++ b/libtiff/.footprint @@ -8,14 +8,14 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libtiff.a -rwxr-xr-x root/root usr/lib/libtiff.la -lrwxrwxrwx root/root usr/lib/libtiff.so -> libtiff.so.5.2.3 -lrwxrwxrwx root/root usr/lib/libtiff.so.5 -> libtiff.so.5.2.3 --rwxr-xr-x root/root usr/lib/libtiff.so.5.2.3 +lrwxrwxrwx root/root usr/lib/libtiff.so -> libtiff.so.5.2.4 +lrwxrwxrwx root/root usr/lib/libtiff.so.5 -> libtiff.so.5.2.4 +-rwxr-xr-x root/root usr/lib/libtiff.so.5.2.4 -rw-r--r-- root/root usr/lib/libtiffxx.a -rwxr-xr-x root/root usr/lib/libtiffxx.la -lrwxrwxrwx root/root usr/lib/libtiffxx.so -> libtiffxx.so.5.2.3 -lrwxrwxrwx root/root usr/lib/libtiffxx.so.5 -> libtiffxx.so.5.2.3 --rwxr-xr-x root/root usr/lib/libtiffxx.so.5.2.3 +lrwxrwxrwx root/root usr/lib/libtiffxx.so -> libtiffxx.so.5.2.4 +lrwxrwxrwx root/root usr/lib/libtiffxx.so.5 -> libtiffxx.so.5.2.4 +-rwxr-xr-x root/root usr/lib/libtiffxx.so.5.2.4 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libtiff-4.pc drwxr-xr-x root/root usr/share/ diff --git a/libtiff/.md5sum b/libtiff/.md5sum index 512df57..77b752b 100644 --- a/libtiff/.md5sum +++ b/libtiff/.md5sum @@ -1 +1 @@ -523a76b4a3b24a0287dcfae82580ed2c tiff-4.0.5.tar.gz +d1d2e940dea0b5ad435f21f03d96dd72 tiff-4.0.6.tar.gz diff --git a/libtiff/Pkgfile b/libtiff/Pkgfile index 0afdf6f..46767ae 100644 --- a/libtiff/Pkgfile +++ b/libtiff/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libjpeg-turbo, zlib name=libtiff -version=4.0.5 +version=4.0.6 release=1 source=(http://download.osgeo.org/libtiff/tiff-$version.tar.gz)

1 0

ports/opt (3.2): libtiff: updated to 4.0.6
by crux＠crux.nu 13 Sep '15

13 Sep '15

commit 17cc8143fcd1d538cd3cd2deafe676a34767af45 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Sep 13 19:01:51 2015 +0200 libtiff: updated to 4.0.6 diff --git a/libtiff/.footprint b/libtiff/.footprint index 081d57f..fbaf8da 100644 --- a/libtiff/.footprint +++ b/libtiff/.footprint @@ -8,14 +8,14 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libtiff.a -rwxr-xr-x root/root usr/lib/libtiff.la -lrwxrwxrwx root/root usr/lib/libtiff.so -> libtiff.so.5.2.3 -lrwxrwxrwx root/root usr/lib/libtiff.so.5 -> libtiff.so.5.2.3 --rwxr-xr-x root/root usr/lib/libtiff.so.5.2.3 +lrwxrwxrwx root/root usr/lib/libtiff.so -> libtiff.so.5.2.4 +lrwxrwxrwx root/root usr/lib/libtiff.so.5 -> libtiff.so.5.2.4 +-rwxr-xr-x root/root usr/lib/libtiff.so.5.2.4 -rw-r--r-- root/root usr/lib/libtiffxx.a -rwxr-xr-x root/root usr/lib/libtiffxx.la -lrwxrwxrwx root/root usr/lib/libtiffxx.so -> libtiffxx.so.5.2.3 -lrwxrwxrwx root/root usr/lib/libtiffxx.so.5 -> libtiffxx.so.5.2.3 --rwxr-xr-x root/root usr/lib/libtiffxx.so.5.2.3 +lrwxrwxrwx root/root usr/lib/libtiffxx.so -> libtiffxx.so.5.2.4 +lrwxrwxrwx root/root usr/lib/libtiffxx.so.5 -> libtiffxx.so.5.2.4 +-rwxr-xr-x root/root usr/lib/libtiffxx.so.5.2.4 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libtiff-4.pc drwxr-xr-x root/root usr/share/ diff --git a/libtiff/.md5sum b/libtiff/.md5sum index 512df57..77b752b 100644 --- a/libtiff/.md5sum +++ b/libtiff/.md5sum @@ -1 +1 @@ -523a76b4a3b24a0287dcfae82580ed2c tiff-4.0.5.tar.gz +d1d2e940dea0b5ad435f21f03d96dd72 tiff-4.0.6.tar.gz diff --git a/libtiff/Pkgfile b/libtiff/Pkgfile index 0afdf6f..46767ae 100644 --- a/libtiff/Pkgfile +++ b/libtiff/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libjpeg-turbo, zlib name=libtiff -version=4.0.5 +version=4.0.6 release=1 source=(http://download.osgeo.org/libtiff/tiff-$version.tar.gz)

1 0

ports/opt (3.1): gdb: do not strip python support. thanks tilman
by crux＠crux.nu 12 Sep '15

12 Sep '15

commit 4df057198db15893173ea913a9096f2144f8f0cd Author: Thomas Penteker <tek(a)serverop.de> Date: Sat Sep 12 17:01:55 2015 +0200 gdb: do not strip python support. thanks tilman diff --git a/gdb/Pkgfile b/gdb/Pkgfile index 8b66f6d..a20dac6 100644 --- a/gdb/Pkgfile +++ b/gdb/Pkgfile @@ -6,7 +6,7 @@ name=gdb version=7.9.1 -release=1 +release=2 source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.xz) build() { @@ -18,5 +18,5 @@ build() { sed -i 's/^exit $st/exit 0/g' missing make DESTDIR=$PKG install - rm -rf $PKG/usr/{info,share,lib,include} + rm -rf $PKG/usr/{lib,include,share/info,share/locale} }

1 0

ports/opt (3.1): gdb: do not strip python support. thanks tilman
by crux＠crux.nu 12 Sep '15

12 Sep '15

commit 4df057198db15893173ea913a9096f2144f8f0cd Author: Thomas Penteker <tek(a)serverop.de> Date: Sat Sep 12 17:01:55 2015 +0200 gdb: do not strip python support. thanks tilman diff --git a/gdb/Pkgfile b/gdb/Pkgfile index 8b66f6d..a20dac6 100644 --- a/gdb/Pkgfile +++ b/gdb/Pkgfile @@ -6,7 +6,7 @@ name=gdb version=7.9.1 -release=1 +release=2 source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.xz) build() { @@ -18,5 +18,5 @@ build() { sed -i 's/^exit $st/exit 0/g' missing make DESTDIR=$PKG install - rm -rf $PKG/usr/{info,share,lib,include} + rm -rf $PKG/usr/{lib,include,share/info,share/locale} }

1 0

ports/opt (3.2): p5-xml-parser: new location for man-pages
by crux＠crux.nu 12 Sep '15

12 Sep '15

commit 8b0ad85748cc07782802bb67fefd6a85322a8013 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Sep 12 15:53:08 2015 +0200 p5-xml-parser: new location for man-pages diff --git a/p5-xml-parser/.footprint b/p5-xml-parser/.footprint index 7458768..5431074 100644 --- a/p5-xml-parser/.footprint +++ b/p5-xml-parser/.footprint @@ -45,12 +45,13 @@ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.22/linux-thread-multi/auto/XML/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.22/linux-thread-multi/auto/XML/Parser/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.22/linux-thread-multi/auto/XML/Parser/Expat/ -r-xr-xr-x root/root usr/lib/perl5/site_perl/5.22/linux-thread-multi/auto/XML/Parser/Expat/Expat.so -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man3/ --r--r--r-- root/root usr/man/man3/XML::Parser.3pm.gz --r--r--r-- root/root usr/man/man3/XML::Parser::Expat.3pm.gz --r--r--r-- root/root usr/man/man3/XML::Parser::Style::Debug.3pm.gz --r--r--r-- root/root usr/man/man3/XML::Parser::Style::Objects.3pm.gz --r--r--r-- root/root usr/man/man3/XML::Parser::Style::Stream.3pm.gz --r--r--r-- root/root usr/man/man3/XML::Parser::Style::Subs.3pm.gz --r--r--r-- root/root usr/man/man3/XML::Parser::Style::Tree.3pm.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man3/ +-r--r--r-- root/root usr/share/man/man3/XML::Parser.3pm.gz +-r--r--r-- root/root usr/share/man/man3/XML::Parser::Expat.3pm.gz +-r--r--r-- root/root usr/share/man/man3/XML::Parser::Style::Debug.3pm.gz +-r--r--r-- root/root usr/share/man/man3/XML::Parser::Style::Objects.3pm.gz +-r--r--r-- root/root usr/share/man/man3/XML::Parser::Style::Stream.3pm.gz +-r--r--r-- root/root usr/share/man/man3/XML::Parser::Style::Subs.3pm.gz +-r--r--r-- root/root usr/share/man/man3/XML::Parser::Style::Tree.3pm.gz

1 0

ports/opt (3.2): p5-xml-parser: new location for man-pages
by crux＠crux.nu 12 Sep '15

12 Sep '15

commit 8b0ad85748cc07782802bb67fefd6a85322a8013 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Sep 12 15:53:08 2015 +0200 p5-xml-parser: new location for man-pages diff --git a/p5-xml-parser/.footprint b/p5-xml-parser/.footprint index 7458768..5431074 100644 --- a/p5-xml-parser/.footprint +++ b/p5-xml-parser/.footprint @@ -45,12 +45,13 @@ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.22/linux-thread-multi/auto/XML/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.22/linux-thread-multi/auto/XML/Parser/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.22/linux-thread-multi/auto/XML/Parser/Expat/ -r-xr-xr-x root/root usr/lib/perl5/site_perl/5.22/linux-thread-multi/auto/XML/Parser/Expat/Expat.so -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man3/ --r--r--r-- root/root usr/man/man3/XML::Parser.3pm.gz --r--r--r-- root/root usr/man/man3/XML::Parser::Expat.3pm.gz --r--r--r-- root/root usr/man/man3/XML::Parser::Style::Debug.3pm.gz --r--r--r-- root/root usr/man/man3/XML::Parser::Style::Objects.3pm.gz --r--r--r-- root/root usr/man/man3/XML::Parser::Style::Stream.3pm.gz --r--r--r-- root/root usr/man/man3/XML::Parser::Style::Subs.3pm.gz --r--r--r-- root/root usr/man/man3/XML::Parser::Style::Tree.3pm.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man3/ +-r--r--r-- root/root usr/share/man/man3/XML::Parser.3pm.gz +-r--r--r-- root/root usr/share/man/man3/XML::Parser::Expat.3pm.gz +-r--r--r-- root/root usr/share/man/man3/XML::Parser::Style::Debug.3pm.gz +-r--r--r-- root/root usr/share/man/man3/XML::Parser::Style::Objects.3pm.gz +-r--r--r-- root/root usr/share/man/man3/XML::Parser::Style::Stream.3pm.gz +-r--r--r-- root/root usr/share/man/man3/XML::Parser::Style::Subs.3pm.gz +-r--r--r-- root/root usr/share/man/man3/XML::Parser::Style::Tree.3pm.gz

1 0

ports/core (3.1): gettext: update to 0.19.6
by crux＠crux.nu 12 Sep '15

12 Sep '15

commit cd2a3b33896b2792c868072a2d7f6b72337335ca Author: Juergen Daubert <jue(a)jue.li> Date: Sat Sep 12 13:41:41 2015 +0200 gettext: update to 0.19.6 diff --git a/gettext/.footprint b/gettext/.footprint index ee1d11b..0e8e0ee 100644 --- a/gettext/.footprint +++ b/gettext/.footprint @@ -37,17 +37,17 @@ drwxr-xr-x root/root usr/lib/gettext/ lrwxrwxrwx root/root usr/lib/libasprintf.so -> libasprintf.so.0.0.0 lrwxrwxrwx root/root usr/lib/libasprintf.so.0 -> libasprintf.so.0.0.0 -rwxr-xr-x root/root usr/lib/libasprintf.so.0.0.0 --rwxr-xr-x root/root usr/lib/libgettextlib-0.19.5.1.so +-rwxr-xr-x root/root usr/lib/libgettextlib-0.19.6.so -rwxr-xr-x root/root usr/lib/libgettextlib.la -lrwxrwxrwx root/root usr/lib/libgettextlib.so -> libgettextlib-0.19.5.1.so +lrwxrwxrwx root/root usr/lib/libgettextlib.so -> libgettextlib-0.19.6.so -rw-r--r-- root/root usr/lib/libgettextpo.a -rwxr-xr-x root/root usr/lib/libgettextpo.la lrwxrwxrwx root/root usr/lib/libgettextpo.so -> libgettextpo.so.0.5.3 lrwxrwxrwx root/root usr/lib/libgettextpo.so.0 -> libgettextpo.so.0.5.3 -rwxr-xr-x root/root usr/lib/libgettextpo.so.0.5.3 --rwxr-xr-x root/root usr/lib/libgettextsrc-0.19.5.1.so +-rwxr-xr-x root/root usr/lib/libgettextsrc-0.19.6.so -rwxr-xr-x root/root usr/lib/libgettextsrc.la -lrwxrwxrwx root/root usr/lib/libgettextsrc.so -> libgettextsrc-0.19.5.1.so +lrwxrwxrwx root/root usr/lib/libgettextsrc.so -> libgettextsrc-0.19.6.so -rw-r--r-- root/root usr/lib/preloadable_libintl.so drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ diff --git a/gettext/.md5sum b/gettext/.md5sum index 74dd2c3..6f8f67f 100644 --- a/gettext/.md5sum +++ b/gettext/.md5sum @@ -1 +1 @@ -9b7c37e410df4bd1bf854e8c897cf937 gettext-0.19.5.1.tar.xz +69d79254ee3b41df23f41c2f4fd720d9 gettext-0.19.6.tar.xz diff --git a/gettext/Pkgfile b/gettext/Pkgfile index 9b86228..25dbc54 100644 --- a/gettext/Pkgfile +++ b/gettext/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses acl name=gettext -version=0.19.5.1 +version=0.19.6 release=1 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz)

1 0

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

12 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.2): cups-filters: apply upstream patch to fix cups-browsed for systems without dbus
by crux＠crux.nu 12 Sep '15

12 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

ports/opt (3.2): chromium-pepperflash: 39.0.2171.95 -> 45.0.2454.85
by crux＠crux.nu 12 Sep '15

12 Sep '15

commit 9572dcf17851eb37ee27ad31c2fa53e235ffe8be Author: Thomas Penteker <tek(a)serverop.de> Date: Wed Sep 9 01:58:04 2015 +0200 chromium-pepperflash: 39.0.2171.95 -> 45.0.2454.85 diff --git a/chromium-pepperflash/Pkgfile b/chromium-pepperflash/Pkgfile index f311217..7d43990 100644 --- a/chromium-pepperflash/Pkgfile +++ b/chromium-pepperflash/Pkgfile @@ -4,7 +4,7 @@ # Depends on: chromium name=chromium-pepperflash -version=39.0.2171.95 +version=45.0.2454.85 release=1 source=()

1 0