[pkgsrc/trunk]: pkgsrc/print/cups-filters cups-filters: Update print/cups-fil...

[leot <leot%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5ca0da2173d2
branches:  trunk
changeset: 370742:5ca0da2173d2
user:      leot <leot%pkgsrc.org@localhost>
date:      Mon Oct 23 13:07:55 2017 +0000

description:
cups-filters: Update print/cups-filters to 1.17.9

pkgsrc changes:
 - Delete patches/patch-filter_pdf.cxx that add support to poppler-0.58,
   applied upstream

Changes:
1.17.9
------
 - cups-browsed: Applying option defaults from the
   DefaultOptions directive in cups-browsed.conf got
   lost. Re-introduced it (Bug #1414).
 - cups-browsed: Get printer-location field from remote
   printers.  Thanks to Marek Kasik for the patch (Bug #1413).

1.17.8
------
 - foomatic-rip: Change execution of renderer thread to fail
   whenever any of its individual sub-comands fails. Thanks to
   LUUM (luum at chromium dot org) for the patch (Bug #1412).
 - foomatic-rip: Parent process now ignores SIGPIPE calls from
   upstream/downstream CUPS filters, per
   https://www.cups.org/doc/api-filter.html, while correctly
   noting child process failures and exiting
   accordingly. Thanks to LUUM (luum at chromium dot org) for
   the patch (Bug #1412).
 - Build system: Fixed typo which broke the
   "--enable-gs-ps2write" ./configure command line option (Bug
   #1410).

1.17.7
------
 - braille: Add a mirror option for graphical output. Thanks to
          Samuel Thibault for this patch.
 - braille: Rename the internal cups name of the Resize option
   to the standard well-known and well-documented fitplot
   option. Thanks to Samuel Thibault for this patch.
 - braille: Add support for margins in graphical mode,
   defaulting them to 15 points (a bit more than 5mm). Thanks
   to Samuel Thibault for this patch.
 - braille: Updated French translation. Thanks to Samuel
   Thibault for this patch.
 - braille: Add a PPD which generates UBRL output, i.e. Braille
   expressed in Unicode. This is not useful for actual
   embossers, but very convenient to check output to be
   embossed without wasting paper. Thanks to Samuel Thibault
   for this patch.
 - braille: Add virtual BRF backend for generating
   ready-to-emboss BRF files with CUPS, similarly to the
   cups-pdf backend. Thanks to Samuel Thibault for this patch.
 - braille: Some tools seem to emit true/false instead of
   True/False, so let us cope with it. Thanks to Samuel
   Thibault for this patch.
 - braille: "make uninstall" did not remove all the
   links. Thanks to Samuel Thibault for this patch.
 - braille: Add support for embossing MusicXML files, through
   the FreeDots transcriptor. Thanks to Samuel Thibault for
   this patch.
 - braille: Add proper support for hardware margins on braille
   embossers. Thanks to Samuel Thibault for this patch.
 - braille: Fix the disabling of the text margins in Index
   graphics mode. Thanks to Samuel Thibault for this patch.
 - braille: Support for direct, structured embossing of XML and
   XML-based file formats (like odt, docx, ...). Thanks to
   Samuel Thibault for this patch.

1.17.6
------
 - braille: Embossers can only emboss integer numbers of 2x4
   cells. Thanks to Samuel Thibault for this patch.
 - braille: In Index graphical mode we need to disable the text
   margins, since they come in earlier on the way to
   there. Thanks to Samuel Thibault for this patch.
 - braille: Also, we should always add a 1.6mm margin for
   taking into account the width of dots. Thanks to Samuel
   Thibault for this patch.

1.17.5
------
 - libcupsfilters: In the PPD generator for driverless printing
   renamed the "print-quality" option back to
   "cupsPrintQuality" as the support for this option got fixed
   in CUPS (CUPS issue #5090).
 - braille: Improvements on the braille support for bitmap
   images: Moves the graphical dot distance option to the image
   conversion group, add an option to avoid image resize, and
   make the rotation option easier by proposing to just fit
   paper instead of fitting portrait or landscape. Thanks to
   Samuel Thibault for this patch.
 - braille: Support for embossing vector images as braille.
   Thanks to Samuel Thibault for this patch.
 - braille: Fix liblouis1.defs installation. Thanks to Samuel
   Thibault for this fix.

1.17.4
------
 - pdftopdf: If the input PDF file contains an interactive
   form, flatten it to static PDF so that further manipulation,
   like scaling, number-up, ... do not let the filled for
   content getting lost. This is implemented by using the
   pdftocairo utility of Poppler and if this fails Ghostscript
   (9.22 or later recommended). This will probably replaced by
   a QPDF-based solution later. Thanks to Tobias Hoffmann for
   the QPDF-based detection of PDF forms (Bug #1315, Ubuntu bug
   #1564249).

1.17.3
------
 - bannertopdf: Make it working also with Poppler 0.58.0 and
   newer (Bug #1408).
 - gstoraster, pdftops, foomatic-rip: Added "-dShowAcroForm" to
   all Ghostscript command lines where the input data format
   can be PDF.  With this and the fix of Ghostscript bug
   #698461 most filled PDF forms should be rendered correctly
   by Ghostscript now.
 - libcupsfilters: Do not check maximum resolutions of
   raster-based PDLs, as implementation was incorrect and
   reliability of PDLs is more important than maximum
   resolution.

diffstat:

 print/cups-filters/Makefile                     |    5 +-
 print/cups-filters/distinfo                     |   13 +-
 print/cups-filters/patches/patch-Makefile.in    |   10 +-
 print/cups-filters/patches/patch-filter_pdf.cxx |  824 ------------------------
 4 files changed, 13 insertions(+), 839 deletions(-)

diffs (truncated from 887 to 300 lines):

diff -r beaf4a38cffe -r 5ca0da2173d2 print/cups-filters/Makefile
--- a/print/cups-filters/Makefile       Mon Oct 23 13:07:47 2017 +0000
+++ b/print/cups-filters/Makefile       Mon Oct 23 13:07:55 2017 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.81 2017/10/15 22:31:02 prlw1 Exp $
+# $NetBSD: Makefile,v 1.82 2017/10/23 13:07:55 leot Exp $
 
-DISTNAME=      cups-filters-1.17.2
-PKGREVISION=   3
+DISTNAME=      cups-filters-1.17.9
 CATEGORIES=    print
 MASTER_SITES=  http://openprinting.org/download/cups-filters/
 EXTRACT_SUFX=  .tar.xz
diff -r beaf4a38cffe -r 5ca0da2173d2 print/cups-filters/distinfo
--- a/print/cups-filters/distinfo       Mon Oct 23 13:07:47 2017 +0000
+++ b/print/cups-filters/distinfo       Mon Oct 23 13:07:55 2017 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.52 2017/09/07 11:24:29 prlw1 Exp $
+$NetBSD: distinfo,v 1.53 2017/10/23 13:07:55 leot Exp $
 
-SHA1 (cups-filters-1.17.2.tar.xz) = f4febf63e2c0a6a9291798fa0ec4ae4f26cc753a
-RMD160 (cups-filters-1.17.2.tar.xz) = 06d9cda92a6d8b2d642332aeb06a8c5f9b953199
-SHA512 (cups-filters-1.17.2.tar.xz) = 16287824f807d66da7d43fd59471ae91225c95b737dda0a3ce9b687749a34fd8703e22e61915cf56ef694d58fb9e480220a1426a8fc06211fc88f2ce70c11ff0
-Size (cups-filters-1.17.2.tar.xz) = 1446940 bytes
-SHA1 (patch-Makefile.in) = 64b90009c2d0df370011ef70c823e7b9eda228bf
+SHA1 (cups-filters-1.17.9.tar.xz) = 352a16072f9f01057e1ea2a2ba119dc518082e1e
+RMD160 (cups-filters-1.17.9.tar.xz) = 669cab62509a43b60b97e730f7dc18c6ea67f555
+SHA512 (cups-filters-1.17.9.tar.xz) = 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4
+Size (cups-filters-1.17.9.tar.xz) = 1454068 bytes
+SHA1 (patch-Makefile.in) = 2d5b05c9dca8ef7cc51931d77dddb1b2c4d422d8
 SHA1 (patch-configure) = b55dc7dc22008351c396374aceb88d2be293d179
 SHA1 (patch-filter_gstoraster.c) = a9fac7892972943f345c6b76529feff0ba098458
 SHA1 (patch-filter_mupdftoraster.c) = 4c4f7d292163657f9541c8ce454ba57d248f7ef0
-SHA1 (patch-filter_pdf.cxx) = 34387489460e152719a9879a68310418aff95591
diff -r beaf4a38cffe -r 5ca0da2173d2 print/cups-filters/patches/patch-Makefile.in
--- a/print/cups-filters/patches/patch-Makefile.in      Mon Oct 23 13:07:47 2017 +0000
+++ b/print/cups-filters/patches/patch-Makefile.in      Mon Oct 23 13:07:55 2017 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.in,v 1.5 2017/09/03 11:27:47 leot Exp $
+$NetBSD: patch-Makefile.in,v 1.6 2017/10/23 13:07:56 leot Exp $
 
 `-r' option of ln(1) is not widely supported, avoid it.
 
---- Makefile.in.orig   2017-08-25 18:58:43.000000000 +0000
+--- Makefile.in.orig   2017-10-05 15:02:30.000000000 +0000
 +++ Makefile.in
-@@ -5334,9 +5334,9 @@ install-exec-hook:
+@@ -5379,9 +5379,9 @@ install-exec-hook:
        $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
        $(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir)
        $(INSTALL) -d -m 755 $(DESTDIR)$(pkgbackenddir)
@@ -15,5 +15,5 @@
 +@ENABLE_DRIVERLESS_TRUE@      $(LN_S) -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
 +@ENABLE_DRIVERLESS_TRUE@      $(LN_S) -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
  @ENABLE_BRAILLE_TRUE@ $(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl
- @ENABLE_BRAILLE_TRUE@ $(LN_S) -f textbrftoindexv3 $(DESTDIR)$(pkgfilterdir)/textbrftoindexv4
- 
+ @ENABLE_BRAILLE_TRUE@ $(LN_S) -f vectortopdf $(DESTDIR)$(pkgfilterdir)/svgtopdf
+ @ENABLE_BRAILLE_TRUE@ $(LN_S) -f vectortopdf $(DESTDIR)$(pkgfilterdir)/xfigtopdf
diff -r beaf4a38cffe -r 5ca0da2173d2 print/cups-filters/patches/patch-filter_pdf.cxx
--- a/print/cups-filters/patches/patch-filter_pdf.cxx   Mon Oct 23 13:07:47 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,824 +0,0 @@
-$NetBSD: patch-filter_pdf.cxx,v 1.1 2017/09/07 11:24:29 prlw1 Exp $
-
-support poppler-0.58
-https://bugs.linuxfoundation.org/show_bug.cgi?id=1408
-
---- filter/pdf.cxx.orig        2017-08-15 18:29:57.000000000 +0000
-+++ filter/pdf.cxx
-@@ -129,64 +129,125 @@ extern "C" void pdf_prepend_stream(pdf_t
-     Object array;
-     Ref r;
- 
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+    pageobj = xref->fetch(pageref->num, pageref->gen);
-+#else
-     xref->fetch(pageref->num, pageref->gen, &pageobj);
--    if (!pageobj.isDict() || !pageobj.dictLookupNF("Contents", &contents)) {
-+#endif
-+    if (!pageobj.isDict() ||
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+        (contents = pageobj.dictLookupNF("Contents")).isNull()
-+#else
-+        !pageobj.dictLookupNF("Contents", &contents)
-+#endif
-+    ) {
-         fprintf(stderr, "Error: malformed pdf\n");
-         return;
-     }
- 
--    if (contents.isRef())
-+    if (contents.isRef()) {
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+        contents = xref->fetch(contents.getRefNum(), contents.getRefGen());
-+#else
-         xref->fetch(contents.getRefNum(), contents.getRefGen(), &contents);
-+#endif
-+    }
- 
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+    (void) lenobj;
-+    dict = Object(new Dict(xref));
-+    dict.dictSet("Length", Object(static_cast<int>(len)));
-+    stream = Object(static_cast<Stream *>(new MemStream(buf, 0, len, std::move(dict))));
-+#else
-     lenobj.initInt(len);
-     dict.initDict(xref);
-     dict.dictSet("Length", &lenobj);
-     stream.initStream(new MemStream(buf, 0, len, &dict));
-+#endif
- 
-     r = xref->addIndirectObject(&stream);
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+    streamrefobj = Object(r.num, r.gen);
-+#else
-     streamrefobj.initRef(r.num, r.gen);
-+#endif
- 
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+    array = Object(new Array(xref));
-+    array.arrayAdd(std::move(streamrefobj));
-+#else
-     array.initArray(xref);
-     array.arrayAdd(&streamrefobj);
-+#endif
- 
-     if (contents.isStream()) {
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+        contents = pageobj.dictLookupNF("Contents"); // streams must be indirect, i.e. not fetch()-ed
-+        array.arrayAdd(std::move(contents));
-+#else
-         pageobj.dictLookupNF("Contents", &contents); // streams must be indirect, i.e. not fetch()-ed
-         array.arrayAdd(&contents);
-+#endif
-     }
-     else if (contents.isArray()) {
-         int i, len = contents.arrayGetLength();
-         Object obj;
-         for (i = 0; i < len; i++) {
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+            obj = contents.arrayGetNF(i);
-+            array.arrayAdd(std::move(obj));
-+#else
-             contents.arrayGetNF(i, &obj);
-             array.arrayAdd(&obj);
-+#endif
-         }
-     }
-     else
-         fprintf(stderr, "Error: malformed pdf\n");
- 
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+    pageobj.dictSet("Contents", std::move(array));
-+#else
-     pageobj.dictSet("Contents", &array);
-+#endif
- 
-     xref->setModifiedObject(&pageobj, *pageref);
-+#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR < 58
-     pageobj.free();
-+#endif
- }
- 
- 
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+static Object name_object(const char *s)
-+{
-+    return Object(new GooString(s));
-+}
-+#else
- static Object * name_object(const char *s)
- {
-     Object *o = new Object();
-     o->initName((char *)s);
-     return o;
- }
-+#endif
- 
- /*
-  * Create new PDF integer type object.
-  */
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+static Object int_object(int i)
-+{
-+    return Object(i);
-+}
-+#else
- static Object * int_object(int i)
- {
-     Object *o = new Object();
-     o->initInt(i);
-     return o;
- }
-+#endif
- 
- static Object * get_resource_dict(XRef *xref,
-                                   Dict *pagedict,
-@@ -196,21 +257,36 @@ static Object * get_resource_dict(XRef *
-     Object res;
- 
-     /* TODO resource dict can also be inherited */
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+    res = pagedict->lookupNF("Resources");
-+    if (res.isNull())
-+#else
-     if (!pagedict->lookupNF("Resources", &res))
-+#endif
-         return NULL;
- 
-     if (res.isRef()) {
-         *resref = res.getRef();
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+        *resdict = xref->fetch(resref->num, resref->gen);
-+#else
-         xref->fetch(resref->num, resref->gen, resdict);
-+#endif
-     }
-     else if (res.isDict()) {
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+        *resdict = res.copy();
-+#else
-         res.copy(resdict);
-+#endif
-         resref->num = 0;
-     }
-     else
-         resdict = NULL;
- 
-+#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR < 58
-     res.free();
-+#endif
-     return resdict;
- }
- 
-@@ -226,7 +302,11 @@ extern "C" void pdf_add_type1_font(pdf_t
-     Object resdict;
-     Ref resref;
- 
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+    pageobj = xref->fetch(pageref->num, pageref->gen);
-+#else
-     xref->fetch(pageref->num, pageref->gen, &pageobj);
-+#endif
-     if (!pageobj.isDict()) {
-         fprintf(stderr, "Error: malformed pdf\n");
-         return;
-@@ -234,21 +314,35 @@ extern "C" void pdf_add_type1_font(pdf_t
- 
-     if (!get_resource_dict(xref, pageobj.getDict(), &resdict, &resref)) {
-         fprintf(stderr, "Error: malformed pdf\n");
-+#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR < 58
-         pageobj.free();
-+#endif
-         return;
-     }
- 
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+    font = Object(new Dict(xref));
-+#else
-     font.initDict(xref);
-+#endif
-     font.dictSet("Type", name_object("Font"));
-     font.dictSet("Subtype", name_object("Type1"));
-     font.dictSet("BaseFont", name_object(name));
-     xref->addIndirectObject(&font);
- 
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+    fonts = resdict.dictLookupNF("Font");
-+#else
-     resdict.dictLookupNF("Font", &fonts);
-+#endif
-     if (fonts.isNull()) {
-         /* Create new font dic obj in page's resources */
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+        resdict.dictSet("Font", Object(new Dict(xref)));
-+#else
-         fonts.initDict(xref);
-         resdict.dictSet("Font", &fonts);
-+#endif
-     }
- 
-     Object *fonts_dic;
-@@ -259,7 +353,11 @@ extern "C" void pdf_add_type1_font(pdf_t
-         fonts_dic = &fonts;
-     } else if ( fonts.isRef() ) {
-         /* "Font" resource is indirect reference object */
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58
-+        dereferenced_obj = xref->fetch(fonts.getRefNum(), fonts.getRefGen());
-+#else
-         xref->fetch(fonts.getRefNum(), fonts.getRefGen(), &dereferenced_obj);
-+#endif
-         fonts_dic = &dereferenced_obj;
-     }
- 
-@@ -269,7 +367,11 @@ extern "C" void pdf_add_type1_font(pdf_t
-     }
- 
-     /* Add new entry to "Font" resource */
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 58