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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8a20d3e2f0f0
branches:  trunk
changeset: 388394:8a20d3e2f0f0
user:      leot <leot%pkgsrc.org@localhost>
date:      Wed Dec 05 18:49:39 2018 +0000

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

pkgsrc changes:
 - Backport a patch from upstream to fix the build with poppler 0.71.0.
 - Temporary disable opvp support, not yet ported to poppler 0.71.0
   (Add a XXX comment as a reminder to reenable it once fixed).
 - Address all test failures (now all tests pass!)

Changes:
1.21.4
------
 - cups-browsed: cups-browsed: Limit the number of retries for
   creating a print queue when it comes to HTTP
   timeouts. Number of retries given by HttpMaxRetries
   directive in cups-browsed.conf. Thanks to Zdenek Dohnal for
   the patch (Pull request #73, Red Hat bug #1648697).
 - cups-browsed: Read out current time right before setting the
   timeouts. Thanks to Zdenek Dohnal for the patch (Pull
   request #71, Red Hat bug #1648697).
 - libcupsfilters: In the PPD generator for driverless IPP
   printing let "*cupsManualCopies: true" lines get added to
   the PPD if printing is done in a raster format as then
   pdftopdf needs to generate the copies.
 - pdftoraster, pdftoopvp, pdftoijs: Fix build with Poppler >=
   0.70 (Issue #69, Pull request #70).
 - pdftopdf: Fixed printing multiple copies on driverless IPP
   printers. When printing collated copies the multiple copies
   got applied twice, resulting in n*n instead of n copies
   (CUPS issue #5433).
 - pdftoraster, pdftoopvp, pdftoijs: Poppler removed memCheck
   and gMemReport functions, remove appropriate calls (Issue
   #62, Pull request #66).

diffstat:

 print/cups-filters/Makefile                            |    20 +-
 print/cups-filters/PLIST                               |     4 +-
 print/cups-filters/buildlink3.mk                       |     4 +-
 print/cups-filters/distinfo                            |    15 +-
 print/cups-filters/patches/patch-fontembed_test__pdf.c |     9 +-
 print/cups-filters/patches/patch-fontembed_test__ps.c  |    11 +-
 print/cups-filters/patches/patch-poppler-0.71.0.patch  |  2122 ++++++++++++++++
 7 files changed, 2155 insertions(+), 30 deletions(-)

diffs (truncated from 2325 to 300 lines):

diff -r dce7c845e94f -r 8a20d3e2f0f0 print/cups-filters/Makefile
--- a/print/cups-filters/Makefile       Wed Dec 05 18:44:14 2018 +0000
+++ b/print/cups-filters/Makefile       Wed Dec 05 18:49:39 2018 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.108 2018/12/03 08:35:30 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2018/12/05 18:49:39 leot Exp $
 
-DISTNAME=      cups-filters-1.21.3
-PKGREVISION=   3
+DISTNAME=      cups-filters-1.21.4
 CATEGORIES=    print
 MASTER_SITES=  http://openprinting.org/download/cups-filters/
 EXTRACT_SUFX=  .tar.xz
@@ -13,23 +12,26 @@
 
 TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 DEPENDS+=      poppler-utils-[0-9]*:../../print/poppler-utils
+TEST_DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
 
 USE_LANGUAGES=         c c++11
 USE_LIBTOOL=           yes
 USE_TOOLS+=            bash:run pkg-config gmake
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --disable-braille
 CONFIGURE_ARGS+=       --disable-ldap
 CONFIGURE_ARGS+=       --disable-mutool
 CONFIGURE_ARGS+=       --enable-ijs
-CONFIGURE_ARGS+=       --enable-opvp
+# XXX: Temporary disable opvp filters: not yet ported to poppler 0.71.0
+CONFIGURE_ARGS+=       --disable-opvp
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 CONFIGURE_ARGS+=       --with-apple-raster-filter=rastertopdf
 CONFIGURE_ARGS+=       --with-gs-path=${PREFIX}/bin/gs
 CONFIGURE_ARGS+=       --with-pdftops-path=${PREFIX}/bin/pdftops
 CONFIGURE_ARGS+=       --with-shell=${TOOLS_PATH.bash}
+CONFIGURE_ARGS+=       --with-test_font_path=${PREFIX}/share/fonts/X11/TTF/DejaVuSans.ttf
 
-INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples/cups-filters
 PKGCONFIG_OVERRIDE+=   libcupsfilters.pc.in
 PKGCONFIG_OVERRIDE+=   libfontembed.pc.in
 
@@ -53,7 +55,6 @@
 BUILD_DEFS+=           VARBASE
 
 RCD_SCRIPTS=           cups-browsed
-CONF_FILES=            ${PREFIX}/share/examples/cups-filters/fonts/conf.d/99pdftoopvp.conf ${PKG_SYSCONFDIR}/fontconfig/conf.d/99pdftoopvp.conf
 CONF_FILES+=           ${PREFIX}/share/examples/cups-filters/cups-browsed.conf ${PKG_SYSCONFDIR}/cups/cups-browsed.conf
 
 TEST_TARGET=           check
@@ -65,8 +66,9 @@
 SUBST_STAGE.daemonize=         pre-configure
 SUBST_MESSAGE.daemonize=       Customizing daemonizing script
 SUBST_FILES.daemonize=         cups-browsed-daemonize.sh
-SUBST_SED.daemonize=           -e 's|@PREFIX@|${PREFIX}|g'
-SUBST_SED.daemonize+=          -e 's|@VARBASE@|${VARBASE}|g'
+SUBST_VARS.daemonize=          PREFIX VARBASE
+
+INSTALLATION_DIRS+=            share/examples/cups-filters
 
 post-install:
        ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/cups/cups-browsed.conf \
@@ -85,13 +87,11 @@
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-BUILDLINK_ABI_DEPENDS.cups-base+=      cups-base>=1.7.4nb1
 .include "../../print/cups-base/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"
 .include "../../print/ijs/buildlink3.mk"
 .include "../../print/poppler-cpp/buildlink3.mk"
 .include "../../print/poppler-glib/buildlink3.mk"
-BUILDLINK_ABI_DEPENDS.poppler-includes?=       poppler-includes>=0.26.1nb1
 .include "../../print/poppler-includes/buildlink3.mk"
 .include "../../print/qpdf/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff -r dce7c845e94f -r 8a20d3e2f0f0 print/cups-filters/PLIST
--- a/print/cups-filters/PLIST  Wed Dec 05 18:44:14 2018 +0000
+++ b/print/cups-filters/PLIST  Wed Dec 05 18:49:39 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2017/09/03 11:27:47 leot Exp $
+@comment $NetBSD: PLIST,v 1.21 2018/12/05 18:49:39 leot Exp $
 bin/driverless
 bin/foomatic-rip
 bin/ttfread
@@ -35,7 +35,6 @@
 libexec/cups/filter/imagetops
 libexec/cups/filter/imagetoraster
 libexec/cups/filter/pdftoijs
-libexec/cups/filter/pdftoopvp
 libexec/cups/filter/pdftopdf
 libexec/cups/filter/pdftops
 libexec/cups/filter/pdftoraster
@@ -89,7 +88,6 @@
 share/doc/cups-filters/NEWS
 share/doc/cups-filters/README
 share/examples/cups-filters/cups-browsed.conf
-share/examples/cups-filters/fonts/conf.d/99pdftoopvp.conf
 share/ppd/cupsfilters/Fuji_Xerox-DocuPrint_CM305_df-PDF.ppd
 share/ppd/cupsfilters/Generic-PDF_Printer-PDF.ppd
 share/ppd/cupsfilters/HP-Color_LaserJet_CM3530_MFP-PDF.ppd
diff -r dce7c845e94f -r 8a20d3e2f0f0 print/cups-filters/buildlink3.mk
--- a/print/cups-filters/buildlink3.mk  Wed Dec 05 18:44:14 2018 +0000
+++ b/print/cups-filters/buildlink3.mk  Wed Dec 05 18:49:39 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2018/11/14 22:22:16 kleink Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/12/05 18:49:39 leot Exp $
 
 BUILDLINK_TREE+=       cups-filters
 
@@ -6,7 +6,7 @@
 CUPS_FILTERS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cups-filters+=   cups-filters>=1.8.2
-BUILDLINK_ABI_DEPENDS.cups-filters?=   cups-filters>=1.21.3nb2
+BUILDLINK_ABI_DEPENDS.cups-filters+=   cups-filters>=1.21.3nb2
 BUILDLINK_PKGSRCDIR.cups-filters?=     ../../print/cups-filters
 
 .include "../../print/cups-base/buildlink3.mk"
diff -r dce7c845e94f -r 8a20d3e2f0f0 print/cups-filters/distinfo
--- a/print/cups-filters/distinfo       Wed Dec 05 18:44:14 2018 +0000
+++ b/print/cups-filters/distinfo       Wed Dec 05 18:49:39 2018 +0000
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.58 2018/10/18 10:49:44 leot Exp $
+$NetBSD: distinfo,v 1.59 2018/12/05 18:49:39 leot Exp $
 
-SHA1 (cups-filters-1.21.3.tar.xz) = 5164f21a78a425b19c375f86be4e9159f970ac52
-RMD160 (cups-filters-1.21.3.tar.xz) = acdf671020ce978c50b245ff076d7290ffa20e97
-SHA512 (cups-filters-1.21.3.tar.xz) = 2b00023ac4177046e3ab3c5b563b7bd92bb49e57e645e6e67e7b9358d00919e2d4ca43ef5d57684523d97f1f1df5d1014fc0a3a895476ce285ccb3ed2e3bc758
-Size (cups-filters-1.21.3.tar.xz) = 1474152 bytes
+SHA1 (cups-filters-1.21.4.tar.xz) = 6f269a5b6f37260a2f80357678215106cb85d340
+RMD160 (cups-filters-1.21.4.tar.xz) = b50d134df181772316875b6707c1aabb43b5e19e
+SHA512 (cups-filters-1.21.4.tar.xz) = 6e1e20be0354ba96cf4222c05aadd4a2b3d033d730ff9b7489ba6a3b2b0e1a02ac80a1ebcf5e765b80e5baab2ae0c091c8abbdf159913b70592fb9ba0afd9a5b
+Size (cups-filters-1.21.4.tar.xz) = 1474564 bytes
 SHA1 (patch-Makefile.in) = 2d5b05c9dca8ef7cc51931d77dddb1b2c4d422d8
 SHA1 (patch-configure) = b55dc7dc22008351c396374aceb88d2be293d179
 SHA1 (patch-filter_gstoraster.c) = 4eef8d91d8ca26a5a874e29885b836e9670d9e5d
 SHA1 (patch-filter_mupdftoraster.c) = 4c4f7d292163657f9541c8ce454ba57d248f7ef0
-SHA1 (patch-fontembed_test__pdf.c) = e33cd08fc8af8873174c5504869424f27a83fd64
-SHA1 (patch-fontembed_test__ps.c) = 7269048bdc90426f96009ff2e1127a0878953393
+SHA1 (patch-fontembed_test__pdf.c) = 5ffb13a59ed4d860a3ae4355e364059973715290
+SHA1 (patch-fontembed_test__ps.c) = 70f9ab9c8f74ab96abe04cda926a7116386d5f2e
+SHA1 (patch-poppler-0.71.0.patch) = 96697af23130bb27e8ac3b1d204b887c923a3e6b
diff -r dce7c845e94f -r 8a20d3e2f0f0 print/cups-filters/patches/patch-fontembed_test__pdf.c
--- a/print/cups-filters/patches/patch-fontembed_test__pdf.c    Wed Dec 05 18:44:14 2018 +0000
+++ b/print/cups-filters/patches/patch-fontembed_test__pdf.c    Wed Dec 05 18:49:39 2018 +0000
@@ -1,18 +1,19 @@
-$NetBSD: patch-fontembed_test__pdf.c,v 1.1 2018/10/18 10:49:44 leot Exp $
+$NetBSD: patch-fontembed_test__pdf.c,v 1.2 2018/12/05 18:49:39 leot Exp $
 
 `%m' is not supported in printf(3), use strerror(3).
 
---- fontembed/test_pdf.c.orig  2018-10-03 20:12:51.000000000 +0000
+--- fontembed/test_pdf.c.orig  2018-11-23 21:18:49.000000000 +0000
 +++ fontembed/test_pdf.c
-@@ -2,6 +2,7 @@
+@@ -2,14 +2,16 @@
  #include "config.h"
  #include "sfnt.h"
  #include <assert.h>
 +#include <errno.h>
  #include <stdio.h>
  #include <stdlib.h>
++#include <string.h>
  
-@@ -9,7 +10,7 @@ static void example_outfn(const char *bu
+ static void example_outfn(const char *buf,int len,void *context) // {{{
  {
    FILE *f=(FILE *)context;
    if (fwrite(buf,1,len,f)!=len) {
diff -r dce7c845e94f -r 8a20d3e2f0f0 print/cups-filters/patches/patch-fontembed_test__ps.c
--- a/print/cups-filters/patches/patch-fontembed_test__ps.c     Wed Dec 05 18:44:14 2018 +0000
+++ b/print/cups-filters/patches/patch-fontembed_test__ps.c     Wed Dec 05 18:49:39 2018 +0000
@@ -1,18 +1,21 @@
-$NetBSD: patch-fontembed_test__ps.c,v 1.1 2018/10/18 10:49:44 leot Exp $
+$NetBSD: patch-fontembed_test__ps.c,v 1.2 2018/12/05 18:49:39 leot Exp $
 
 `%m' is not supported in printf(3), use strerror(3).
 
---- fontembed/test_ps.c.orig   2018-10-03 20:12:51.000000000 +0000
+--- fontembed/test_ps.c.orig   2018-11-23 21:18:49.000000000 +0000
 +++ fontembed/test_ps.c
-@@ -2,6 +2,7 @@
+@@ -2,8 +2,10 @@
  #include "config.h"
  #include "sfnt.h"
  #include <assert.h>
 +#include <errno.h>
  #include <stdio.h>
  #include <stdlib.h>
++#include <string.h>
  
-@@ -11,7 +12,7 @@ static void example_outfn(const char *bu
+ const char *emb_otf_get_fontname(OTF_FILE *otf); // TODO
+ 
+@@ -11,7 +13,7 @@ static void example_outfn(const char *bu
  {
    FILE *f=(FILE *)context;
    if (fwrite(buf,1,len,f)!=len) {
diff -r dce7c845e94f -r 8a20d3e2f0f0 print/cups-filters/patches/patch-poppler-0.71.0.patch
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/cups-filters/patches/patch-poppler-0.71.0.patch     Wed Dec 05 18:49:39 2018 +0000
@@ -0,0 +1,2122 @@
+$NetBSD: patch-poppler-0.71.0.patch,v 1.1 2018/12/05 18:49:39 leot Exp $
+
+Backport commit 48625da3f6fc818695c0d32879236ed102f9e462
+to fix build with poppler-0.71.0.
+
+--- filter/pdftoijs.cxx.orig
++++ filter/pdftoijs.cxx
+@@ -297,7 +297,7 @@ int main(int argc, char *argv[]) {
+   int job_id;
+   enum SplashColorMode cmode;
+   int rowpad;
+-  GBool reverseVideo;
++  bool reverseVideo;
+ 
+ #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
+   setErrorCallback(::myErrorFun,NULL);
+@@ -384,7 +384,7 @@ int main(int argc, char *argv[]) {
+   /* set image's values */
+   int numChan,bitsPerSample;
+   const char *devName;
+-  reverseVideo = gFalse;
++  reverseVideo = false;
+   switch (colspace) {
+   case COL_RGB:
+     numChan=3;
+@@ -398,7 +398,7 @@ int main(int argc, char *argv[]) {
+     paperColor[2] = 255;
+     break;
+   case COL_BLACK1:
+-    reverseVideo = gTrue;
++    reverseVideo = true;
+   case COL_WHITE1:
+     numChan=1;
+     bitsPerSample=1;
+@@ -409,7 +409,7 @@ int main(int argc, char *argv[]) {
+     rowpad = 1;
+     break;
+   case COL_BLACK8:
+-    reverseVideo = gTrue;
++    reverseVideo = true;
+   case COL_WHITE8:
+     numChan=1;
+     bitsPerSample=8;
+@@ -440,9 +440,9 @@ int main(int argc, char *argv[]) {
+   }
+ 
+   out = new SplashOutputDev(cmode,rowpad/* row padding */,
+-    reverseVideo,paperColor,gTrue
++    reverseVideo,paperColor,true
+ #if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30
+-    ,gFalse
++    ,false
+ #endif
+     );
+ #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
+@@ -471,7 +471,7 @@ int main(int argc, char *argv[]) {
+     SplashBitmap *bitmap;
+     unsigned int size;
+ 
+-    doc->displayPage(out,i,resolution[0],resolution[1],0,gFalse,gFalse,gFalse);
++    doc->displayPage(out,i,resolution[0],resolution[1],0,false,false,false);
+     bitmap = out->getBitmap();
+ 
+     /* set page parameters */
+--- filter/pdftoopvp/OPVPOutputDev.cxx.orig
++++ filter/pdftoopvp/OPVPOutputDev.cxx
+@@ -70,7 +70,7 @@ class SplashOutFontFileID: public SplashFontFileID {
+ 
+   ~SplashOutFontFileID() {}
+ 
+-  GBool matches(SplashFontFileID *id) {
++  bool matches(SplashFontFileID *id) {
+     return ((SplashOutFontFileID *)id)->r.num == r.num &&
+            ((SplashOutFontFileID *)id)->r.gen == r.gen;
+   }
+@@ -99,9 +99,9 @@ class T3FontCache {
+   T3FontCache(Ref *fontID, double m11A, double m12A,
+             double m21A, double m22A,
+             int glyphXA, int glyphYA, int glyphWA, int glyphHA,
+-            GBool aa);
++            bool aa);
+   ~T3FontCache();
+-  GBool matches(Ref *idA, double m11A, double m12A,
++  bool matches(Ref *idA, double m11A, double m12A,
+               double m21A, double m22A)
+     { return fontID.num == idA->num && fontID.gen == idA->gen &&
+            m11 == m11A && m12 == m12A && m21 == m21A && m22 == m22A; }
+@@ -120,7 +120,7 @@ class T3FontCache {
+ T3FontCache::T3FontCache(Ref *fontIDA, double m11A, double m12A,
+                        double m21A, double m22A,
+                        int glyphXA, int glyphYA, int glyphWA, int glyphHA,
+-                       GBool aa) {
++                       bool aa) {
+   int i;
+ 
+   fontID = *fontIDA;
+@@ -189,7 +189,7 @@ OPVPOutputDev::OPVPOutputDev()