Sun May 22 18:17:17 2016 UTC ()
Update poppler to 0.44.0:

Release 0.44.0
        core:
         * Fix Compile in 32bit linux. Bug #95492
         * Splash: type 3 chars. restore the current position also in output device. Bug #95344
         * Splash: Improve rendering of some dotted lines. Bug #84693
         * Refactor GooString::Set(). Bug #94201
         * Fix typo in GfxPatchMeshShading::parse
         * Fix memory leak in PSOutputDev::filterPSLabel
         * Fix memory leak in SignatureHandler::getDefaultFirefoxCertDB_Linux
         * Fix potential crash in SplashOutputDev::doUpdateFont
         * Fix potential crash in TextPage::coalesce
         * Remove call that does nothing

        utils:
         * pdftocairo: add -antialias option. Bug #94977

Release 0.43.0
        core:
         * Implement sanity check for linearization usage. Bug #92482
         * Add SymbolMT as an alias for the Symbol font. Bug #93168
         * Fix some blank files. Bug #94756
         * cairo: fix fillToStrokePathClip crash and rendering. Bug #62905
         * cairo: Check if PDF knows the width of 'm' in case of substituted font. Bug #94054
         * cairo: save mask state and don't extend image mask. bug #94234
         * SplashOuputDev: Compile with C++11 compilers that don't define isinfinite. Bug #94761
         * typo fixes

        utils:
         * pdftocairo: Calculate rotation before scaling. Bug #94655

        qt4:
         * Fix crash on certain PDF form item activation actions. Bug #94873

        qt5:
         * Fix crash on certain PDF form item activation actions. Bug #94873


(wiz)
diff -r1.78 -r1.79 pkgsrc/print/poppler/Makefile.common
diff -r1.107 -r1.108 pkgsrc/print/poppler/distinfo
diff -r1.19 -r1.20 pkgsrc/print/poppler-glib/PLIST
diff -r1.16 -r1.17 pkgsrc/print/poppler/patches/patch-aa
diff -r1.19 -r1.20 pkgsrc/print/poppler/patches/patch-ab
diff -r1.4 -r1.5 pkgsrc/print/poppler/patches/patch-qt5_src_Makefile.in
cvs diff -r1.78 -r1.79 pkgsrc/print/poppler/Makefile.common (expand / switch to unified diff)

--- pkgsrc/print/poppler/Makefile.common 2016/04/15 14:36:21 1.78
+++ pkgsrc/print/poppler/Makefile.common 2016/05/22 18:17:17 1.79
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile.common,v 1.78 2016/04/15 14:36:21 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.79 2016/05/22 18:17:17 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.42.0 11POPPLER_VERS= 0.44.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.107 -r1.108 pkgsrc/print/poppler/distinfo (expand / switch to unified diff)

--- pkgsrc/print/poppler/distinfo 2016/05/10 13:13:56 1.107
+++ pkgsrc/print/poppler/distinfo 2016/05/22 18:17:17 1.108
@@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
1$NetBSD: distinfo,v 1.107 2016/05/10 13:13:56 jperkin Exp $ 1$NetBSD: distinfo,v 1.108 2016/05/22 18:17:17 wiz Exp $
2 2
3SHA1 (poppler-0.42.0.tar.xz) = 4a445d2da6bcf9fd80517b4c881873977b6f49ba 3SHA1 (poppler-0.44.0.tar.xz) = e299affb9180e920c977fd60a217a6c21bde23c2
4RMD160 (poppler-0.42.0.tar.xz) = 503cfddcb1a2817b3e180ce70b1c8e480785be4d 4RMD160 (poppler-0.44.0.tar.xz) = 9037dd395f7e789bae96dfb3b1a5acf8cb9c0814
5SHA512 (poppler-0.42.0.tar.xz) = ab8c86c28a2ac848bf118de7f20f57576ed4faa4ad06ae7d58590b951fb2b0ee8a728919ce2417592b467af7322c57ed0bff0288eced042fcf94a50d89c73c19 5SHA512 (poppler-0.44.0.tar.xz) = 356bb8d5ba333dd86f2350dab3d18e7beddabc54f0449514248e7928e56bbcd8a5941bf817a12fc780810927425567fddbfacf723894414ae21814189b54c1f8
6Size (poppler-0.42.0.tar.xz) = 1674024 bytes 6Size (poppler-0.44.0.tar.xz) = 1671900 bytes
7SHA1 (patch-aa) = 03798571a0b546e2cabb3579e537459674022ed4 7SHA1 (patch-aa) = f97ea3f4d381c189fc81552d91a50cd62bd0c1a1
8SHA1 (patch-ab) = 79842143a6fb4b5a01571a1e5b661c7380e4a552 8SHA1 (patch-ab) = 791c4ffd9488d5c261398cabe323d6c112b3744e
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-poppler_Decrypt.cc) = fd00865e1ca64db949d6133d68f738f202307bae 13SHA1 (patch-qt5_src_Makefile.in) = c3a47fde201d61a7b7674020f5c998173a61b216
14SHA1 (patch-qt5_src_Makefile.in) = bd35aaa1ca82b12c26475066c13c9126ecbb5a88 
cvs diff -r1.19 -r1.20 pkgsrc/print/poppler-glib/PLIST (expand / switch to unified diff)

--- pkgsrc/print/poppler-glib/PLIST 2016/01/27 10:26:42 1.19
+++ pkgsrc/print/poppler-glib/PLIST 2016/05/22 18:17:17 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.19 2016/01/27 10:26:42 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.20 2016/05/22 18:17:17 wiz Exp $
2include/poppler/glib/poppler-action.h 2include/poppler/glib/poppler-action.h
3include/poppler/glib/poppler-annot.h 3include/poppler/glib/poppler-annot.h
4include/poppler/glib/poppler-attachment.h 4include/poppler/glib/poppler-attachment.h
5include/poppler/glib/poppler-date.h 5include/poppler/glib/poppler-date.h
6include/poppler/glib/poppler-document.h 6include/poppler/glib/poppler-document.h
7include/poppler/glib/poppler-enums.h 7include/poppler/glib/poppler-enums.h
8include/poppler/glib/poppler-features.h 8include/poppler/glib/poppler-features.h
9include/poppler/glib/poppler-form-field.h 9include/poppler/glib/poppler-form-field.h
10include/poppler/glib/poppler-layer.h 10include/poppler/glib/poppler-layer.h
11include/poppler/glib/poppler-media.h 11include/poppler/glib/poppler-media.h
12include/poppler/glib/poppler-movie.h 12include/poppler/glib/poppler-movie.h
13include/poppler/glib/poppler-page.h 13include/poppler/glib/poppler-page.h
14include/poppler/glib/poppler-structure-element.h 14include/poppler/glib/poppler-structure-element.h
@@ -29,27 +29,26 @@ share/gtk-doc/html/poppler/annotation-gl @@ -29,27 +29,26 @@ share/gtk-doc/html/poppler/annotation-gl
29share/gtk-doc/html/poppler/api-index-0-12.html 29share/gtk-doc/html/poppler/api-index-0-12.html
30share/gtk-doc/html/poppler/api-index-0-14.html 30share/gtk-doc/html/poppler/api-index-0-14.html
31share/gtk-doc/html/poppler/api-index-0-16.html 31share/gtk-doc/html/poppler/api-index-0-16.html
32share/gtk-doc/html/poppler/api-index-0-18.html 32share/gtk-doc/html/poppler/api-index-0-18.html
33share/gtk-doc/html/poppler/api-index-0-20.html 33share/gtk-doc/html/poppler/api-index-0-20.html
34share/gtk-doc/html/poppler/api-index-0-22.html 34share/gtk-doc/html/poppler/api-index-0-22.html
35share/gtk-doc/html/poppler/api-index-0-26.html 35share/gtk-doc/html/poppler/api-index-0-26.html
36share/gtk-doc/html/poppler/api-index-0-33.html 36share/gtk-doc/html/poppler/api-index-0-33.html
37share/gtk-doc/html/poppler/api-index-deprecated.html 37share/gtk-doc/html/poppler/api-index-deprecated.html
38share/gtk-doc/html/poppler/api-index-full.html 38share/gtk-doc/html/poppler/api-index-full.html
39share/gtk-doc/html/poppler/ch01.html 39share/gtk-doc/html/poppler/ch01.html
40share/gtk-doc/html/poppler/home.png 40share/gtk-doc/html/poppler/home.png
41share/gtk-doc/html/poppler/index.html 41share/gtk-doc/html/poppler/index.html
42share/gtk-doc/html/poppler/index.sgml 
43share/gtk-doc/html/poppler/left-insensitive.png 42share/gtk-doc/html/poppler/left-insensitive.png
44share/gtk-doc/html/poppler/left.png 43share/gtk-doc/html/poppler/left.png
45share/gtk-doc/html/poppler/poppler-Error-handling.html 44share/gtk-doc/html/poppler/poppler-Error-handling.html
46share/gtk-doc/html/poppler/poppler-PDF-Utility-functions.html 45share/gtk-doc/html/poppler/poppler-PDF-Utility-functions.html
47share/gtk-doc/html/poppler/poppler-PopplerAction.html 46share/gtk-doc/html/poppler/poppler-PopplerAction.html
48share/gtk-doc/html/poppler/poppler-PopplerColor.html 47share/gtk-doc/html/poppler/poppler-PopplerColor.html
49share/gtk-doc/html/poppler/poppler-Version-and-Features-Information.html 48share/gtk-doc/html/poppler/poppler-Version-and-Features-Information.html
50share/gtk-doc/html/poppler/poppler.devhelp2 49share/gtk-doc/html/poppler/poppler.devhelp2
51share/gtk-doc/html/poppler/right-insensitive.png 50share/gtk-doc/html/poppler/right-insensitive.png
52share/gtk-doc/html/poppler/right.png 51share/gtk-doc/html/poppler/right.png
53share/gtk-doc/html/poppler/style.css 52share/gtk-doc/html/poppler/style.css
54share/gtk-doc/html/poppler/up-insensitive.png 53share/gtk-doc/html/poppler/up-insensitive.png
55share/gtk-doc/html/poppler/up.png 54share/gtk-doc/html/poppler/up.png
cvs diff -r1.16 -r1.17 pkgsrc/print/poppler/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/print/poppler/patches/Attic/patch-aa 2016/04/15 14:36:21 1.16
+++ pkgsrc/print/poppler/patches/Attic/patch-aa 2016/05/22 18:17:17 1.17
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-aa,v 1.16 2016/04/15 14:36:21 wiz Exp $ 1$NetBSD: patch-aa,v 1.17 2016/05/22 18:17:17 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 2016-03-16 22:22:12.000000000 +0000 6--- glib/Makefile.in.orig 2016-05-21 16:59:38.000000000 +0000
7+++ glib/Makefile.in 7+++ glib/Makefile.in
8@@ -143,7 +143,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@@ -569,7 +569,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
cvs diff -r1.19 -r1.20 pkgsrc/print/poppler/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/poppler/patches/Attic/patch-ab 2016/04/15 14:36:21 1.19
+++ pkgsrc/print/poppler/patches/Attic/patch-ab 2016/05/22 18:17:17 1.20
@@ -1,46 +1,47 @@ @@ -1,46 +1,47 @@
1$NetBSD: patch-ab,v 1.19 2016/04/15 14:36:21 wiz Exp $ 1$NetBSD: patch-ab,v 1.20 2016/05/22 18:17:17 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 2016-03-16 22:22:14.000000000 +0000 8--- utils/Makefile.in.orig 2016-05-21 16:59:39.000000000 +0000
9+++ utils/Makefile.in 9+++ utils/Makefile.in
10@@ -96,9 +96,9 @@ 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_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_4 = pdftoppm.1 17 @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__append_4 = pdfsig.1
18+am__append_4 = pdftoppm.1 18-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_5 = pdftoppm.1
19 @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_5 = pdftocairo.1 19+am__append_5 = pdftoppm.1
20 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_6 = $(LCMS_CFLAGS) 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_LIBS) 21 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_7 = $(LCMS_CFLAGS)
22@@ -128,8 +128,8 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) 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 am__v_lt_0 = --silent 24 am__v_lt_0 = --silent
24 am__v_lt_1 =  25 am__v_lt_1 =
25 @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_1 = pdfsig$(EXEEXT) 26 @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@am__EXEEXT_2 = \
27-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@ pdftoppm$(EXEEXT) 28-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@ pdftoppm$(EXEEXT)
28+am__EXEEXT_2 = \ 29+am__EXEEXT_2 = \
29+ pdftoppm$(EXEEXT) 30+ pdftoppm$(EXEEXT)
30 @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)
31 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" 32 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
32 PROGRAMS = $(bin_PROGRAMS) 33 PROGRAMS = $(bin_PROGRAMS)
33@@ -137,44 +137,44 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX 34@@ -138,44 +138,44 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX
34 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS) 35 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
35 pdfdetach_LDADD = $(LDADD) 36 pdfdetach_LDADD = $(LDADD)
36 pdfdetach_DEPENDENCIES = libparseargs.la \ 37 pdfdetach_DEPENDENCIES = libparseargs.la \
37- $(top_builddir)/poppler/libpoppler.la 38- $(top_builddir)/poppler/libpoppler.la
38+ $(prefix)/lib/libpoppler.la 39+ $(prefix)/lib/libpoppler.la
39 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) 40 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
40 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) 41 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
41 pdffonts_LDADD = $(LDADD) 42 pdffonts_LDADD = $(LDADD)
42 pdffonts_DEPENDENCIES = libparseargs.la \ 43 pdffonts_DEPENDENCIES = libparseargs.la \
43- $(top_builddir)/poppler/libpoppler.la 44- $(top_builddir)/poppler/libpoppler.la
44+ $(prefix)/lib/libpoppler.la 45+ $(prefix)/lib/libpoppler.la
45 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ 46 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
46 JSInfo.$(OBJEXT) 47 JSInfo.$(OBJEXT)
@@ -73,70 +74,70 @@ Always build pdftoppm. @@ -73,70 +74,70 @@ Always build pdftoppm.
73 pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS) 74 pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
74 am__DEPENDENCIES_1 = libparseargs.la \ 75 am__DEPENDENCIES_1 = libparseargs.la \
75- $(top_builddir)/poppler/libpoppler.la 76- $(top_builddir)/poppler/libpoppler.la
76+ $(prefix)/lib/libpoppler.la 77+ $(prefix)/lib/libpoppler.la
77 am__DEPENDENCIES_2 = 78 am__DEPENDENCIES_2 =
78 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \ 79 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \
79 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2) 80 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2)
80 am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) 81 am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
81-pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \ 82-pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
82+pdftocairo_DEPENDENCIES = $(prefix)/lib/libpoppler-cairo.la \ 83+pdftocairo_DEPENDENCIES = $(prefix)/lib/libpoppler-cairo.la \
83 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \ 84 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
84 $(am__DEPENDENCIES_2) 85 $(am__DEPENDENCIES_2)
85 am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \ 86 am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \
86@@ -183,7 +183,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht 87@@ -184,7 +184,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
87 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) 88 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
88 pdftohtml_LDADD = $(LDADD) 89 pdftohtml_LDADD = $(LDADD)
89 pdftohtml_DEPENDENCIES = libparseargs.la \ 90 pdftohtml_DEPENDENCIES = libparseargs.la \
90- $(top_builddir)/poppler/libpoppler.la 91- $(top_builddir)/poppler/libpoppler.la
91+ $(prefix)/lib/libpoppler.la 92+ $(prefix)/lib/libpoppler.la
92 pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ 93 pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
93 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \ 94 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
94 $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ 95 $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
95@@ -191,22 +191,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) 96@@ -192,22 +192,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
96 pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS) 97 pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
97 pdftoppm_LDADD = $(LDADD) 98 pdftoppm_LDADD = $(LDADD)
98 pdftoppm_DEPENDENCIES = libparseargs.la \ 99 pdftoppm_DEPENDENCIES = libparseargs.la \
99- $(top_builddir)/poppler/libpoppler.la 100- $(top_builddir)/poppler/libpoppler.la
100+ $(prefix)/lib/libpoppler.la 101+ $(prefix)/lib/libpoppler.la
101 am_pdftops_OBJECTS = pdftops.$(OBJEXT) 102 am_pdftops_OBJECTS = pdftops.$(OBJEXT)
102 pdftops_OBJECTS = $(am_pdftops_OBJECTS) 103 pdftops_OBJECTS = $(am_pdftops_OBJECTS)
103 pdftops_LDADD = $(LDADD) 104 pdftops_LDADD = $(LDADD)
104 pdftops_DEPENDENCIES = libparseargs.la \ 105 pdftops_DEPENDENCIES = libparseargs.la \
105- $(top_builddir)/poppler/libpoppler.la 106- $(top_builddir)/poppler/libpoppler.la
106+ $(prefix)/lib/libpoppler.la 107+ $(prefix)/lib/libpoppler.la
107 am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) 108 am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT)
108 pdftotext_OBJECTS = $(am_pdftotext_OBJECTS) 109 pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
109 pdftotext_LDADD = $(LDADD) 110 pdftotext_LDADD = $(LDADD)
110 pdftotext_DEPENDENCIES = libparseargs.la \ 111 pdftotext_DEPENDENCIES = libparseargs.la \
111- $(top_builddir)/poppler/libpoppler.la 112- $(top_builddir)/poppler/libpoppler.la
112+ $(prefix)/lib/libpoppler.la 113+ $(prefix)/lib/libpoppler.la
113 am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) 114 am_pdfunite_OBJECTS = pdfunite.$(OBJEXT)
114 pdfunite_OBJECTS = $(am_pdfunite_OBJECTS) 115 pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
115 pdfunite_LDADD = $(LDADD) 116 pdfunite_LDADD = $(LDADD)
116 pdfunite_DEPENDENCIES = libparseargs.la \ 117 pdfunite_DEPENDENCIES = libparseargs.la \
117- $(top_builddir)/poppler/libpoppler.la 118- $(top_builddir)/poppler/libpoppler.la
118+ $(prefix)/lib/libpoppler.la 119+ $(prefix)/lib/libpoppler.la
119 AM_V_P = $(am__v_P_@AM_V@) 120 AM_V_P = $(am__v_P_@AM_V@)
120 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) 121 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
121 am__v_P_0 = false 122 am__v_P_0 = false
122@@ -549,8 +549,9 @@ AM_CPPFLAGS = \ 123@@ -550,8 +550,9 @@ AM_CPPFLAGS = \
123  124
124 LDADD = \ 125 LDADD = \
125 libparseargs.la \ 126 libparseargs.la \
126- $(top_builddir)/poppler/libpoppler.la \ 127- $(top_builddir)/poppler/libpoppler.la \
127- $(UTILS_LIBS) 128- $(UTILS_LIBS)
128+ $(prefix)/lib/libpoppler.la \ 129+ $(prefix)/lib/libpoppler.la \
129+ $(UTILS_LIBS) \ 130+ $(UTILS_LIBS) \
130+ $(PTHREAD_STUBLIB) 131+ $(PTHREAD_STUBLIB)
131  132
132 @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \ 133 @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
133 @BUILD_UTILS_TRUE@ pdfinfo.1 pdftops.1 pdftotext.1 pdftohtml.1 \ 134 @BUILD_UTILS_TRUE@ pdfinfo.1 pdftops.1 pdftotext.1 pdftohtml.1 \
134@@ -615,7 +616,7 @@ pdftocairo_SOURCES = \ 135@@ -616,7 +617,7 @@ pdftocairo_SOURCES = \
135 pdftocairo-win32.h 136 pdftocairo-win32.h
136  137
137 pdftocairo_LDADD = \ 138 pdftocairo_LDADD = \
138- $(top_builddir)/poppler/libpoppler-cairo.la \ 139- $(top_builddir)/poppler/libpoppler-cairo.la \
139+ $(prefix)/lib/libpoppler-cairo.la \ 140+ $(prefix)/lib/libpoppler-cairo.la \
140 $(LDADD) \ 141 $(LDADD) \
141 $(PDFTOCAIRO_LIBS) \ 142 $(PDFTOCAIRO_LIBS) \
142 $(PTHREAD_LIBS) 143 $(PTHREAD_LIBS)
cvs diff -r1.4 -r1.5 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 2016/04/15 14:36:21 1.4
+++ pkgsrc/print/poppler/patches/Attic/patch-qt5_src_Makefile.in 2016/05/22 18:17:17 1.5
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-qt5_src_Makefile.in,v 1.4 2016/04/15 14:36:21 wiz Exp $ 1$NetBSD: patch-qt5_src_Makefile.in,v 1.5 2016/05/22 18:17:17 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 2016-03-16 22:22:13.000000000 +0000 6--- qt5/src/Makefile.in.orig 2016-05-21 16:59:39.000000000 +0000
7+++ qt5/src/Makefile.in 7+++ qt5/src/Makefile.in
8@@ -139,7 +139,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@@ -520,7 +520,7 @@ libpoppler_qt5_la_CXXFLAGS = \ 17@@ -520,7 +520,7 @@ libpoppler_qt5_la_CXXFLAGS = \
18 -Dpoppler_qt5_EXPORTS 18 -Dpoppler_qt5_EXPORTS
19  19