Mon Sep 4 15:08:29 2017 UTC ()
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


(wiz)
diff -r1.90 -r1.91 pkgsrc/print/poppler/Makefile.common
diff -r1.54 -r1.55 pkgsrc/print/poppler/buildlink3.mk
diff -r1.118 -r1.119 pkgsrc/print/poppler/distinfo
diff -r1.29 -r1.30 pkgsrc/print/poppler-cpp/buildlink3.mk
diff -r1.55 -r1.56 pkgsrc/print/poppler-glib/buildlink3.mk
diff -r1.25 -r1.26 pkgsrc/print/poppler-includes/buildlink3.mk
diff -r1.36 -r1.37 pkgsrc/print/poppler-qt4/buildlink3.mk
diff -r1.14 -r1.15 pkgsrc/print/poppler-qt5/buildlink3.mk
diff -r1.21 -r1.22 pkgsrc/print/poppler/patches/patch-ab
cvs diff -r1.90 -r1.91 pkgsrc/print/poppler/Makefile.common (expand / switch to unified diff)

--- pkgsrc/print/poppler/Makefile.common 2017/09/03 08:53:13 1.90
+++ pkgsrc/print/poppler/Makefile.common 2017/09/04 15:08:29 1.91
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile.common,v 1.90 2017/09/03 08:53:13 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.91 2017/09/04 15:08:29 wiz Exp $
2# 2#
3# used by print/poppler/Makefile 3# used by print/poppler/Makefile
4# used by print/poppler-cpp/Makefile 4# used by print/poppler-cpp/Makefile
5# used by print/poppler-glib/Makefile 5# used by print/poppler-glib/Makefile
6# used by print/poppler-includes/Makefile 6# used by print/poppler-includes/Makefile
7# used by print/poppler-qt4/Makefile 7# used by print/poppler-qt4/Makefile
8# used by print/poppler-qt5/Makefile 8# used by print/poppler-qt5/Makefile
9# used by print/poppler-utils/Makefile 9# used by print/poppler-utils/Makefile
10 10
11POPPLER_VERS= 0.57.0 11POPPLER_VERS= 0.58.0
12DISTNAME= poppler-${POPPLER_VERS} 12DISTNAME= poppler-${POPPLER_VERS}
13CATEGORIES= print 13CATEGORIES= print
14MASTER_SITES= https://poppler.freedesktop.org/ 14MASTER_SITES= https://poppler.freedesktop.org/
15EXTRACT_SUFX= .tar.xz 15EXTRACT_SUFX= .tar.xz
16 16
17HOMEPAGE= https://poppler.freedesktop.org/ 17HOMEPAGE= https://poppler.freedesktop.org/
18LICENSE= gnu-gpl-v2 18LICENSE= gnu-gpl-v2
19 19
20DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo 20DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo
21PATCHDIR= ${.CURDIR}/../../print/poppler/patches 21PATCHDIR= ${.CURDIR}/../../print/poppler/patches
22 22
23USE_TOOLS+= pkg-config 23USE_TOOLS+= pkg-config
24USE_LIBTOOL= yes 24USE_LIBTOOL= yes
cvs diff -r1.54 -r1.55 pkgsrc/print/poppler/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/print/poppler/buildlink3.mk 2017/08/15 10:44:58 1.54
+++ pkgsrc/print/poppler/buildlink3.mk 2017/09/04 15:08:29 1.55
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: buildlink3.mk,v 1.54 2017/08/15 10:44:58 nros Exp $ 1# $NetBSD: buildlink3.mk,v 1.55 2017/09/04 15:08:29 wiz Exp $
2 2
3BUILDLINK_TREE+= poppler 3BUILDLINK_TREE+= poppler
4 4
5.if !defined(POPPLER_BUILDLINK3_MK) 5.if !defined(POPPLER_BUILDLINK3_MK)
6POPPLER_BUILDLINK3_MK:= 6POPPLER_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.poppler+= poppler>=0.5.1 8BUILDLINK_API_DEPENDS.poppler+= poppler>=0.5.1
9BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.57.0 9BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.58.0
10BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler 10BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler
11 11
12.include "../../graphics/lcms2/buildlink3.mk" 12.include "../../graphics/lcms2/buildlink3.mk"
13.include "../../fonts/fontconfig/buildlink3.mk" 13.include "../../fonts/fontconfig/buildlink3.mk"
14.include "../../mk/jpeg.buildlink3.mk" 14.include "../../mk/jpeg.buildlink3.mk"
15.include "../../graphics/openjpeg/buildlink3.mk" 15.include "../../graphics/openjpeg/buildlink3.mk"
16.include "../../graphics/png/buildlink3.mk" 16.include "../../graphics/png/buildlink3.mk"
17.endif # POPPLER_BUILDLINK3_MK 17.endif # POPPLER_BUILDLINK3_MK
18 18
19BUILDLINK_TREE+= -poppler 19BUILDLINK_TREE+= -poppler
cvs diff -r1.118 -r1.119 pkgsrc/print/poppler/distinfo (expand / switch to unified diff)

--- pkgsrc/print/poppler/distinfo 2017/08/14 20:22:45 1.118
+++ pkgsrc/print/poppler/distinfo 2017/09/04 15:08:29 1.119
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.118 2017/08/14 20:22:45 nros Exp $ 1$NetBSD: distinfo,v 1.119 2017/09/04 15:08:29 wiz Exp $
2 2
3SHA1 (poppler-0.57.0.tar.xz) = 128f175a81a7c25c4c67b353391b8cae506db2ae 3SHA1 (poppler-0.58.0.tar.xz) = 66a94207d268b2e1920d657873ac77ef1678edef
4RMD160 (poppler-0.57.0.tar.xz) = a535f7797241cf44b598ad8d60a05f5307afcd52 4RMD160 (poppler-0.58.0.tar.xz) = 73f3237fae5b4c49eb9109708b7efb1fe7a0f179
5SHA512 (poppler-0.57.0.tar.xz) = 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f 5SHA512 (poppler-0.58.0.tar.xz) = 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee
6Size (poppler-0.57.0.tar.xz) = 1703300 bytes 6Size (poppler-0.58.0.tar.xz) = 1710412 bytes
7SHA1 (patch-aa) = f97ea3f4d381c189fc81552d91a50cd62bd0c1a1 7SHA1 (patch-aa) = f97ea3f4d381c189fc81552d91a50cd62bd0c1a1
8SHA1 (patch-ab) = ad0ec112c33ac730d281dc392faeb9a842175950 8SHA1 (patch-ab) = 5424a59d53c64ef3a40c569aac3111ce7c32dfbc
9SHA1 (patch-ag) = d4df4fdf141186e1cc653bb467b31b3335d733ff 9SHA1 (patch-ag) = d4df4fdf141186e1cc653bb467b31b3335d733ff
10SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa 10SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa
11SHA1 (patch-ar) = b064ff2dc9080ff5f1a1361e7798480ace11f3a3 11SHA1 (patch-ar) = b064ff2dc9080ff5f1a1361e7798480ace11f3a3
12SHA1 (patch-as) = 1238357e57fa310ba9c9f00768c46074b8325739 12SHA1 (patch-as) = 1238357e57fa310ba9c9f00768c46074b8325739
13SHA1 (patch-qt5_src_Makefile.in) = c3a47fde201d61a7b7674020f5c998173a61b216 13SHA1 (patch-qt5_src_Makefile.in) = c3a47fde201d61a7b7674020f5c998173a61b216
cvs diff -r1.29 -r1.30 pkgsrc/print/poppler-cpp/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/print/poppler-cpp/buildlink3.mk 2017/08/15 10:44:58 1.29
+++ pkgsrc/print/poppler-cpp/buildlink3.mk 2017/09/04 15:08:29 1.30
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.29 2017/08/15 10:44:58 nros Exp $ 1# $NetBSD: buildlink3.mk,v 1.30 2017/09/04 15:08:29 wiz Exp $
2 2
3BUILDLINK_TREE+= poppler-cpp 3BUILDLINK_TREE+= poppler-cpp
4 4
5.if !defined(POPPLER_CPP_BUILDLINK3_MK) 5.if !defined(POPPLER_CPP_BUILDLINK3_MK)
6POPPLER_CPP_BUILDLINK3_MK:= 6POPPLER_CPP_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.poppler-cpp+= poppler-cpp>=0.16.7 8BUILDLINK_API_DEPENDS.poppler-cpp+= poppler-cpp>=0.16.7
9BUILDLINK_ABI_DEPENDS.poppler-cpp+= poppler-cpp>=0.57.0 9BUILDLINK_ABI_DEPENDS.poppler-cpp+= poppler-cpp>=0.58.0
10BUILDLINK_PKGSRCDIR.poppler-cpp?= ../../print/poppler-cpp 10BUILDLINK_PKGSRCDIR.poppler-cpp?= ../../print/poppler-cpp
11 11
12.include "../../print/poppler/buildlink3.mk" 12.include "../../print/poppler/buildlink3.mk"
13.endif # POPPLER_CPP_BUILDLINK3_MK 13.endif # POPPLER_CPP_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -poppler-cpp 15BUILDLINK_TREE+= -poppler-cpp
cvs diff -r1.55 -r1.56 pkgsrc/print/poppler-glib/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/print/poppler-glib/buildlink3.mk 2017/08/15 10:44:58 1.55
+++ pkgsrc/print/poppler-glib/buildlink3.mk 2017/09/04 15:08:29 1.56
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: buildlink3.mk,v 1.55 2017/08/15 10:44:58 nros Exp $ 1# $NetBSD: buildlink3.mk,v 1.56 2017/09/04 15:08:29 wiz Exp $
2 2
3BUILDLINK_TREE+= poppler-glib 3BUILDLINK_TREE+= poppler-glib
4 4
5.if !defined(POPPLER_GLIB_BUILDLINK3_MK) 5.if !defined(POPPLER_GLIB_BUILDLINK3_MK)
6POPPLER_GLIB_BUILDLINK3_MK:= 6POPPLER_GLIB_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.5.1 8BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.5.1
9BUILDLINK_ABI_DEPENDS.poppler-glib+= poppler-glib>=0.57.0 9BUILDLINK_ABI_DEPENDS.poppler-glib+= poppler-glib>=0.58.0
10BUILDLINK_PKGSRCDIR.poppler-glib?= ../../print/poppler-glib 10BUILDLINK_PKGSRCDIR.poppler-glib?= ../../print/poppler-glib
11 11
12.include "../../devel/glib2/buildlink3.mk" 12.include "../../devel/glib2/buildlink3.mk"
13.include "../../graphics/cairo/buildlink3.mk" 13.include "../../graphics/cairo/buildlink3.mk"
14.include "../../print/poppler/buildlink3.mk" 14.include "../../print/poppler/buildlink3.mk"
15.endif # POPPLER_GLIB_BUILDLINK3_MK 15.endif # POPPLER_GLIB_BUILDLINK3_MK
16 16
17BUILDLINK_TREE+= -poppler-glib 17BUILDLINK_TREE+= -poppler-glib
cvs diff -r1.25 -r1.26 pkgsrc/print/poppler-includes/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/print/poppler-includes/buildlink3.mk 2017/08/15 10:44:58 1.25
+++ pkgsrc/print/poppler-includes/buildlink3.mk 2017/09/04 15:08:29 1.26
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.25 2017/08/15 10:44:58 nros Exp $ 1# $NetBSD: buildlink3.mk,v 1.26 2017/09/04 15:08:29 wiz Exp $
2 2
3BUILDLINK_TREE+= poppler-includes 3BUILDLINK_TREE+= poppler-includes
4 4
5.if !defined(POPPLER_INCLUDES_BUILDLINK3_MK) 5.if !defined(POPPLER_INCLUDES_BUILDLINK3_MK)
6POPPLER_INCLUDES_BUILDLINK3_MK:= 6POPPLER_INCLUDES_BUILDLINK3_MK:=
7 7
8BUILDLINK_DEPMETHOD.poppler-includes?= build 8BUILDLINK_DEPMETHOD.poppler-includes?= build
9 9
10BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.22.2 10BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.22.2
11BUILDLINK_ABI_DEPENDS.poppler-includes?= poppler-includes>=0.57.0 11BUILDLINK_ABI_DEPENDS.poppler-includes?= poppler-includes>=0.58.0
12BUILDLINK_PKGSRCDIR.poppler-includes?= ../../print/poppler-includes 12BUILDLINK_PKGSRCDIR.poppler-includes?= ../../print/poppler-includes
13.endif # POPPLER_INCLUDES_BUILDLINK3_MK 13.endif # POPPLER_INCLUDES_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -poppler-includes 15BUILDLINK_TREE+= -poppler-includes
cvs diff -r1.36 -r1.37 pkgsrc/print/poppler-qt4/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/print/poppler-qt4/Attic/buildlink3.mk 2017/08/15 10:44:58 1.36
+++ pkgsrc/print/poppler-qt4/Attic/buildlink3.mk 2017/09/04 15:08:29 1.37
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.36 2017/08/15 10:44:58 nros Exp $ 1# $NetBSD: buildlink3.mk,v 1.37 2017/09/04 15:08:29 wiz Exp $
2 2
3BUILDLINK_TREE+= poppler-qt4 3BUILDLINK_TREE+= poppler-qt4
4 4
5.if !defined(POPPLER_QT4_BUILDLINK3_MK) 5.if !defined(POPPLER_QT4_BUILDLINK3_MK)
6POPPLER_QT4_BUILDLINK3_MK:= 6POPPLER_QT4_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.poppler-qt4+= poppler-qt4>=0.6.1 8BUILDLINK_API_DEPENDS.poppler-qt4+= poppler-qt4>=0.6.1
9BUILDLINK_ABI_DEPENDS.poppler-qt4+= poppler-qt4>=0.57.0 9BUILDLINK_ABI_DEPENDS.poppler-qt4+= poppler-qt4>=0.58.0
10BUILDLINK_PKGSRCDIR.poppler-qt4?= ../../print/poppler-qt4 10BUILDLINK_PKGSRCDIR.poppler-qt4?= ../../print/poppler-qt4
11 11
12.include "../../print/poppler/buildlink3.mk" 12.include "../../print/poppler/buildlink3.mk"
13.endif # POPPLER_QT4_BUILDLINK3_MK 13.endif # POPPLER_QT4_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -poppler-qt4 15BUILDLINK_TREE+= -poppler-qt4
cvs diff -r1.14 -r1.15 pkgsrc/print/poppler-qt5/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/print/poppler-qt5/buildlink3.mk 2017/08/15 10:44:58 1.14
+++ pkgsrc/print/poppler-qt5/buildlink3.mk 2017/09/04 15:08:29 1.15
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.14 2017/08/15 10:44:58 nros Exp $ 1# $NetBSD: buildlink3.mk,v 1.15 2017/09/04 15:08:29 wiz Exp $
2 2
3BUILDLINK_TREE+= poppler-qt5 3BUILDLINK_TREE+= poppler-qt5
4 4
5.if !defined(POPPLER_QT5_BUILDLINK3_MK) 5.if !defined(POPPLER_QT5_BUILDLINK3_MK)
6POPPLER_QT5_BUILDLINK3_MK:= 6POPPLER_QT5_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.poppler-qt5+= poppler-qt5>=0.26.0 8BUILDLINK_API_DEPENDS.poppler-qt5+= poppler-qt5>=0.26.0
9BUILDLINK_ABI_DEPENDS.poppler-qt5?= poppler-qt5>=0.57.0 9BUILDLINK_ABI_DEPENDS.poppler-qt5?= poppler-qt5>=0.58.0
10BUILDLINK_PKGSRCDIR.poppler-qt5?= ../../print/poppler-qt5 10BUILDLINK_PKGSRCDIR.poppler-qt5?= ../../print/poppler-qt5
11 11
12.include "../../print/poppler/buildlink3.mk" 12.include "../../print/poppler/buildlink3.mk"
13.endif # POPPLER_QT5_BUILDLINK3_MK 13.endif # POPPLER_QT5_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -poppler-qt5 15BUILDLINK_TREE+= -poppler-qt5
cvs diff -r1.21 -r1.22 pkgsrc/print/poppler/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/poppler/patches/Attic/patch-ab 2017/07/06 11:29:59 1.21
+++ pkgsrc/print/poppler/patches/Attic/patch-ab 2017/09/04 15:08:29 1.22
@@ -1,47 +1,47 @@ @@ -1,47 +1,47 @@
1$NetBSD: patch-ab,v 1.21 2017/07/06 11:29:59 wiz Exp $ 1$NetBSD: patch-ab,v 1.22 2017/09/04 15:08:29 wiz Exp $
2 2
3Use installed poppler library so we can have a separate poppler-utils 3Use installed poppler library so we can have a separate poppler-utils
4package. 4package.
5 5
6Always build pdftoppm. 6Always build pdftoppm.
7 7
8--- utils/Makefile.in.orig 2017-05-21 21:19:46.000000000 +0000 8--- utils/Makefile.in.orig 2017-09-01 18:15:13.000000000 +0000
9+++ utils/Makefile.in 9+++ utils/Makefile.in
10@@ -96,10 +96,10 @@ host_triplet = @host@ 10@@ -96,10 +96,10 @@ host_triplet = @host@
11 @BUILD_UTILS_TRUE@ pdfunite$(EXEEXT) $(am__EXEEXT_1) \ 11 @BUILD_UTILS_TRUE@ pdfunite$(EXEEXT) $(am__EXEEXT_1) \
12 @BUILD_UTILS_TRUE@ $(am__EXEEXT_2) $(am__EXEEXT_3) 12 @BUILD_UTILS_TRUE@ $(am__EXEEXT_2) $(am__EXEEXT_3)
13 @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__append_1 = pdfsig 13 @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__append_1 = pdfsig
14-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_2 = pdftoppm 14-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_2 = pdftoppm
15+am__append_2 = pdftoppm 15+am__append_2 = pdftoppm
16 @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_3 = pdftocairo 16 @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_3 = pdftocairo
17 @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__append_4 = pdfsig.1 17 @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__append_4 = pdfsig.1
18-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_5 = pdftoppm.1 18-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_5 = pdftoppm.1
19+am__append_5 = pdftoppm.1 19+am__append_5 = pdftoppm.1
20 @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_6 = pdftocairo.1 20 @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_6 = pdftocairo.1
21 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_7 = $(LCMS_CFLAGS) 21 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_7 = $(LCMS_CFLAGS)
22 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_8 = $(LCMS_LIBS) 22 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_8 = $(LCMS_LIBS)
23@@ -129,8 +129,8 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) 23@@ -129,8 +129,8 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
24 am__v_lt_0 = --silent 24 am__v_lt_0 = --silent
25 am__v_lt_1 =  25 am__v_lt_1 =
26 @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_1 = pdfsig$(EXEEXT) 26 @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_1 = pdfsig$(EXEEXT)
27-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_2 = \ 27-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_2 = \
28-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@ pdftoppm$(EXEEXT) 28-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@ pdftoppm$(EXEEXT)
29+am__EXEEXT_2 = \ 29+am__EXEEXT_2 = \
30+ pdftoppm$(EXEEXT) 30+ pdftoppm$(EXEEXT)
31 @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_3 = pdftocairo$(EXEEXT) 31 @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_3 = pdftocairo$(EXEEXT)
32 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" 32 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
33 PROGRAMS = $(bin_PROGRAMS) 33 PROGRAMS = $(bin_PROGRAMS)
34@@ -138,39 +138,39 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX 34@@ -138,34 +138,34 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX
35 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS) 35 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
36 pdfdetach_LDADD = $(LDADD) 36 pdfdetach_LDADD = $(LDADD)
37 pdfdetach_DEPENDENCIES = libparseargs.la \ 37 pdfdetach_DEPENDENCIES = libparseargs.la \
38- $(top_builddir)/poppler/libpoppler.la 38- $(top_builddir)/poppler/libpoppler.la
39+ $(prefix)/lib/libpoppler.la 39+ $(prefix)/lib/libpoppler.la
40 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) 40 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
41 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) 41 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
42 pdffonts_LDADD = $(LDADD) 42 pdffonts_LDADD = $(LDADD)
43 pdffonts_DEPENDENCIES = libparseargs.la \ 43 pdffonts_DEPENDENCIES = libparseargs.la \
44- $(top_builddir)/poppler/libpoppler.la 44- $(top_builddir)/poppler/libpoppler.la
45+ $(prefix)/lib/libpoppler.la 45+ $(prefix)/lib/libpoppler.la
46 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ 46 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
47 JSInfo.$(OBJEXT) 47 JSInfo.$(OBJEXT)
@@ -53,76 +53,79 @@ Always build pdftoppm. @@ -53,76 +53,79 @@ Always build pdftoppm.
53 am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \ 53 am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
54 JSInfo.$(OBJEXT) 54 JSInfo.$(OBJEXT)
55 pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS) 55 pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
56 pdfinfo_LDADD = $(LDADD) 56 pdfinfo_LDADD = $(LDADD)
57 pdfinfo_DEPENDENCIES = libparseargs.la \ 57 pdfinfo_DEPENDENCIES = libparseargs.la \
58- $(top_builddir)/poppler/libpoppler.la 58- $(top_builddir)/poppler/libpoppler.la
59+ $(prefix)/lib/libpoppler.la 59+ $(prefix)/lib/libpoppler.la
60 am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) 60 am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT)
61 pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS) 61 pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
62 pdfseparate_LDADD = $(LDADD) 62 pdfseparate_LDADD = $(LDADD)
63 pdfseparate_DEPENDENCIES = libparseargs.la \ 63 pdfseparate_DEPENDENCIES = libparseargs.la \
64- $(top_builddir)/poppler/libpoppler.la 64- $(top_builddir)/poppler/libpoppler.la
65+ $(prefix)/lib/libpoppler.la 65+ $(prefix)/lib/libpoppler.la
66 am_pdfsig_OBJECTS = pdfsig.$(OBJEXT) 66 am_pdfsig_OBJECTS = pdfsig-pdfsig.$(OBJEXT)
67 pdfsig_OBJECTS = $(am_pdfsig_OBJECTS) 67 pdfsig_OBJECTS = $(am_pdfsig_OBJECTS)
68 pdfsig_LDADD = $(LDADD) 68 pdfsig_LDADD = $(LDADD)
69 pdfsig_DEPENDENCIES = libparseargs.la \ 69 pdfsig_DEPENDENCIES = libparseargs.la \
70- $(top_builddir)/poppler/libpoppler.la 70- $(top_builddir)/poppler/libpoppler.la
71+ $(prefix)/lib/libpoppler.la 71+ $(prefix)/lib/libpoppler.la
72 am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \ 72 pdfsig_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 73 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdfsig_CXXFLAGS) \
 74 $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 75@@ -173,7 +173,7 @@ am_pdftocairo_OBJECTS = pdftocairo-pdfto
73 pdftocairo-pdftocairo-win32.$(OBJEXT) 76 pdftocairo-pdftocairo-win32.$(OBJEXT)
74 pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS) 77 pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
75 am__DEPENDENCIES_1 = libparseargs.la \ 78 am__DEPENDENCIES_1 = libparseargs.la \
76- $(top_builddir)/poppler/libpoppler.la 79- $(top_builddir)/poppler/libpoppler.la
77+ $(prefix)/lib/libpoppler.la 80+ $(prefix)/lib/libpoppler.la
78 am__DEPENDENCIES_2 = 81 am__DEPENDENCIES_2 =
79 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \ 82 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \
80 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2) 83 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2)
81@@ -184,7 +184,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht 84@@ -187,7 +187,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
82 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) 85 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
83 pdftohtml_LDADD = $(LDADD) 86 pdftohtml_LDADD = $(LDADD)
84 pdftohtml_DEPENDENCIES = libparseargs.la \ 87 pdftohtml_DEPENDENCIES = libparseargs.la \
85- $(top_builddir)/poppler/libpoppler.la 88- $(top_builddir)/poppler/libpoppler.la
86+ $(prefix)/lib/libpoppler.la 89+ $(prefix)/lib/libpoppler.la
87 pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ 90 pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
88 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \ 91 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
89 $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ 92 $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
90@@ -192,22 +192,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) 93@@ -195,22 +195,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
91 pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS) 94 pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
92 pdftoppm_LDADD = $(LDADD) 95 pdftoppm_LDADD = $(LDADD)
93 pdftoppm_DEPENDENCIES = libparseargs.la \ 96 pdftoppm_DEPENDENCIES = libparseargs.la \
94- $(top_builddir)/poppler/libpoppler.la 97- $(top_builddir)/poppler/libpoppler.la
95+ $(prefix)/lib/libpoppler.la 98+ $(prefix)/lib/libpoppler.la
96 am_pdftops_OBJECTS = pdftops.$(OBJEXT) 99 am_pdftops_OBJECTS = pdftops.$(OBJEXT)
97 pdftops_OBJECTS = $(am_pdftops_OBJECTS) 100 pdftops_OBJECTS = $(am_pdftops_OBJECTS)
98 pdftops_LDADD = $(LDADD) 101 pdftops_LDADD = $(LDADD)
99 pdftops_DEPENDENCIES = libparseargs.la \ 102 pdftops_DEPENDENCIES = libparseargs.la \
100- $(top_builddir)/poppler/libpoppler.la 103- $(top_builddir)/poppler/libpoppler.la
101+ $(prefix)/lib/libpoppler.la 104+ $(prefix)/lib/libpoppler.la
102 am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) 105 am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT)
103 pdftotext_OBJECTS = $(am_pdftotext_OBJECTS) 106 pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
104 pdftotext_LDADD = $(LDADD) 107 pdftotext_LDADD = $(LDADD)
105 pdftotext_DEPENDENCIES = libparseargs.la \ 108 pdftotext_DEPENDENCIES = libparseargs.la \
106- $(top_builddir)/poppler/libpoppler.la 109- $(top_builddir)/poppler/libpoppler.la
107+ $(prefix)/lib/libpoppler.la 110+ $(prefix)/lib/libpoppler.la
108 am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) 111 am_pdfunite_OBJECTS = pdfunite.$(OBJEXT)
109 pdfunite_OBJECTS = $(am_pdfunite_OBJECTS) 112 pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
110 pdfunite_LDADD = $(LDADD) 113 pdfunite_LDADD = $(LDADD)
111 pdfunite_DEPENDENCIES = libparseargs.la \ 114 pdfunite_DEPENDENCIES = libparseargs.la \
112- $(top_builddir)/poppler/libpoppler.la 115- $(top_builddir)/poppler/libpoppler.la
113+ $(prefix)/lib/libpoppler.la 116+ $(prefix)/lib/libpoppler.la
114 AM_V_P = $(am__v_P_@AM_V@) 117 AM_V_P = $(am__v_P_@AM_V@)
115 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) 118 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
116 am__v_P_0 = false 119 am__v_P_0 = false
117@@ -550,8 +550,9 @@ AM_CPPFLAGS = \ 120@@ -553,8 +553,9 @@ AM_CPPFLAGS = \
118  121
119 LDADD = \ 122 LDADD = \
120 libparseargs.la \ 123 libparseargs.la \
121- $(top_builddir)/poppler/libpoppler.la \ 124- $(top_builddir)/poppler/libpoppler.la \
122- $(UTILS_LIBS) 125- $(UTILS_LIBS)
123+ $(prefix)/lib/libpoppler.la \ 126+ $(prefix)/lib/libpoppler.la \
124+ $(UTILS_LIBS) \ 127+ $(UTILS_LIBS) \
125+ $(PTHREAD_STUBLIB) 128+ $(PTHREAD_STUBLIB)
126  129
127 @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \ 130 @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
128 @BUILD_UTILS_TRUE@ pdfinfo.1 pdftops.1 pdftotext.1 pdftohtml.1 \ 131 @BUILD_UTILS_TRUE@ pdfinfo.1 pdftops.1 pdftotext.1 pdftohtml.1 \