From 7b1e64471fc1684a931a3318244693c94b7e5502 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 14 Jun 2015 16:08:04 +0000 Subject: Update to cups-filters-1.0.69, from Leonardo Taccari in PR 49972. Changes: - cups-browsed: When generating a PPD for an auto-discovered IPP network printer, create a "ColorModel" option only if valid choices are reported for it by the IPP printer. - cups-browsed: Updated PPD file generator for auto-generated queues for IPP network printers from the CUPS 2.1.x upstream code, so that floating-point numbers are written in a locale-neutral way (CUPS STR #4579). - cups-browsed: When checking whether a queue name already exists as a locally defined queue, do case-insensitive comparing as for CUPS printer names are case-insensitive. This assures that already existing queues do never get overwritten. - cups-browsed: Added "IPPPrinterQueueType Auto/PPD/NoPPD" directive to cups-browsed.conf to allow controlling how cups-browsed creates queues fr native IPP network printers: with PPD, with System V interface script, or selecting automatically. - pdftopdf: Center Landscape-oriented jobs correctly on the page if the "fitplot" or "number-up" options are used (Bug #1284). - pstopdf: Removed "-dUseCIEColor" from the Ghostscript command line. In modern Ghostscript versions (9.11 and newer) it is recommended to not use it with the pdfwrite and ps2write output devices any more. - imagetopdf: Corrections in PDF output: Let evince display the PDF with the correct size including margins and let ghostscript not complain about an invalid xref entry. - cups-browsed: Do not add options to the System V interface script which calls sys5ippprinter but set the options as defaults for the CUPS queue in printers.conf. - cups-browsed: When auto-generating a PPD-less print queue for an IPP network printer, determine default page size, unprintable margins, and color space from the printer via an IPP request. - imagetopdf: Debug logging should be only controlled by the LogLevel of CUPS, not by an awkward build time switch. - cups-browsed: Determine from the TXT records of the Bonjour broadcast of an IPP network printer whether it has color and duplex capabilities and if yes, let auto-generated PPD-less print queues use appropriate command line options to make use of these capabilities. - imagetopdf: Make this filter also work with auto-generated PPD-less print queues for IPP network printers. - sys5ippprinter: Renamed pdftoippprinter to reflect that it is once a System 5 interface script and second does not accept only PDF as input. - pdftoippprinter: Support also PWG Raster and JPEG as input formats so that an auto-generated, PPD-less queue for an IPP printer emulates an IPP Everywhere printer. --- print/cups-filters/Makefile | 5 ++--- print/cups-filters/PLIST | 4 ++-- print/cups-filters/distinfo | 12 ++++++------ print/cups-filters/patches/patch-configure.ac | 5 ++++- .../patches/patch-filter_foomatic-rip_foomaticrip.c | 5 ++++- 5 files changed, 18 insertions(+), 13 deletions(-) (limited to 'print') diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 60c6aed2a3f..705df2af422 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2015/06/11 19:13:46 asau Exp $ +# $NetBSD: Makefile,v 1.22 2015/06/14 16:08:04 wiz Exp $ -DISTNAME= cups-filters-1.0.68 -PKGREVISION= 2 +DISTNAME= cups-filters-1.0.69 CATEGORIES= print MASTER_SITES= http://openprinting.org/download/cups-filters/ EXTRACT_SUFX= .tar.xz diff --git a/print/cups-filters/PLIST b/print/cups-filters/PLIST index b4e786ef68e..f9607877946 100644 --- a/print/cups-filters/PLIST +++ b/print/cups-filters/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2015/04/19 18:44:25 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2015/06/14 16:08:04 wiz Exp $ bin/foomatic-rip bin/ttfread include/cupsfilters/colord.h @@ -27,7 +27,6 @@ libexec/cups/filter/imagetopdf libexec/cups/filter/imagetops libexec/cups/filter/imagetoraster libexec/cups/filter/pdftoijs -libexec/cups/filter/pdftoippprinter libexec/cups/filter/pdftoopvp libexec/cups/filter/pdftopdf libexec/cups/filter/pdftops @@ -36,6 +35,7 @@ libexec/cups/filter/pstopdf libexec/cups/filter/rastertoescpx libexec/cups/filter/rastertopclx libexec/cups/filter/rastertopdf +libexec/cups/filter/sys5ippprinter libexec/cups/filter/textonly libexec/cups/filter/texttopdf libexec/cups/filter/texttops diff --git a/print/cups-filters/distinfo b/print/cups-filters/distinfo index b02f229d0f7..640a070b214 100644 --- a/print/cups-filters/distinfo +++ b/print/cups-filters/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.16 2015/06/11 19:13:46 asau Exp $ +$NetBSD: distinfo,v 1.17 2015/06/14 16:08:04 wiz Exp $ -SHA1 (cups-filters-1.0.68.tar.xz) = 3564711352e93fe315774200375bedc2fecdde97 -RMD160 (cups-filters-1.0.68.tar.xz) = ae0e9e0f3c20175f2e178167459e08cf587d36fd -Size (cups-filters-1.0.68.tar.xz) = 1336216 bytes -SHA1 (patch-configure.ac) = 189a6b77d53a4026bcb070ec5722551b9ce7bc1e -SHA1 (patch-filter_foomatic-rip_foomaticrip.c) = 0cb7be02d76ce64dd167e6a1b849393fc09baeea +SHA1 (cups-filters-1.0.69.tar.xz) = c3d5cdbc0c7805c6a415ea05cdd7fd8b50f808b6 +RMD160 (cups-filters-1.0.69.tar.xz) = dea1d54539957a060456a6cfe98e52a23a80b575 +Size (cups-filters-1.0.69.tar.xz) = 1338548 bytes +SHA1 (patch-configure.ac) = 4b5243c4c31541e7d44ff2d049cd5a42bc7a2267 +SHA1 (patch-filter_foomatic-rip_foomaticrip.c) = cd916bf6c211b14305c311b6ad63bd0881030b09 diff --git a/print/cups-filters/patches/patch-configure.ac b/print/cups-filters/patches/patch-configure.ac index 19e83d34d8b..119fdeaf622 100644 --- a/print/cups-filters/patches/patch-configure.ac +++ b/print/cups-filters/patches/patch-configure.ac @@ -1,8 +1,11 @@ -$NetBSD: patch-configure.ac,v 1.1 2015/06/11 19:13:46 asau Exp $ +$NetBSD: patch-configure.ac,v 1.2 2015/06/14 16:08:04 wiz Exp $ Add a --with-shell option in order to avoid hardcoding "/bin/bash" inside filter/foomaticrip.c. +Fixed upstream as [Bug 1288]: +https://bugs.linuxfoundation.org/show_bug.cgi?id=1288 + --- configure.ac.orig 2015-04-13 14:47:41.000000000 +0000 +++ configure.ac @@ -622,6 +622,16 @@ fi diff --git a/print/cups-filters/patches/patch-filter_foomatic-rip_foomaticrip.c b/print/cups-filters/patches/patch-filter_foomatic-rip_foomaticrip.c index 181c3958e6a..a3f67756c20 100644 --- a/print/cups-filters/patches/patch-filter_foomatic-rip_foomaticrip.c +++ b/print/cups-filters/patches/patch-filter_foomatic-rip_foomaticrip.c @@ -1,7 +1,10 @@ -$NetBSD: patch-filter_foomatic-rip_foomaticrip.c,v 1.4 2015/06/11 19:13:46 asau Exp $ +$NetBSD: patch-filter_foomatic-rip_foomaticrip.c,v 1.5 2015/06/14 16:08:04 wiz Exp $ Adjust according the --with-shell option. +Fixed upstream as [Bug 1288]: +https://bugs.linuxfoundation.org/show_bug.cgi?id=1288 + --- filter/foomatic-rip/foomaticrip.c.orig 2015-02-13 22:36:44.000000000 +0000 +++ filter/foomatic-rip/foomaticrip.c @@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/lo -- cgit v1.2.3