Fri Apr 15 14:36:21 2016 UTC ()
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


(wiz)
diff -r1.77 -r1.78 pkgsrc/print/poppler/Makefile.common
diff -r1.105 -r1.106 pkgsrc/print/poppler/distinfo
diff -r1.12 -r1.13 pkgsrc/print/poppler-includes/PLIST
diff -r1.47 -r1.48 pkgsrc/print/poppler-qt4/Makefile
diff -r1.8 -r1.9 pkgsrc/print/poppler-qt5/Makefile
diff -r1.15 -r1.16 pkgsrc/print/poppler/patches/patch-aa
diff -r1.18 -r1.19 pkgsrc/print/poppler/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/print/poppler/patches/patch-qt5_src_Makefile.in
cvs diff -r1.77 -r1.78 pkgsrc/print/poppler/Makefile.common (expand / switch to unified diff)

--- pkgsrc/print/poppler/Makefile.common 2016/01/27 10:26:42 1.77
+++ pkgsrc/print/poppler/Makefile.common 2016/04/15 14:36:21 1.78
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile.common,v 1.77 2016/01/27 10:26:42 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.78 2016/04/15 14:36:21 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.40.0 11POPPLER_VERS= 0.42.0
12DISTNAME= poppler-${POPPLER_VERS} 12DISTNAME= poppler-${POPPLER_VERS}
13CATEGORIES= print 13CATEGORIES= print
14MASTER_SITES= http://poppler.freedesktop.org/ 14MASTER_SITES= http://poppler.freedesktop.org/
15EXTRACT_SUFX= .tar.xz 15EXTRACT_SUFX= .tar.xz
16 16
17HOMEPAGE= http://poppler.freedesktop.org/ 17HOMEPAGE= http://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.105 -r1.106 pkgsrc/print/poppler/distinfo (expand / switch to unified diff)

--- pkgsrc/print/poppler/distinfo 2016/01/27 10:26:42 1.105
+++ pkgsrc/print/poppler/distinfo 2016/04/15 14:36:21 1.106
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.105 2016/01/27 10:26:42 wiz Exp $ 1$NetBSD: distinfo,v 1.106 2016/04/15 14:36:21 wiz Exp $
2 2
3SHA1 (poppler-0.40.0.tar.xz) = 8c3be50ff6cd5174a7c37f4f038a7ef8386e9a5f 3SHA1 (poppler-0.42.0.tar.xz) = 4a445d2da6bcf9fd80517b4c881873977b6f49ba
4RMD160 (poppler-0.40.0.tar.xz) = ab3d8da12a4e57654664c4dd0d52d6a3d3cd4fcf 4RMD160 (poppler-0.42.0.tar.xz) = 503cfddcb1a2817b3e180ce70b1c8e480785be4d
5SHA512 (poppler-0.40.0.tar.xz) = 0f26f342a4f70ebc65848c61e5eb1a182d539a8e4cdc5fa499c52765d15867e13ee7c595773d2e8d6f2eb3e83e1c19f35cc6bb47f8aeb87a8ad92e45ecff50cd 5SHA512 (poppler-0.42.0.tar.xz) = ab8c86c28a2ac848bf118de7f20f57576ed4faa4ad06ae7d58590b951fb2b0ee8a728919ce2417592b467af7322c57ed0bff0288eced042fcf94a50d89c73c19
6Size (poppler-0.40.0.tar.xz) = 1642708 bytes 6Size (poppler-0.42.0.tar.xz) = 1674024 bytes
7SHA1 (patch-aa) = 15839af8b9ca17662d721428a96ff74f1bb7ba72 7SHA1 (patch-aa) = 03798571a0b546e2cabb3579e537459674022ed4
8SHA1 (patch-ab) = 55bcf94d51f5c9c5bf999f7b4fa63afebe77c83c 8SHA1 (patch-ab) = 79842143a6fb4b5a01571a1e5b661c7380e4a552
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) = 8288b41e87a4f14d6a1fd361564e1356f9673dd9 13SHA1 (patch-qt5_src_Makefile.in) = bd35aaa1ca82b12c26475066c13c9126ecbb5a88
cvs diff -r1.12 -r1.13 pkgsrc/print/poppler-includes/PLIST (expand / switch to unified diff)

--- pkgsrc/print/poppler-includes/PLIST 2014/06/07 10:56:09 1.12
+++ pkgsrc/print/poppler-includes/PLIST 2016/04/15 14:36:21 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.12 2014/06/07 10:56:09 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.13 2016/04/15 14:36:21 wiz Exp $
2include/poppler/Annot.h 2include/poppler/Annot.h
3include/poppler/Array.h 3include/poppler/Array.h
4include/poppler/BuiltinFont.h 4include/poppler/BuiltinFont.h
5include/poppler/BuiltinFontTables.h 5include/poppler/BuiltinFontTables.h
6include/poppler/CMap.h 6include/poppler/CMap.h
7include/poppler/CachedFile.h 7include/poppler/CachedFile.h
8include/poppler/Catalog.h 8include/poppler/Catalog.h
9include/poppler/CharCodeToUnicode.h 9include/poppler/CharCodeToUnicode.h
10include/poppler/CharTypes.h 10include/poppler/CharTypes.h
11include/poppler/CompactFontTables.h 11include/poppler/CompactFontTables.h
12include/poppler/DateInfo.h 12include/poppler/DateInfo.h
13include/poppler/Decrypt.h 13include/poppler/Decrypt.h
14include/poppler/Dict.h 14include/poppler/Dict.h
@@ -43,26 +43,27 @@ include/poppler/PDFDoc.h @@ -43,26 +43,27 @@ include/poppler/PDFDoc.h
43include/poppler/PDFDocBuilder.h 43include/poppler/PDFDocBuilder.h
44include/poppler/PDFDocEncoding.h 44include/poppler/PDFDocEncoding.h
45include/poppler/PDFDocFactory.h 45include/poppler/PDFDocFactory.h
46include/poppler/PSOutputDev.h 46include/poppler/PSOutputDev.h
47include/poppler/PSTokenizer.h 47include/poppler/PSTokenizer.h
48include/poppler/Page.h 48include/poppler/Page.h
49include/poppler/PageTransition.h 49include/poppler/PageTransition.h
50include/poppler/Parser.h 50include/poppler/Parser.h
51include/poppler/PopplerCache.h 51include/poppler/PopplerCache.h
52include/poppler/PreScanOutputDev.h 52include/poppler/PreScanOutputDev.h
53include/poppler/ProfileData.h 53include/poppler/ProfileData.h
54include/poppler/Rendition.h 54include/poppler/Rendition.h
55include/poppler/SecurityHandler.h 55include/poppler/SecurityHandler.h
 56include/poppler/SignatureInfo.h
56include/poppler/Sound.h 57include/poppler/Sound.h
57include/poppler/SplashOutputDev.h 58include/poppler/SplashOutputDev.h
58include/poppler/StdinCachedFile.h 59include/poppler/StdinCachedFile.h
59include/poppler/StdinPDFDocBuilder.h 60include/poppler/StdinPDFDocBuilder.h
60include/poppler/Stream-CCITT.h 61include/poppler/Stream-CCITT.h
61include/poppler/Stream.h 62include/poppler/Stream.h
62include/poppler/StructElement.h 63include/poppler/StructElement.h
63include/poppler/StructTreeRoot.h 64include/poppler/StructTreeRoot.h
64include/poppler/TextOutputDev.h 65include/poppler/TextOutputDev.h
65include/poppler/UTF.h 66include/poppler/UTF.h
66include/poppler/UTF8.h 67include/poppler/UTF8.h
67include/poppler/UnicodeCClassTables.h 68include/poppler/UnicodeCClassTables.h
68include/poppler/UnicodeCompTables.h 69include/poppler/UnicodeCompTables.h
cvs diff -r1.47 -r1.48 pkgsrc/print/poppler-qt4/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler-qt4/Attic/Makefile 2016/03/05 11:29:17 1.47
+++ pkgsrc/print/poppler-qt4/Attic/Makefile 2016/04/15 14:36:21 1.48
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.47 2016/03/05 11:29:17 jperkin Exp $ 1# $NetBSD: Makefile,v 1.48 2016/04/15 14:36:21 wiz Exp $
2 2
3PKGREVISION= 1 
4.include "../../print/poppler/Makefile.common" 3.include "../../print/poppler/Makefile.common"
5 4
6PKGNAME= poppler-qt4-${POPPLER_VERS} 5PKGNAME= poppler-qt4-${POPPLER_VERS}
7COMMENT= PDF rendering library (QT4 wrapper) 6COMMENT= PDF rendering library (QT4 wrapper)
8MAINTAINER= reed@reedmedia.net 7MAINTAINER= reed@reedmedia.net
9 8
10GNU_CONFIGURE= yes 9GNU_CONFIGURE= yes
11CONFIGURE_ARGS+= --disable-cairo-output 10CONFIGURE_ARGS+= --disable-cairo-output
12CONFIGURE_ARGS+= --enable-poppler-qt4 11CONFIGURE_ARGS+= --enable-poppler-qt4
13CONFIGURE_ARGS+= --disable-gtk-test 12CONFIGURE_ARGS+= --disable-gtk-test
14CONFIGURE_ARGS+= --disable-utils 13CONFIGURE_ARGS+= --disable-utils
15CONFIGURE_ENV+= MOCQT4=${QTDIR}/bin/moc 14CONFIGURE_ENV+= MOCQT4=${QTDIR}/bin/moc
16 15
cvs diff -r1.8 -r1.9 pkgsrc/print/poppler-qt5/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler-qt5/Makefile 2016/04/11 19:02:02 1.8
+++ pkgsrc/print/poppler-qt5/Makefile 2016/04/15 14:36:21 1.9
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.8 2016/04/11 19:02:02 ryoon Exp $ 1# $NetBSD: Makefile,v 1.9 2016/04/15 14:36:21 wiz Exp $
2 2
3PKGREVISION= 2 
4.include "../../print/poppler/Makefile.common" 3.include "../../print/poppler/Makefile.common"
5 4
6PKGNAME= poppler-qt5-${POPPLER_VERS} 5PKGNAME= poppler-qt5-${POPPLER_VERS}
7COMMENT= PDF rendering library (QT5 wrapper) 6COMMENT= PDF rendering library (QT5 wrapper)
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9 8
10GNU_CONFIGURE= yes 9GNU_CONFIGURE= yes
11CONFIGURE_ARGS+= --disable-cairo-output 10CONFIGURE_ARGS+= --disable-cairo-output
12CONFIGURE_ARGS+= --enable-poppler-qt5 11CONFIGURE_ARGS+= --enable-poppler-qt5
13CONFIGURE_ARGS+= --disable-poppler-qt4 12CONFIGURE_ARGS+= --disable-poppler-qt4
14CONFIGURE_ARGS+= --disable-gtk-test 13CONFIGURE_ARGS+= --disable-gtk-test
15CONFIGURE_ARGS+= --disable-utils 14CONFIGURE_ARGS+= --disable-utils
16CONFIGURE_ENV+= MOCQT5=${QTDIR}/bin/moc 15CONFIGURE_ENV+= MOCQT5=${QTDIR}/bin/moc
cvs diff -r1.15 -r1.16 pkgsrc/print/poppler/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/print/poppler/patches/Attic/patch-aa 2015/10/01 05:36:36 1.15
+++ pkgsrc/print/poppler/patches/Attic/patch-aa 2016/04/15 14:36:21 1.16
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-aa,v 1.15 2015/10/01 05:36:36 wiz Exp $ 1$NetBSD: patch-aa,v 1.16 2016/04/15 14:36:21 wiz Exp $
2 2
3Use installed copy of poppler library so we can have a separate 3Use installed copy of poppler library so we can have a separate
4poppler-glib package. 4poppler-glib package.
5 5
6--- glib/Makefile.in.orig 2015-09-09 22:06:58.000000000 +0000 6--- glib/Makefile.in.orig 2016-03-16 22:22:12.000000000 +0000
7+++ glib/Makefile.in 7+++ glib/Makefile.in
8@@ -134,7 +134,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"  8@@ -143,7 +143,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
9 LTLIBRARIES = $(lib_LTLIBRARIES) 9 LTLIBRARIES = $(lib_LTLIBRARIES)
10 am__DEPENDENCIES_1 = 10 am__DEPENDENCIES_1 =
11 libpoppler_glib_la_DEPENDENCIES = \ 11 libpoppler_glib_la_DEPENDENCIES = \
12- $(top_builddir)/poppler/libpoppler.la \ 12- $(top_builddir)/poppler/libpoppler.la \
13+ $(prefix)/lib/libpoppler.la \ 13+ $(prefix)/lib/libpoppler.la \
14 $(top_builddir)/poppler/libpoppler-cairo.la \ 14 $(top_builddir)/poppler/libpoppler-cairo.la \
15 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ 15 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
16 $(am__DEPENDENCIES_1) 16 $(am__DEPENDENCIES_1)
17@@ -554,7 +554,7 @@ libpoppler_glib_la_CPPFLAGS = \ 17@@ -569,7 +569,7 @@ libpoppler_glib_la_CPPFLAGS = \
18 $(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES) 18 $(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
19  19
20 libpoppler_glib_la_LIBADD = \ 20 libpoppler_glib_la_LIBADD = \
21- $(top_builddir)/poppler/libpoppler.la \ 21- $(top_builddir)/poppler/libpoppler.la \
22+ $(prefix)/lib/libpoppler.la \ 22+ $(prefix)/lib/libpoppler.la \
23 $(top_builddir)/poppler/libpoppler-cairo.la \ 23 $(top_builddir)/poppler/libpoppler-cairo.la \
24 $(PTHREAD_LIBS) \ 24 $(PTHREAD_LIBS) \
25 $(POPPLER_GLIB_LIBS) \ 25 $(POPPLER_GLIB_LIBS) \
cvs diff -r1.18 -r1.19 pkgsrc/print/poppler/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/poppler/patches/Attic/patch-ab 2014/11/20 16:03:46 1.18
+++ pkgsrc/print/poppler/patches/Attic/patch-ab 2016/04/15 14:36:21 1.19
@@ -1,46 +1,46 @@ @@ -1,46 +1,46 @@
1$NetBSD: patch-ab,v 1.18 2014/11/20 16:03:46 wiz Exp $ 1$NetBSD: patch-ab,v 1.19 2016/04/15 14:36:21 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 2014-11-04 18:46:22.000000000 +0000 8--- utils/Makefile.in.orig 2016-03-16 22:22:14.000000000 +0000
9+++ utils/Makefile.in 9+++ utils/Makefile.in
10@@ -85,9 +85,9 @@ host_triplet = @host@ 10@@ -96,9 +96,9 @@ host_triplet = @host@
11 @BUILD_UTILS_TRUE@ pdftohtml$(EXEEXT) pdfseparate$(EXEEXT) \ 
12 @BUILD_UTILS_TRUE@ pdfunite$(EXEEXT) $(am__EXEEXT_1) \ 11 @BUILD_UTILS_TRUE@ pdfunite$(EXEEXT) $(am__EXEEXT_1) \
13 @BUILD_UTILS_TRUE@ $(am__EXEEXT_2) 12 @BUILD_UTILS_TRUE@ $(am__EXEEXT_2) $(am__EXEEXT_3)
14-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_1 = pdftoppm 13 @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__append_1 = pdfsig
15+am__append_1 = pdftoppm 14-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_2 = pdftoppm
16 @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_2 = pdftocairo 15+am__append_2 = pdftoppm
17-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_3 = pdftoppm.1 16 @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_3 = pdftocairo
18+am__append_3 = pdftoppm.1 17-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_4 = pdftoppm.1
19 @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_4 = pdftocairo.1 18+am__append_4 = pdftoppm.1
20 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_5 = $(LCMS_CFLAGS) 19 @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_5 = pdftocairo.1
21 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_6 = $(LCMS_LIBS) 20 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_6 = $(LCMS_CFLAGS)
22@@ -117,8 +117,8 @@ AM_V_lt = $(am__v_lt_@AM_V@) 21 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_7 = $(LCMS_LIBS)
23 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) 22@@ -128,8 +128,8 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
24 am__v_lt_0 = --silent 23 am__v_lt_0 = --silent
25 am__v_lt_1 =  24 am__v_lt_1 =
26-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_1 = \ 25 @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_1 = pdfsig$(EXEEXT)
 26-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_2 = \
27-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@ pdftoppm$(EXEEXT) 27-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@ pdftoppm$(EXEEXT)
28+am__EXEEXT_1 = \ 28+am__EXEEXT_2 = \
29+ pdftoppm$(EXEEXT) 29+ pdftoppm$(EXEEXT)
30 @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_2 = pdftocairo$(EXEEXT) 30 @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_3 = pdftocairo$(EXEEXT)
31 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" 31 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
32 PROGRAMS = $(bin_PROGRAMS) 32 PROGRAMS = $(bin_PROGRAMS)
33@@ -126,39 +126,39 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX 33@@ -137,44 +137,44 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX
34 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS) 34 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
35 pdfdetach_LDADD = $(LDADD) 35 pdfdetach_LDADD = $(LDADD)
36 pdfdetach_DEPENDENCIES = libparseargs.la \ 36 pdfdetach_DEPENDENCIES = libparseargs.la \
37- $(top_builddir)/poppler/libpoppler.la 37- $(top_builddir)/poppler/libpoppler.la
38+ $(prefix)/lib/libpoppler.la 38+ $(prefix)/lib/libpoppler.la
39 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) 39 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
40 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) 40 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
41 pdffonts_LDADD = $(LDADD) 41 pdffonts_LDADD = $(LDADD)
42 pdffonts_DEPENDENCIES = libparseargs.la \ 42 pdffonts_DEPENDENCIES = libparseargs.la \
43- $(top_builddir)/poppler/libpoppler.la 43- $(top_builddir)/poppler/libpoppler.la
44+ $(prefix)/lib/libpoppler.la 44+ $(prefix)/lib/libpoppler.la
45 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ 45 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
46 JSInfo.$(OBJEXT) 46 JSInfo.$(OBJEXT)
@@ -52,85 +52,91 @@ Always build pdftoppm. @@ -52,85 +52,91 @@ Always build pdftoppm.
52 am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \ 52 am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
53 JSInfo.$(OBJEXT) 53 JSInfo.$(OBJEXT)
54 pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS) 54 pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
55 pdfinfo_LDADD = $(LDADD) 55 pdfinfo_LDADD = $(LDADD)
56 pdfinfo_DEPENDENCIES = libparseargs.la \ 56 pdfinfo_DEPENDENCIES = libparseargs.la \
57- $(top_builddir)/poppler/libpoppler.la 57- $(top_builddir)/poppler/libpoppler.la
58+ $(prefix)/lib/libpoppler.la 58+ $(prefix)/lib/libpoppler.la
59 am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) 59 am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT)
60 pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS) 60 pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
61 pdfseparate_LDADD = $(LDADD) 61 pdfseparate_LDADD = $(LDADD)
62 pdfseparate_DEPENDENCIES = libparseargs.la \ 62 pdfseparate_DEPENDENCIES = libparseargs.la \
63- $(top_builddir)/poppler/libpoppler.la 63- $(top_builddir)/poppler/libpoppler.la
64+ $(prefix)/lib/libpoppler.la 64+ $(prefix)/lib/libpoppler.la
 65 am_pdfsig_OBJECTS = pdfsig.$(OBJEXT)
 66 pdfsig_OBJECTS = $(am_pdfsig_OBJECTS)
 67 pdfsig_LDADD = $(LDADD)
 68 pdfsig_DEPENDENCIES = libparseargs.la \
 69- $(top_builddir)/poppler/libpoppler.la
 70+ $(prefix)/lib/libpoppler.la
65 am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \ 71 am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \
66 pdftocairo-pdftocairo-win32.$(OBJEXT) 72 pdftocairo-pdftocairo-win32.$(OBJEXT)
67 pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS) 73 pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
68 am__DEPENDENCIES_1 = libparseargs.la \ 74 am__DEPENDENCIES_1 = libparseargs.la \
69- $(top_builddir)/poppler/libpoppler.la 75- $(top_builddir)/poppler/libpoppler.la
70+ $(prefix)/lib/libpoppler.la 76+ $(prefix)/lib/libpoppler.la
71 am__DEPENDENCIES_2 = 77 am__DEPENDENCIES_2 =
72 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \ 78 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \
73 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2) 79 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2)
74 am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) 80 am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
75-pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \ 81-pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
76+pdftocairo_DEPENDENCIES = $(prefix)/lib/libpoppler-cairo.la \ 82+pdftocairo_DEPENDENCIES = $(prefix)/lib/libpoppler-cairo.la \
77 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \ 83 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
78 $(am__DEPENDENCIES_2) 84 $(am__DEPENDENCIES_2)
79 am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \ 85 am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \
80@@ -167,7 +167,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht 86@@ -183,7 +183,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
81 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) 87 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
82 pdftohtml_LDADD = $(LDADD) 88 pdftohtml_LDADD = $(LDADD)
83 pdftohtml_DEPENDENCIES = libparseargs.la \ 89 pdftohtml_DEPENDENCIES = libparseargs.la \
84- $(top_builddir)/poppler/libpoppler.la 90- $(top_builddir)/poppler/libpoppler.la
85+ $(prefix)/lib/libpoppler.la 91+ $(prefix)/lib/libpoppler.la
86 pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ 92 pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
87 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \ 93 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
88 $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ 94 $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
89@@ -175,22 +175,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) 95@@ -191,22 +191,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
90 pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS) 96 pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
91 pdftoppm_LDADD = $(LDADD) 97 pdftoppm_LDADD = $(LDADD)
92 pdftoppm_DEPENDENCIES = libparseargs.la \ 98 pdftoppm_DEPENDENCIES = libparseargs.la \
93- $(top_builddir)/poppler/libpoppler.la 99- $(top_builddir)/poppler/libpoppler.la
94+ $(prefix)/lib/libpoppler.la 100+ $(prefix)/lib/libpoppler.la
95 am_pdftops_OBJECTS = pdftops.$(OBJEXT) 101 am_pdftops_OBJECTS = pdftops.$(OBJEXT)
96 pdftops_OBJECTS = $(am_pdftops_OBJECTS) 102 pdftops_OBJECTS = $(am_pdftops_OBJECTS)
97 pdftops_LDADD = $(LDADD) 103 pdftops_LDADD = $(LDADD)
98 pdftops_DEPENDENCIES = libparseargs.la \ 104 pdftops_DEPENDENCIES = libparseargs.la \
99- $(top_builddir)/poppler/libpoppler.la 105- $(top_builddir)/poppler/libpoppler.la
100+ $(prefix)/lib/libpoppler.la 106+ $(prefix)/lib/libpoppler.la
101 am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) 107 am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT)
102 pdftotext_OBJECTS = $(am_pdftotext_OBJECTS) 108 pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
103 pdftotext_LDADD = $(LDADD) 109 pdftotext_LDADD = $(LDADD)
104 pdftotext_DEPENDENCIES = libparseargs.la \ 110 pdftotext_DEPENDENCIES = libparseargs.la \
105- $(top_builddir)/poppler/libpoppler.la 111- $(top_builddir)/poppler/libpoppler.la
106+ $(prefix)/lib/libpoppler.la 112+ $(prefix)/lib/libpoppler.la
107 am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) 113 am_pdfunite_OBJECTS = pdfunite.$(OBJEXT)
108 pdfunite_OBJECTS = $(am_pdfunite_OBJECTS) 114 pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
109 pdfunite_LDADD = $(LDADD) 115 pdfunite_LDADD = $(LDADD)
110 pdfunite_DEPENDENCIES = libparseargs.la \ 116 pdfunite_DEPENDENCIES = libparseargs.la \
111- $(top_builddir)/poppler/libpoppler.la 117- $(top_builddir)/poppler/libpoppler.la
112+ $(prefix)/lib/libpoppler.la 118+ $(prefix)/lib/libpoppler.la
113 AM_V_P = $(am__v_P_@AM_V@) 119 AM_V_P = $(am__v_P_@AM_V@)
114 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) 120 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
115 am__v_P_0 = false 121 am__v_P_0 = false
116@@ -527,8 +527,9 @@ AM_CPPFLAGS = \ 122@@ -549,8 +549,9 @@ AM_CPPFLAGS = \
117  123
118 LDADD = \ 124 LDADD = \
119 libparseargs.la \ 125 libparseargs.la \
120- $(top_builddir)/poppler/libpoppler.la \ 126- $(top_builddir)/poppler/libpoppler.la \
121- $(UTILS_LIBS) 127- $(UTILS_LIBS)
122+ $(prefix)/lib/libpoppler.la \ 128+ $(prefix)/lib/libpoppler.la \
123+ $(UTILS_LIBS) \ 129+ $(UTILS_LIBS) \
124+ $(PTHREAD_STUBLIB) 130+ $(PTHREAD_STUBLIB)
125  131
126 @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \ 132 @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
127 @BUILD_UTILS_TRUE@ pdfinfo.1 pdftops.1 pdftotext.1 pdftohtml.1 \ 133 @BUILD_UTILS_TRUE@ pdfinfo.1 pdftops.1 pdftotext.1 pdftohtml.1 \
128@@ -590,7 +591,7 @@ pdftocairo_SOURCES = \ 134@@ -615,7 +616,7 @@ pdftocairo_SOURCES = \
129 pdftocairo-win32.h 135 pdftocairo-win32.h
130  136
131 pdftocairo_LDADD = \ 137 pdftocairo_LDADD = \
132- $(top_builddir)/poppler/libpoppler-cairo.la \ 138- $(top_builddir)/poppler/libpoppler-cairo.la \
133+ $(prefix)/lib/libpoppler-cairo.la \ 139+ $(prefix)/lib/libpoppler-cairo.la \
134 $(LDADD) \ 140 $(LDADD) \
135 $(PDFTOCAIRO_LIBS) \ 141 $(PDFTOCAIRO_LIBS) \
136 $(PTHREAD_LIBS) 142 $(PTHREAD_LIBS)
cvs diff -r1.3 -r1.4 pkgsrc/print/poppler/patches/Attic/patch-qt5_src_Makefile.in (expand / switch to unified diff)

--- pkgsrc/print/poppler/patches/Attic/patch-qt5_src_Makefile.in 2015/10/01 05:36:36 1.3
+++ pkgsrc/print/poppler/patches/Attic/patch-qt5_src_Makefile.in 2016/04/15 14:36:21 1.4
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-qt5_src_Makefile.in,v 1.3 2015/10/01 05:36:36 wiz Exp $ 1$NetBSD: patch-qt5_src_Makefile.in,v 1.4 2016/04/15 14:36:21 wiz Exp $
2 2
3Use installed copy of poppler library so we can have a separate 3Use installed copy of poppler library so we can have a separate
4poppler-qt5 package. 4poppler-qt5 package.
5 5
6--- qt5/src/Makefile.in.orig 2015-09-09 22:07:00.000000000 +0000 6--- qt5/src/Makefile.in.orig 2016-03-16 22:22:13.000000000 +0000
7+++ qt5/src/Makefile.in 7+++ qt5/src/Makefile.in
8@@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"  8@@ -139,7 +139,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
9 LTLIBRARIES = $(lib_LTLIBRARIES) 9 LTLIBRARIES = $(lib_LTLIBRARIES)
10 am__DEPENDENCIES_1 = 10 am__DEPENDENCIES_1 =
11 libpoppler_qt5_la_DEPENDENCIES = \ 11 libpoppler_qt5_la_DEPENDENCIES = \
12- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) 12- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
13+ $(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) 13+ $(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1)
14 am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \ 14 am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \
15 libpoppler_qt5_la-poppler-page.lo \ 15 libpoppler_qt5_la-poppler-page.lo \
16 libpoppler_qt5_la-poppler-fontinfo.lo \ 16 libpoppler_qt5_la-poppler-fontinfo.lo \
17@@ -505,7 +505,7 @@ libpoppler_qt5_la_CXXFLAGS = \ 17@@ -520,7 +520,7 @@ libpoppler_qt5_la_CXXFLAGS = \
18 -Dpoppler_qt5_EXPORTS 18 -Dpoppler_qt5_EXPORTS
19  19
20 libpoppler_qt5_la_LIBADD = \ 20 libpoppler_qt5_la_LIBADD = \
21- $(top_builddir)/poppler/libpoppler.la \ 21- $(top_builddir)/poppler/libpoppler.la \
22+ $(prefix)/lib/libpoppler.la \ 22+ $(prefix)/lib/libpoppler.la \
23 $(POPPLER_QT5_LIBS) 23 $(POPPLER_QT5_LIBS)
24  24
25 libpoppler_qt5_la_LDFLAGS = \ 25 libpoppler_qt5_la_LDFLAGS = \