CVS commit: pkgsrc/print

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Sep  4 15:08:29 UTC 2017

Modified Files:
        pkgsrc/print/poppler: Makefile.common buildlink3.mk distinfo
        pkgsrc/print/poppler-cpp: buildlink3.mk
        pkgsrc/print/poppler-glib: buildlink3.mk
        pkgsrc/print/poppler-includes: buildlink3.mk
        pkgsrc/print/poppler-qt4: buildlink3.mk
        pkgsrc/print/poppler-qt5: buildlink3.mk
        pkgsrc/print/poppler/patches: patch-ab

Log Message:
Update poppler* to 0.58.0:

Release 0.58.0
        core:
         * CairoOutputDev: cairo 1.14 now has high quality downscaling
         * Signature related improvements. Bug #99271
         * Tweak which cmap we use. Bug #101855
         * Memory leak fixes
         * Substantial rework of the internals
         * win32: call ANSI functions directly. Bug #100312
         * Add some documentation

        qt5:
         * Expose signature information.
         * ArthurOutputDev: initialize the image with the paper color. Bug #102129
         * Fix copy'n'paste bugs: Qt4 -> Qt5
         * ArthurOutputDev: Properly set the QPainter transformation
         * ArthurOutputDev: Use Qt::SvgMiterJoin instead of Qt::MiterJoin. Bug #102356

        utils:
         * pdfinfo: add -dests option to print named destinations. Bug #97262
         * pdftocairo: add -jpegopt for setting jpeg compression parameters. Bug #45727
         * pdftoppm: add -jpegopt for setting jpeg compression parameters. Bug #45727
         * pdfimages: support listing/extracting inline images. Bug #25625

        build system:
         * cmake: Various Windows fixes
         * cmake: Use -std=c++11 instead of -std=gnu++11

        cpp:
         * Fix page.text() not taking page orientation into account. Bug #94517


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/print/poppler/Makefile.common
cvs rdiff -u -r1.54 -r1.55 pkgsrc/print/poppler/buildlink3.mk
cvs rdiff -u -r1.118 -r1.119 pkgsrc/print/poppler/distinfo
cvs rdiff -u -r1.29 -r1.30 pkgsrc/print/poppler-cpp/buildlink3.mk
cvs rdiff -u -r1.55 -r1.56 pkgsrc/print/poppler-glib/buildlink3.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/poppler-includes/buildlink3.mk
cvs rdiff -u -r1.36 -r1.37 pkgsrc/print/poppler-qt4/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/print/poppler-qt5/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/poppler/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/poppler/Makefile.common
diff -u pkgsrc/print/poppler/Makefile.common:1.90 pkgsrc/print/poppler/Makefile.common:1.91
--- pkgsrc/print/poppler/Makefile.common:1.90   Sun Sep  3 08:53:13 2017
+++ pkgsrc/print/poppler/Makefile.common        Mon Sep  4 15:08:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.90 2017/09/03 08:53:13 wiz Exp $
+# $NetBSD: Makefile.common,v 1.91 2017/09/04 15:08:29 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.57.0
+POPPLER_VERS=          0.58.0
 DISTNAME=              poppler-${POPPLER_VERS}
 CATEGORIES=            print
 MASTER_SITES=          https://poppler.freedesktop.org/

Index: pkgsrc/print/poppler/buildlink3.mk
diff -u pkgsrc/print/poppler/buildlink3.mk:1.54 pkgsrc/print/poppler/buildlink3.mk:1.55
--- pkgsrc/print/poppler/buildlink3.mk:1.54     Tue Aug 15 10:44:58 2017
+++ pkgsrc/print/poppler/buildlink3.mk  Mon Sep  4 15:08:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.54 2017/08/15 10:44:58 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.55 2017/09/04 15:08:29 wiz Exp $
 
 BUILDLINK_TREE+=       poppler
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        poppler
 POPPLER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler+=        poppler>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler+=        poppler>=0.57.0
+BUILDLINK_ABI_DEPENDS.poppler+=        poppler>=0.58.0
 BUILDLINK_PKGSRCDIR.poppler?=  ../../print/poppler
 
 .include "../../graphics/lcms2/buildlink3.mk"

Index: pkgsrc/print/poppler/distinfo
diff -u pkgsrc/print/poppler/distinfo:1.118 pkgsrc/print/poppler/distinfo:1.119
--- pkgsrc/print/poppler/distinfo:1.118 Mon Aug 14 20:22:45 2017
+++ pkgsrc/print/poppler/distinfo       Mon Sep  4 15:08:29 2017
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.118 2017/08/14 20:22:45 nros Exp $
+$NetBSD: distinfo,v 1.119 2017/09/04 15:08:29 wiz Exp $
 
-SHA1 (poppler-0.57.0.tar.xz) = 128f175a81a7c25c4c67b353391b8cae506db2ae
-RMD160 (poppler-0.57.0.tar.xz) = a535f7797241cf44b598ad8d60a05f5307afcd52
-SHA512 (poppler-0.57.0.tar.xz) = 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f
-Size (poppler-0.57.0.tar.xz) = 1703300 bytes
+SHA1 (poppler-0.58.0.tar.xz) = 66a94207d268b2e1920d657873ac77ef1678edef
+RMD160 (poppler-0.58.0.tar.xz) = 73f3237fae5b4c49eb9109708b7efb1fe7a0f179
+SHA512 (poppler-0.58.0.tar.xz) = 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee
+Size (poppler-0.58.0.tar.xz) = 1710412 bytes
 SHA1 (patch-aa) = f97ea3f4d381c189fc81552d91a50cd62bd0c1a1
-SHA1 (patch-ab) = ad0ec112c33ac730d281dc392faeb9a842175950
+SHA1 (patch-ab) = 5424a59d53c64ef3a40c569aac3111ce7c32dfbc
 SHA1 (patch-ag) = d4df4fdf141186e1cc653bb467b31b3335d733ff
 SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa
 SHA1 (patch-ar) = b064ff2dc9080ff5f1a1361e7798480ace11f3a3

Index: pkgsrc/print/poppler-cpp/buildlink3.mk
diff -u pkgsrc/print/poppler-cpp/buildlink3.mk:1.29 pkgsrc/print/poppler-cpp/buildlink3.mk:1.30
--- pkgsrc/print/poppler-cpp/buildlink3.mk:1.29 Tue Aug 15 10:44:58 2017
+++ pkgsrc/print/poppler-cpp/buildlink3.mk      Mon Sep  4 15:08:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2017/08/15 10:44:58 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2017/09/04 15:08:29 wiz Exp $
 
 BUILDLINK_TREE+=       poppler-cpp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        poppler-cpp
 POPPLER_CPP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler-cpp+=    poppler-cpp>=0.16.7
-BUILDLINK_ABI_DEPENDS.poppler-cpp+=    poppler-cpp>=0.57.0
+BUILDLINK_ABI_DEPENDS.poppler-cpp+=    poppler-cpp>=0.58.0
 BUILDLINK_PKGSRCDIR.poppler-cpp?=      ../../print/poppler-cpp
 
 .include "../../print/poppler/buildlink3.mk"

Index: pkgsrc/print/poppler-glib/buildlink3.mk
diff -u pkgsrc/print/poppler-glib/buildlink3.mk:1.55 pkgsrc/print/poppler-glib/buildlink3.mk:1.56
--- pkgsrc/print/poppler-glib/buildlink3.mk:1.55        Tue Aug 15 10:44:58 2017
+++ pkgsrc/print/poppler-glib/buildlink3.mk     Mon Sep  4 15:08:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.55 2017/08/15 10:44:58 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.56 2017/09/04 15:08:29 wiz Exp $
 
 BUILDLINK_TREE+=       poppler-glib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        poppler-glib
 POPPLER_GLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler-glib+=   poppler-glib>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler-glib+=   poppler-glib>=0.57.0
+BUILDLINK_ABI_DEPENDS.poppler-glib+=   poppler-glib>=0.58.0
 BUILDLINK_PKGSRCDIR.poppler-glib?=     ../../print/poppler-glib
 
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/print/poppler-includes/buildlink3.mk
diff -u pkgsrc/print/poppler-includes/buildlink3.mk:1.25 pkgsrc/print/poppler-includes/buildlink3.mk:1.26
--- pkgsrc/print/poppler-includes/buildlink3.mk:1.25    Tue Aug 15 10:44:58 2017
+++ pkgsrc/print/poppler-includes/buildlink3.mk Mon Sep  4 15:08:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2017/08/15 10:44:58 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2017/09/04 15:08:29 wiz Exp $
 
 BUILDLINK_TREE+=       poppler-includes
 
@@ -8,7 +8,7 @@ POPPLER_INCLUDES_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.poppler-includes?= build
 
 BUILDLINK_API_DEPENDS.poppler-includes+=       poppler-includes>=0.22.2
-BUILDLINK_ABI_DEPENDS.poppler-includes?=       poppler-includes>=0.57.0
+BUILDLINK_ABI_DEPENDS.poppler-includes?=       poppler-includes>=0.58.0
 BUILDLINK_PKGSRCDIR.poppler-includes?= ../../print/poppler-includes
 .endif # POPPLER_INCLUDES_BUILDLINK3_MK
 

Index: pkgsrc/print/poppler-qt4/buildlink3.mk
diff -u pkgsrc/print/poppler-qt4/buildlink3.mk:1.36 pkgsrc/print/poppler-qt4/buildlink3.mk:1.37
--- pkgsrc/print/poppler-qt4/buildlink3.mk:1.36 Tue Aug 15 10:44:58 2017
+++ pkgsrc/print/poppler-qt4/buildlink3.mk      Mon Sep  4 15:08:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2017/08/15 10:44:58 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2017/09/04 15:08:29 wiz Exp $
 
 BUILDLINK_TREE+=       poppler-qt4
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        poppler-qt4
 POPPLER_QT4_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler-qt4+=    poppler-qt4>=0.6.1
-BUILDLINK_ABI_DEPENDS.poppler-qt4+=    poppler-qt4>=0.57.0
+BUILDLINK_ABI_DEPENDS.poppler-qt4+=    poppler-qt4>=0.58.0
 BUILDLINK_PKGSRCDIR.poppler-qt4?=      ../../print/poppler-qt4
 
 .include "../../print/poppler/buildlink3.mk"

Index: pkgsrc/print/poppler-qt5/buildlink3.mk
diff -u pkgsrc/print/poppler-qt5/buildlink3.mk:1.14 pkgsrc/print/poppler-qt5/buildlink3.mk:1.15
--- pkgsrc/print/poppler-qt5/buildlink3.mk:1.14 Tue Aug 15 10:44:58 2017
+++ pkgsrc/print/poppler-qt5/buildlink3.mk      Mon Sep  4 15:08:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2017/08/15 10:44:58 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2017/09/04 15:08:29 wiz Exp $
 
 BUILDLINK_TREE+=       poppler-qt5
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        poppler-qt5
 POPPLER_QT5_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler-qt5+=    poppler-qt5>=0.26.0
-BUILDLINK_ABI_DEPENDS.poppler-qt5?=    poppler-qt5>=0.57.0
+BUILDLINK_ABI_DEPENDS.poppler-qt5?=    poppler-qt5>=0.58.0
 BUILDLINK_PKGSRCDIR.poppler-qt5?=      ../../print/poppler-qt5
 
 .include "../../print/poppler/buildlink3.mk"

Index: pkgsrc/print/poppler/patches/patch-ab
diff -u pkgsrc/print/poppler/patches/patch-ab:1.21 pkgsrc/print/poppler/patches/patch-ab:1.22
--- pkgsrc/print/poppler/patches/patch-ab:1.21  Thu Jul  6 11:29:59 2017
+++ pkgsrc/print/poppler/patches/patch-ab       Mon Sep  4 15:08:29 2017
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.21 2017/07/06 11:29:59 wiz Exp $
+$NetBSD: patch-ab,v 1.22 2017/09/04 15:08:29 wiz Exp $
 
 Use installed poppler library so we can have a separate poppler-utils
 package.
 
 Always build pdftoppm.
 
---- utils/Makefile.in.orig     2017-05-21 21:19:46.000000000 +0000
+--- utils/Makefile.in.orig     2017-09-01 18:15:13.000000000 +0000
 +++ utils/Makefile.in
 @@ -96,10 +96,10 @@ host_triplet = @host@
  @BUILD_UTILS_TRUE@    pdfunite$(EXEEXT) $(am__EXEEXT_1) \
@@ -31,7 +31,7 @@ Always build pdftoppm.
  @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_3 = pdftocairo$(EXEEXT)
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  PROGRAMS = $(bin_PROGRAMS)
-@@ -138,39 +138,39 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX
+@@ -138,34 +138,34 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX
  pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
  pdfdetach_LDADD = $(LDADD)
  pdfdetach_DEPENDENCIES = libparseargs.la \
@@ -63,13 +63,16 @@ Always build pdftoppm.
  pdfseparate_DEPENDENCIES = libparseargs.la \
 -      $(top_builddir)/poppler/libpoppler.la
 +      $(prefix)/lib/libpoppler.la
- am_pdfsig_OBJECTS = pdfsig.$(OBJEXT)
+ am_pdfsig_OBJECTS = pdfsig-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) \
+ pdfsig_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdfsig_CXXFLAGS) \
+       $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+@@ -173,7 +173,7 @@ am_pdftocairo_OBJECTS = pdftocairo-pdfto
        pdftocairo-pdftocairo-win32.$(OBJEXT)
  pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
  am__DEPENDENCIES_1 = libparseargs.la \
@@ -78,7 +81,7 @@ Always build pdftoppm.
  am__DEPENDENCIES_2 =
  @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 =  \
  @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@       $(am__DEPENDENCIES_2)
-@@ -184,7 +184,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
+@@ -187,7 +187,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
  pdftohtml_DEPENDENCIES = libparseargs.la \
@@ -87,7 +90,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 $@
-@@ -192,22 +192,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
+@@ -195,22 +195,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  pdftoppm_LDADD = $(LDADD)
  pdftoppm_DEPENDENCIES = libparseargs.la \
@@ -114,7 +117,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
-@@ -550,8 +550,9 @@ AM_CPPFLAGS = \
+@@ -553,8 +553,9 @@ AM_CPPFLAGS = \
  
  LDADD = \
        libparseargs.la                         \