cups-filters: Update to 1.23.0

pkgsrc changes:
 - Remove outdated comment regarding opvp: upstream issue was solved
   but they are now also disabled by default by upstream

Changes:
1.23.0
------
 - pdftops, mupdftoraster: Let pdftops call mutool directly and
   so that it directly outputs PostScript, eliminating the need
   to call the mupdftoraster and rastertops filters.
 - mupdftoraster: Reduced the use of temporary files from 3 to
   just one.
 - imagetopdf, imagetoraster, pdftopdf: Add support for
   print-scaling option (Issue #108, Pull request #118).

1.22.6
------
 - rastertops: Fixed PageSize settings in the PostScript output
   (Must be in points not in pixels).
 - pdftops, mupdftoraster: Produce actual grayscale/monochrome
   PostScript (and not only instructions to print grayscale/
   monochrome) for jobs to be printed in grayscale/monochrome
   (Issue #96, Pull request #115).
 - mupdftoraster: Fixed filter not producing output at all.
 - Build system: ENABLE_DRIVERLESS got only defined with CUPS
   1.6 and newer, not with older CUPS versions (Issue #111).
 - pdftopdf, imagetopdf, imagetoraster: Silenced compiler
   warnings.
 - cups-browsed, driverless: Replaced httpConnect() calls by
   httpConnect2() calls as the former CUPS library function is
   deprecated.
 - Build system: Compile everything using the CUPS libraries
   with '-D_PPD_DEPRECATED=""' for the time being until the
   deprecated PPD API calls get replaced, to stop the flooding
   with PPD API deprecation warnings making more important
   warnings being overlooked.
 - cups-browsed: When removing a local queue on shutdown or
   when DNS-SD reports the printer as disappeared check whether
   the local queue got overwritten by an external process as
   sometimes the shutdown or disappearing event comes too close
   for cups-browsed receiving a printer-modified notification
   from CUPS before (Ubuntu bug #1731417).

3 files changed, 12 insertions, 17 deletions

diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index acbdeb8689a..b519fd6922c 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.119 2019/05/09 13:57:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.120 2019/06/01 17:39:05 leot Exp $
 
-DISTNAME=	cups-filters-1.22.5
-PKGREVISION=	1
+DISTNAME=	cups-filters-1.23.0
 CATEGORIES=	print
 MASTER_SITES=	http://openprinting.org/download/cups-filters/
 EXTRACT_SUFX=	.tar.xz
@@ -24,10 +23,6 @@ CONFIGURE_ARGS+=	--disable-braille
 CONFIGURE_ARGS+=	--disable-ldap
 CONFIGURE_ARGS+=	--disable-mutool
 CONFIGURE_ARGS+=	--enable-ijs
-# XXX: Temporary disable opvp filters: not yet ported to poppler 0.71.0.
-# XXX: Upstream bug report:
-# XXX:  <https://github.com/OpenPrinting/cups-filters/issues/75>
-CONFIGURE_ARGS+=	--disable-opvp
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--with-apple-raster-filter=rastertopdf
 CONFIGURE_ARGS+=	--with-gs-path=${PREFIX}/bin/gs
diff --git a/print/cups-filters/distinfo b/print/cups-filters/distinfo
index 385981bbc41..6c905cc9aaa 100644
--- a/print/cups-filters/distinfo
+++ b/print/cups-filters/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.62 2019/04/17 11:22:35 adam Exp $
+$NetBSD: distinfo,v 1.63 2019/06/01 17:39:05 leot Exp $
 
-SHA1 (cups-filters-1.22.5.tar.xz) = f746c37905986147ff7fc699312a1a79332387b2
-RMD160 (cups-filters-1.22.5.tar.xz) = ae6a2ebc4daa73e78193b171aca23e6284ef2442
-SHA512 (cups-filters-1.22.5.tar.xz) = ed33e6d6f090c00f0f0d1d012d3b394bfaa1f81feeb5b0b7ead1dffa2399f0165ce916a99c3bf28aca7f279bffba5b6575feff700130cabfcd46eb4c904d5c59
-Size (cups-filters-1.22.5.tar.xz) = 1476792 bytes
+SHA1 (cups-filters-1.23.0.tar.xz) = bc138548f82a78f3946cfea67ab775e265a97ca9
+RMD160 (cups-filters-1.23.0.tar.xz) = 46650c7cd3e99d122a729717269b111c71d3bc7f
+SHA512 (cups-filters-1.23.0.tar.xz) = 466dc14155750f8868f29fe416c061813b661892aba7bf91446e1145da5c7eb23abf9935a19d2309bfcb521c44eab9d4404db7965c95b9578e10cccd26bbba8f
+Size (cups-filters-1.23.0.tar.xz) = 1477900 bytes
 SHA1 (patch-Makefile.in) = 2d5b05c9dca8ef7cc51931d77dddb1b2c4d422d8
 SHA1 (patch-configure) = b55dc7dc22008351c396374aceb88d2be293d179
 SHA1 (patch-filter_gstoraster.c) = 4eef8d91d8ca26a5a874e29885b836e9670d9e5d
-SHA1 (patch-filter_mupdftoraster.c) = 4c4f7d292163657f9541c8ce454ba57d248f7ef0
+SHA1 (patch-filter_mupdftoraster.c) = 81a06cbb3be9a7fd3e797a2effa5ef0aecfc2621
 SHA1 (patch-fontembed_test__pdf.c) = 5ffb13a59ed4d860a3ae4355e364059973715290
 SHA1 (patch-fontembed_test__ps.c) = 70f9ab9c8f74ab96abe04cda926a7116386d5f2e
diff --git a/print/cups-filters/patches/patch-filter_mupdftoraster.c b/print/cups-filters/patches/patch-filter_mupdftoraster.c
index d1cb5bdf204..a743d706834 100644
--- a/print/cups-filters/patches/patch-filter_mupdftoraster.c
+++ b/print/cups-filters/patches/patch-filter_mupdftoraster.c
@@ -1,14 +1,14 @@
-$NetBSD: patch-filter_mupdftoraster.c,v 1.1 2016/11/06 11:21:19 leot Exp $
+$NetBSD: patch-filter_mupdftoraster.c,v 1.2 2019/06/01 17:39:05 leot Exp $
 
 execvpe(3) appeared only on NetBSD 8.0, use execve(3) instead (like
 cups-filters-1.11.4).
 
---- filter/mupdftoraster.c.orig	2016-10-27 22:50:52.000000000 +0000
+--- filter/mupdftoraster.c.orig	2019-05-16 13:02:29.000000000 +0000
 +++ filter/mupdftoraster.c
-@@ -215,7 +215,7 @@ mutool_spawn (const char *filename,
+@@ -202,7 +202,7 @@ mutool_spawn (const char *filename,
  
    if ((pid = fork()) == 0) {
-     /* Execute Mutool command line ... */
+     /* Execute mutool command line ... */
 -    execvpe(filename, mutoolargv, envp);
 +    execve(filename, mutoolargv, envp);
      perror(filename);