Update poppler to 0.42.

Poppler 0.42 Release

        core:
         * Add the support for version 5 + revision 6 documents. Bug #85368
         * Add initial support for Signature handling
         * Initialize gamut mapping multipliers in ::copy() functions. Bug #90697
         * Implement jpx streams support with depth < 8
         * Handle SMaskInData = 0 for JPX encoded images. Bug #93468
         * Fix rendering of some broken PDF files. Bug #92508
         * PSOutputDev: Support for LZW encoding
         * PSOutputDev: Add support for Flate compression in Level 3 output.
         * SplashOuputDev: Implement function shading. Bug #94441
         * SplashOuputDev: Improve rendering of some non embedded fonts. Bug #94054
         * SplashOuputDev: Fall back to Gfx implementation of tiling pattern if repetition rate is small. Bug #90596
         * SplashOuputDev: Implementation of Matte entries in softmasks of softmasked images. Bug #22473
         * SplashOuputDev: assure line width > 0 in case of text stroke. Bug #94038
         * TextOuputDev: Cache result of inner loop in visitDepthFirst. Bug #77087
         * Avoid attempting a tiling pattern fill with a singular transform matrix

        utils:
         * pdfinfo: Add option to show document structure
         * pdfsig: New command that gives information about signature

        qt4:
         * Fix bug in links to remote documents getting the page number wrong sometimes

        qt5:
         * Fix bug in links to remote documents getting the page number wrong sometimes

Poppler 0.41 Releases

        core:
         * CairoOutputDev: add missing font types (fontCIDType0COT and fontTrueTypeOT). Bug #93559
         * SplashOutputDev: Adjust limit check and check in addition bitmap pointer. Bug #94053

        utils:
         * pdfseparate: Refine resource detection
         * pdfinfo: fix man page

8 files changed, 51 insertions, 46 deletions

diff --git a/print/poppler-includes/PLIST b/print/poppler-includes/PLIST
index 6b8b94e8aeb..b6cb4ca0fc4 100644
--- a/print/poppler-includes/PLIST
+++ b/print/poppler-includes/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2014/06/07 10:56:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2016/04/15 14:36:21 wiz Exp $
 include/poppler/Annot.h
 include/poppler/Array.h
 include/poppler/BuiltinFont.h
@@ -53,6 +53,7 @@ include/poppler/PreScanOutputDev.h
 include/poppler/ProfileData.h
 include/poppler/Rendition.h
 include/poppler/SecurityHandler.h
+include/poppler/SignatureInfo.h
 include/poppler/Sound.h
 include/poppler/SplashOutputDev.h
 include/poppler/StdinCachedFile.h
diff --git a/print/poppler-qt4/Makefile b/print/poppler-qt4/Makefile
index b45f5bd1b0d..4a3efaff229 100644
--- a/print/poppler-qt4/Makefile
+++ b/print/poppler-qt4/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.47 2016/03/05 11:29:17 jperkin Exp $
+# $NetBSD: Makefile,v 1.48 2016/04/15 14:36:21 wiz Exp $
 
-PKGREVISION= 1
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-qt4-${POPPLER_VERS}
diff --git a/print/poppler-qt5/Makefile b/print/poppler-qt5/Makefile
index 2e9105bade2..eb170b3c73d 100644
--- a/print/poppler-qt5/Makefile
+++ b/print/poppler-qt5/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.8 2016/04/11 19:02:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2016/04/15 14:36:21 wiz Exp $
 
-PKGREVISION= 2
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-qt5-${POPPLER_VERS}
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index 579f74b8adb..f7bb7d13a9b 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.77 2016/01/27 10:26:42 wiz Exp $
+# $NetBSD: Makefile.common,v 1.78 2016/04/15 14:36:21 wiz Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -8,7 +8,7 @@
 # used by print/poppler-qt5/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=		0.40.0
+POPPLER_VERS=		0.42.0
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 97997061601..3f0bafa79db 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.105 2016/01/27 10:26:42 wiz Exp $
+$NetBSD: distinfo,v 1.106 2016/04/15 14:36:21 wiz Exp $
 
-SHA1 (poppler-0.40.0.tar.xz) = 8c3be50ff6cd5174a7c37f4f038a7ef8386e9a5f
-RMD160 (poppler-0.40.0.tar.xz) = ab3d8da12a4e57654664c4dd0d52d6a3d3cd4fcf
-SHA512 (poppler-0.40.0.tar.xz) = 0f26f342a4f70ebc65848c61e5eb1a182d539a8e4cdc5fa499c52765d15867e13ee7c595773d2e8d6f2eb3e83e1c19f35cc6bb47f8aeb87a8ad92e45ecff50cd
-Size (poppler-0.40.0.tar.xz) = 1642708 bytes
-SHA1 (patch-aa) = 15839af8b9ca17662d721428a96ff74f1bb7ba72
-SHA1 (patch-ab) = 55bcf94d51f5c9c5bf999f7b4fa63afebe77c83c
+SHA1 (poppler-0.42.0.tar.xz) = 4a445d2da6bcf9fd80517b4c881873977b6f49ba
+RMD160 (poppler-0.42.0.tar.xz) = 503cfddcb1a2817b3e180ce70b1c8e480785be4d
+SHA512 (poppler-0.42.0.tar.xz) = ab8c86c28a2ac848bf118de7f20f57576ed4faa4ad06ae7d58590b951fb2b0ee8a728919ce2417592b467af7322c57ed0bff0288eced042fcf94a50d89c73c19
+Size (poppler-0.42.0.tar.xz) = 1674024 bytes
+SHA1 (patch-aa) = 03798571a0b546e2cabb3579e537459674022ed4
+SHA1 (patch-ab) = 79842143a6fb4b5a01571a1e5b661c7380e4a552
 SHA1 (patch-ag) = d4df4fdf141186e1cc653bb467b31b3335d733ff
 SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa
 SHA1 (patch-ar) = b064ff2dc9080ff5f1a1361e7798480ace11f3a3
 SHA1 (patch-as) = 1238357e57fa310ba9c9f00768c46074b8325739
-SHA1 (patch-qt5_src_Makefile.in) = 8288b41e87a4f14d6a1fd361564e1356f9673dd9
+SHA1 (patch-qt5_src_Makefile.in) = bd35aaa1ca82b12c26475066c13c9126ecbb5a88
diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa
index 72cfc19fe4d..4d18984407a 100644
--- a/print/poppler/patches/patch-aa
+++ b/print/poppler/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.15 2015/10/01 05:36:36 wiz Exp $
+$NetBSD: patch-aa,v 1.16 2016/04/15 14:36:21 wiz Exp $
 
 Use installed copy of poppler library so we can have a separate
 poppler-glib package.
 
---- glib/Makefile.in.orig	2015-09-09 22:06:58.000000000 +0000
+--- glib/Makefile.in.orig	2016-03-16 22:22:12.000000000 +0000
 +++ glib/Makefile.in
-@@ -134,7 +134,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+@@ -143,7 +143,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libpoppler_glib_la_DEPENDENCIES =  \
@@ -14,7 +14,7 @@ poppler-glib package.
  	$(top_builddir)/poppler/libpoppler-cairo.la \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
-@@ -554,7 +554,7 @@ libpoppler_glib_la_CPPFLAGS = \
+@@ -569,7 +569,7 @@ libpoppler_glib_la_CPPFLAGS = \
  	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
  
  libpoppler_glib_la_LIBADD = \
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab
index 500ac658e75..f08326965c1 100644
--- a/print/poppler/patches/patch-ab
+++ b/print/poppler/patches/patch-ab
@@ -1,36 +1,36 @@
-$NetBSD: patch-ab,v 1.18 2014/11/20 16:03:46 wiz Exp $
+$NetBSD: patch-ab,v 1.19 2016/04/15 14:36:21 wiz Exp $
 
 Use installed poppler library so we can have a separate poppler-utils
 package.
 
 Always build pdftoppm.
 
---- utils/Makefile.in.orig	2014-11-04 18:46:22.000000000 +0000
+--- utils/Makefile.in.orig	2016-03-16 22:22:14.000000000 +0000
 +++ utils/Makefile.in
-@@ -85,9 +85,9 @@ host_triplet = @host@
- @BUILD_UTILS_TRUE@	pdftohtml$(EXEEXT) pdfseparate$(EXEEXT) \
+@@ -96,9 +96,9 @@ host_triplet = @host@
  @BUILD_UTILS_TRUE@	pdfunite$(EXEEXT) $(am__EXEEXT_1) \
- @BUILD_UTILS_TRUE@	$(am__EXEEXT_2)
--@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_1 = pdftoppm
-+am__append_1 = pdftoppm
- @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_2 = pdftocairo
--@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_3 = pdftoppm.1
-+am__append_3 = pdftoppm.1
- @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_4 = pdftocairo.1
- @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_5 = $(LCMS_CFLAGS)
- @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_6 = $(LCMS_LIBS)
-@@ -117,8 +117,8 @@ AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ @BUILD_UTILS_TRUE@	$(am__EXEEXT_2) $(am__EXEEXT_3)
+ @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__append_1 = pdfsig
+-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_2 = pdftoppm
++am__append_2 = pdftoppm
+ @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_3 = pdftocairo
+-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_4 = pdftoppm.1
++am__append_4 = pdftoppm.1
+ @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_5 = pdftocairo.1
+ @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_6 = $(LCMS_CFLAGS)
+ @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_7 = $(LCMS_LIBS)
+@@ -128,8 +128,8 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
  am__v_lt_1 = 
--@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_1 =  \
+ @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_1 = pdfsig$(EXEEXT)
+-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_2 =  \
 -@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@	pdftoppm$(EXEEXT)
-+am__EXEEXT_1 =  \
++am__EXEEXT_2 =  \
 +	pdftoppm$(EXEEXT)
- @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_2 = pdftocairo$(EXEEXT)
+ @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_3 = pdftocairo$(EXEEXT)
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  PROGRAMS = $(bin_PROGRAMS)
-@@ -126,39 +126,39 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX
+@@ -137,44 +137,44 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX
  pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
  pdfdetach_LDADD = $(LDADD)
  pdfdetach_DEPENDENCIES = libparseargs.la \
@@ -62,6 +62,12 @@ Always build pdftoppm.
  pdfseparate_DEPENDENCIES = libparseargs.la \
 -	$(top_builddir)/poppler/libpoppler.la
 +	$(prefix)/lib/libpoppler.la
+ am_pdfsig_OBJECTS = pdfsig.$(OBJEXT)
+ pdfsig_OBJECTS = $(am_pdfsig_OBJECTS)
+ pdfsig_LDADD = $(LDADD)
+ pdfsig_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++	$(prefix)/lib/libpoppler.la
  am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \
  	pdftocairo-pdftocairo-win32.$(OBJEXT)
  pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
@@ -77,7 +83,7 @@ Always build pdftoppm.
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
  	$(am__DEPENDENCIES_2)
  am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \
-@@ -167,7 +167,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
+@@ -183,7 +183,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
  pdftohtml_DEPENDENCIES = libparseargs.la \
@@ -86,7 +92,7 @@ Always build pdftoppm.
  pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
  	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -175,22 +175,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
+@@ -191,22 +191,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  pdftoppm_LDADD = $(LDADD)
  pdftoppm_DEPENDENCIES = libparseargs.la \
@@ -113,7 +119,7 @@ Always build pdftoppm.
  AM_V_P = $(am__v_P_@AM_V@)
  am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
  am__v_P_0 = false
-@@ -527,8 +527,9 @@ AM_CPPFLAGS = \
+@@ -549,8 +549,9 @@ AM_CPPFLAGS = \
  
  LDADD = \
  	libparseargs.la				\
@@ -125,7 +131,7 @@ Always build pdftoppm.
  
  @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
  @BUILD_UTILS_TRUE@	pdfinfo.1 pdftops.1 pdftotext.1 pdftohtml.1 \
-@@ -590,7 +591,7 @@ pdftocairo_SOURCES = \
+@@ -615,7 +616,7 @@ pdftocairo_SOURCES = \
  	pdftocairo-win32.h
  
  pdftocairo_LDADD = \
diff --git a/print/poppler/patches/patch-qt5_src_Makefile.in b/print/poppler/patches/patch-qt5_src_Makefile.in
index d443835d0f9..971eef89559 100644
--- a/print/poppler/patches/patch-qt5_src_Makefile.in
+++ b/print/poppler/patches/patch-qt5_src_Makefile.in
@@ -1,11 +1,11 @@
-$NetBSD: patch-qt5_src_Makefile.in,v 1.3 2015/10/01 05:36:36 wiz Exp $
+$NetBSD: patch-qt5_src_Makefile.in,v 1.4 2016/04/15 14:36:21 wiz Exp $
 
 Use installed copy of poppler library so we can have a separate
 poppler-qt5 package.
 
---- qt5/src/Makefile.in.orig	2015-09-09 22:07:00.000000000 +0000
+--- qt5/src/Makefile.in.orig	2016-03-16 22:22:13.000000000 +0000
 +++ qt5/src/Makefile.in
-@@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+@@ -139,7 +139,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libpoppler_qt5_la_DEPENDENCIES =  \
@@ -14,7 +14,7 @@ poppler-qt5 package.
  am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \
  	libpoppler_qt5_la-poppler-page.lo \
  	libpoppler_qt5_la-poppler-fontinfo.lo \
-@@ -505,7 +505,7 @@ libpoppler_qt5_la_CXXFLAGS = \
+@@ -520,7 +520,7 @@ libpoppler_qt5_la_CXXFLAGS = \
  	-Dpoppler_qt5_EXPORTS
  
  libpoppler_qt5_la_LIBADD = \