Tue Apr 17 05:20:35 2018 UTC ()
poppler*: update to 0.63.0

Release 0.63.0
        core:
         * CairoOutputDev: support embedding CCITT image data. Bug #103399
         * CairoOutputDev: limit image size when printing. Bug #103399
         * CairoOutputDev: use GOOD instead of BEST as the default cairo filter for scaling. Bug #103136
         * Error out on save if file has changed since we opened it. Bug #103793
         * PDFDoc: use %c instead of \x to output binary. Bug #103873
         * Fix index out of bounds undefined behaviour in PSTokenizer. Bug #103583
         * Fix opening files with OutlineItem loops. Bug #102914
         * Fix some bugs in StructTreeRoot parsing of parent tree. Bug #103912
         * Remove error for wrong child type for tagged pdf. Bug #103587
         * FoFiTrueType::readPostTable() from xpdf 4.00. Bug #102880
         * GfxFontDict: merge reference generation from xpdf 4.00. Bug #104565
         * Reset lastAbortCheck on updateLevel reset
         * PDFDoc::setup: Fail early if base stream length is 0. Bug #103552
         * Check curStr is actually a Stream before doing Stream operations. Bug #104518
         * Fix new Object API porting bug. Bug #104517
         * Check return code of getChar(), abort reading on error. Bug #104502
         * TextPage: Add horizontal scaling to font matrix. Bug #105259
         * Fix EmbedStream replay. Bug #103446
         * Fix memory leak on error condition
         * Fix assert on malformed documents. Bug #104354
         * Fix abort in Gfx::opBeginMarkedContent if args[1] is not a name. Bug #104468
         * GfxGouraudTriangleShading::parse: Don't abort on malformed documents. Bug #104567
         * GfxFunctionShading::parse: Fix abort in malformed document. Bug #104581
         * Remove the extern C from glib.h. Bug #103621
         * Don't let ArthurOutputDev be friend of SplashPath anymore
         * Fix undefined sanitizer warning about qsort
         * Form.h: include time.h for time_t
         * Various code improvements

        qt5:
         * Add cancellation support to renderToImage and textList
         * Do not assume all Screen annotation actions are Renditions. KDE bug #388175
         * qt5: Implement operator= for PageTransition
         * ArthurOutputDev: 'clip' should intersect new and old clipping path
         * ArthurOutputDev: Implement updateBlendMode
         * ArthurOutputDev: Replace the QPainter by a stack of QPainters
         * ArthurOutputDev: Rudimentary support for transparency groups
         * Remove stale libcms1 code. Bug #104358
         * demo: don't crash if page is malformed
         * Fix warnings due to the use of deprecated overloads of Poppler::Page::Search in tests.

        utils:
         * pdfimages: Fix for files with flate encoded inline images. Bug #103446
         * pdftocairo: Remove stale libcms1 code. Bug #104358
         * pdfimages: Fix build without libtiff and libpng
         * pdfseparate: Fix buffer size warning due to missing space for null terminator

        build system:
         * Enable building all libs as static libs
         * Enable no-missing-field-initializers
         * Remove unused FindLIBOPENJPEG.cmake
         * add "--owner root:0 --group root:0" options to tar command in dist target. Bug #104398
         * Add python3 support to gtkdoc.py
         * gtkdoc.py: Make it work with newer gtk-doc. Bug #105075

        cpp:
         * Add page::text_list


(wiz)
diff -r1.70 -r1.71 pkgsrc/print/poppler/Makefile
diff -r1.94 -r1.95 pkgsrc/print/poppler/Makefile.common
diff -r1.9 -r1.10 pkgsrc/print/poppler/PLIST
diff -r1.125 -r1.126 pkgsrc/print/poppler/distinfo
diff -r1.18 -r1.19 pkgsrc/print/poppler-cpp/Makefile
diff -r1.2 -r1.3 pkgsrc/print/poppler-cpp/PLIST
diff -r1.70 -r1.71 pkgsrc/print/poppler-glib/Makefile
diff -r1.23 -r1.24 pkgsrc/print/poppler-includes/Makefile
diff -r1.23 -r1.24 pkgsrc/print/poppler-qt5/Makefile
diff -r1.4 -r1.5 pkgsrc/print/poppler-qt5/PLIST
diff -r1.38 -r1.39 pkgsrc/print/poppler-utils/Makefile
cvs diff -r1.70 -r1.71 pkgsrc/print/poppler/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler/Makefile 2018/03/12 11:15:43 1.70
+++ pkgsrc/print/poppler/Makefile 2018/04/17 05:20:34 1.71
@@ -1,41 +1,37 @@ @@ -1,41 +1,37 @@
1# $NetBSD: Makefile,v 1.70 2018/03/12 11:15:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.71 2018/04/17 05:20:34 wiz Exp $
2 2
3PKGREVISION= 1 
4.include "../../print/poppler/Makefile.common" 3.include "../../print/poppler/Makefile.common"
5 4
6COMMENT= PDF rendering library 5COMMENT= PDF rendering library
7MAINTAINER= reed@reedmedia.net 6MAINTAINER= reed@reedmedia.net
8 7
9#PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.cmake 8#PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.cmake
10PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-splash.pc.cmake 9PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-splash.pc.cmake
11PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler.pc.cmake 10PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler.pc.cmake
12 11
13INSTALLATION_DIRS+= include/poppler share/doc/poppler 12INSTALLATION_DIRS+= include/poppler share/doc/poppler
14 13
15# TODO: Later add an option to choose Splash versus Cairo backend. 14# TODO: Later add an option to choose Splash versus Cairo backend.
16# Build the Splash graphics backend. 15# Build the Splash graphics backend.
17CMAKE_ARGS+= -DENABLE_SPLASH=ON 16CMAKE_ARGS+= -DENABLE_SPLASH=ON
18CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=TRUE 
19# Don't compile GTK+ test program. 17# Don't compile GTK+ test program.
20CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF 18CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
21# Don't compile GLib wrapper which also needs gtk2 19# Don't compile GLib wrapper which also needs gtk2
22CMAKE_ARGS+= -DENABLE_GLIB=OFF 20CMAKE_ARGS+= -DENABLE_GLIB=OFF
23# Don't build and install the tools 21# Don't build and install the tools
24CMAKE_ARGS+= -DENABLE_UTILS=OFF 22CMAKE_ARGS+= -DENABLE_UTILS=OFF
25# Don't compile poppler cpp wrapper. 23# Don't compile poppler cpp wrapper.
26CMAKE_ARGS+= -DENABLE_CPP=OFF 24CMAKE_ARGS+= -DENABLE_CPP=OFF
27# Don't compile poppler qt4 wrapper. 
28CMAKE_ARGS+= -DENABLE_QT4=OFF 
29# Don't compile poppler qt5 wrapper. 25# Don't compile poppler qt5 wrapper.
30CMAKE_ARGS+= -DENABLE_QT5=OFF 26CMAKE_ARGS+= -DENABLE_QT5=OFF
31# Don't build libcurl based HTTP support. ## might want to include 27# Don't build libcurl based HTTP support. ## might want to include
32CMAKE_ARGS+= -DENABLE_LIBCURL=OFF 28CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
33 29
34 30
35.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
36 32
37# Passing "-ansi" turns "long long" support off on FreeBSD/amd64: 33# Passing "-ansi" turns "long long" support off on FreeBSD/amd64:
38.if ${OPSYS} == "FreeBSD" && ${MACHINE_ARCH} == "x86_64" 34.if ${OPSYS} == "FreeBSD" && ${MACHINE_ARCH} == "x86_64"
39CFLAGS+= -D__LONG_LONG_SUPPORTED= 35CFLAGS+= -D__LONG_LONG_SUPPORTED=
40.endif 36.endif
41 37
cvs diff -r1.94 -r1.95 pkgsrc/print/poppler/Makefile.common (expand / switch to unified diff)

--- pkgsrc/print/poppler/Makefile.common 2018/01/10 21:55:34 1.94
+++ pkgsrc/print/poppler/Makefile.common 2018/04/17 05:20:34 1.95
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: Makefile.common,v 1.94 2018/01/10 21:55:34 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.95 2018/04/17 05:20:34 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 
8# used by print/poppler-qt5/Makefile 7# used by print/poppler-qt5/Makefile
9# used by print/poppler-utils/Makefile 8# used by print/poppler-utils/Makefile
10 9
11POPPLER_VERS= 0.62.0 10POPPLER_VERS= 0.63.0
12DISTNAME= poppler-${POPPLER_VERS} 11DISTNAME= poppler-${POPPLER_VERS}
13CATEGORIES= print 12CATEGORIES= print
14MASTER_SITES= https://poppler.freedesktop.org/ 13MASTER_SITES= https://poppler.freedesktop.org/
15EXTRACT_SUFX= .tar.xz 14EXTRACT_SUFX= .tar.xz
16 15
17HOMEPAGE= https://poppler.freedesktop.org/ 16HOMEPAGE= https://poppler.freedesktop.org/
18LICENSE= gnu-gpl-v2 17LICENSE= gnu-gpl-v2
19 18
20DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo 19DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo
21PATCHDIR= ${.CURDIR}/../../print/poppler/patches 20PATCHDIR= ${.CURDIR}/../../print/poppler/patches
22 21
23USE_TOOLS+= pkg-config 22USE_TOOLS+= pkg-config
24USE_LIBTOOL= yes 23USE_LIBTOOL= yes
cvs diff -r1.9 -r1.10 pkgsrc/print/poppler/PLIST (expand / switch to unified diff)

--- pkgsrc/print/poppler/PLIST 2018/01/10 21:55:34 1.9
+++ pkgsrc/print/poppler/PLIST 2018/04/17 05:20:34 1.10
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1@comment $NetBSD: PLIST,v 1.9 2018/01/10 21:55:34 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.10 2018/04/17 05:20:34 wiz Exp $
2lib/libpoppler.so 2lib/libpoppler.so
3lib/libpoppler.so.73 3lib/libpoppler.so.74
4lib/libpoppler.so.73.0.0 4lib/libpoppler.so.74.0.0
5lib/pkgconfig/poppler-splash.pc 5lib/pkgconfig/poppler-splash.pc
6lib/pkgconfig/poppler.pc 6lib/pkgconfig/poppler.pc
7share/doc/poppler/README 7share/doc/poppler/README
8share/doc/poppler/README-XPDF 8share/doc/poppler/README-XPDF
cvs diff -r1.125 -r1.126 pkgsrc/print/poppler/distinfo (expand / switch to unified diff)

--- pkgsrc/print/poppler/distinfo 2018/01/10 21:55:34 1.125
+++ pkgsrc/print/poppler/distinfo 2018/04/17 05:20:34 1.126
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.125 2018/01/10 21:55:34 wiz Exp $ 1$NetBSD: distinfo,v 1.126 2018/04/17 05:20:34 wiz Exp $
2 2
3SHA1 (poppler-0.62.0.tar.xz) = 45f5186f9c514d121acd8c4aeae0e0137916a5f4 3SHA1 (poppler-0.63.0.tar.xz) = d0966c0a2a67d575246e9e10d632b83d820af13f
4RMD160 (poppler-0.62.0.tar.xz) = 50f8db04492abf8944a11c87c8f7b7f558c56a8e 4RMD160 (poppler-0.63.0.tar.xz) = 80cfe7a1845d57867705d6f5a6bf780ca72edcda
5SHA512 (poppler-0.62.0.tar.xz) = 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706 5SHA512 (poppler-0.63.0.tar.xz) = a151d08480e9940a02191355ef5e7499d6494cff05f22f49de2bb8223512f5e5c9bb9b33651943ded30b4cd7096a2423fb7a01fa62228fbcd1d3a221b885cfe9
6Size (poppler-0.62.0.tar.xz) = 1423372 bytes 6Size (poppler-0.63.0.tar.xz) = 1439552 bytes
7SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa 7SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa
8SHA1 (patch-gtkdoc.py) = b9bf7a8c2288bdec314c795317e2a4e1aac21913 8SHA1 (patch-goo_gfile.h) = 236731377b30b07673f10fa0e938e58af8661c59
 9SHA1 (patch-poppler_CMap.cc) = d37745ea4cbeae76ad43c4ac74e942531f7b7dd8
cvs diff -r1.18 -r1.19 pkgsrc/print/poppler-cpp/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler-cpp/Makefile 2018/03/12 11:15:43 1.18
+++ pkgsrc/print/poppler-cpp/Makefile 2018/04/17 05:20:34 1.19
@@ -1,41 +1,36 @@ @@ -1,41 +1,36 @@
1# $NetBSD: Makefile,v 1.18 2018/03/12 11:15:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2018/04/17 05:20:34 wiz Exp $
2 2
3PKGREVISION= 1 
4.include "../../print/poppler/Makefile.common" 3.include "../../print/poppler/Makefile.common"
5 4
6PKGNAME= poppler-cpp-${POPPLER_VERS} 5PKGNAME= poppler-cpp-${POPPLER_VERS}
7 6
8COMMENT= PDF rendering library (cpp wrapper) 7COMMENT= PDF rendering library (cpp wrapper)
9MAINTAINER= reed@reedmedia.net 8MAINTAINER= reed@reedmedia.net
10 9
11CONFLICTS+= poppler<0.4.5nb1 10CONFLICTS+= poppler<0.4.5nb1
12 11
13PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cpp.pc.cmake 12PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cpp.pc.cmake
14 13
15# Don't build the cairo graphics backend, required by glib. 14# Don't build the cairo graphics backend, required by glib.
16CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=TRUE 
17# Don't build the cairo graphics backend, required by glib. 
18CMAKE_ARGS+= -DENABLE_SPLASH=OFF 15CMAKE_ARGS+= -DENABLE_SPLASH=OFF
19# Don't compile GTK+ test program. 16# Don't compile GTK+ test program.
20CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF 17CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
21# Don't compile GLib wrapper which also needs gtk2 18# Don't compile GLib wrapper which also needs gtk2
22CMAKE_ARGS+= -DENABLE_GLIB=OFF 19CMAKE_ARGS+= -DENABLE_GLIB=OFF
23# Don't build and install the tools 20# Don't build and install the tools
24CMAKE_ARGS+= -DENABLE_UTILS=OFF 21CMAKE_ARGS+= -DENABLE_UTILS=OFF
25# Compile poppler cpp wrapper. 22# Compile poppler cpp wrapper.
26CMAKE_ARGS+= -DENABLE_CPP=ON 23CMAKE_ARGS+= -DENABLE_CPP=ON
27# Don't compile poppler qt4 wrapper. 
28CMAKE_ARGS+= -DENABLE_QT4=OFF 
29# Don't compile poppler qt5 wrapper. 24# Don't compile poppler qt5 wrapper.
30CMAKE_ARGS+= -DENABLE_QT5=OFF 25CMAKE_ARGS+= -DENABLE_QT5=OFF
31# Don't build libcurl based HTTP support. ## might want to include 26# Don't build libcurl based HTTP support. ## might want to include
32CMAKE_ARGS+= -DENABLE_LIBCURL=OFF 27CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
33 28
34LDFLAGS.SunOS+= -liconv 29LDFLAGS.SunOS+= -liconv
35 30
36BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*} 31BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*}
37.include "../../print/poppler/buildlink3.mk" 32.include "../../print/poppler/buildlink3.mk"
38 33
39BUILD_DIRS= cpp 34BUILD_DIRS= cpp
40INSTALL_DIRS= cpp 35INSTALL_DIRS= cpp
41 36
cvs diff -r1.2 -r1.3 pkgsrc/print/poppler-cpp/PLIST (expand / switch to unified diff)

--- pkgsrc/print/poppler-cpp/PLIST 2017/12/08 07:48:12 1.2
+++ pkgsrc/print/poppler-cpp/PLIST 2018/04/17 05:20:34 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1@comment $NetBSD: PLIST,v 1.2 2017/12/08 07:48:12 spz Exp $ 1@comment $NetBSD: PLIST,v 1.3 2018/04/17 05:20:34 wiz Exp $
2include/poppler/cpp/poppler-document.h 2include/poppler/cpp/poppler-document.h
3include/poppler/cpp/poppler-embedded-file.h 3include/poppler/cpp/poppler-embedded-file.h
4include/poppler/cpp/poppler-font.h 4include/poppler/cpp/poppler-font.h
5include/poppler/cpp/poppler-global.h 5include/poppler/cpp/poppler-global.h
6include/poppler/cpp/poppler-image.h 6include/poppler/cpp/poppler-image.h
7include/poppler/cpp/poppler-page-renderer.h 7include/poppler/cpp/poppler-page-renderer.h
8include/poppler/cpp/poppler-page-transition.h 8include/poppler/cpp/poppler-page-transition.h
9include/poppler/cpp/poppler-page.h 9include/poppler/cpp/poppler-page.h
10include/poppler/cpp/poppler-rectangle.h 10include/poppler/cpp/poppler-rectangle.h
11include/poppler/cpp/poppler-toc.h 11include/poppler/cpp/poppler-toc.h
12include/poppler/cpp/poppler-version.h 12include/poppler/cpp/poppler-version.h
13lib/libpoppler-cpp.so 13lib/libpoppler-cpp.so
14lib/libpoppler-cpp.so.0 14lib/libpoppler-cpp.so.0
15lib/libpoppler-cpp.so.0.3.0 15lib/libpoppler-cpp.so.0.4.0
16lib/pkgconfig/poppler-cpp.pc 16lib/pkgconfig/poppler-cpp.pc
cvs diff -r1.70 -r1.71 pkgsrc/print/poppler-glib/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler-glib/Makefile 2018/03/12 11:15:43 1.70
+++ pkgsrc/print/poppler-glib/Makefile 2018/04/17 05:20:34 1.71
@@ -1,53 +1,45 @@ @@ -1,53 +1,45 @@
1# $NetBSD: Makefile,v 1.70 2018/03/12 11:15:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.71 2018/04/17 05:20:34 wiz Exp $
2 2
3.include "../../print/poppler/Makefile.common" 3.include "../../print/poppler/Makefile.common"
4 4
5PKGNAME= poppler-glib-${POPPLER_VERS} 5PKGNAME= poppler-glib-${POPPLER_VERS}
6PKGREVISION= 2 
7 6
8COMMENT= PDF rendering library (GLib wrapper) 7COMMENT= PDF rendering library (GLib wrapper)
9MAINTAINER= reed@reedmedia.net 8MAINTAINER= reed@reedmedia.net
10 9
11CONFLICTS+= poppler<0.4.5nb1 10CONFLICTS+= poppler<0.4.5nb1
12 11
13PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-glib.pc.cmake 12PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-glib.pc.cmake
14 13
15USE_TOOLS+= python 14USE_TOOLS+= python
16 15
17# Build the cairo graphics backend, required by glib. 
18CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=FALSE 
19# Don't build the splash graphics backend. 16# Don't build the splash graphics backend.
20CMAKE_ARGS+= -DENABLE_SPLASH=OFF 17CMAKE_ARGS+= -DENABLE_SPLASH=OFF
21# Don't compile GTK+ test program. 18# Don't compile GTK+ test program.
22CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF 19CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
23# Compile GLib wrapper which also needs gtk2 20# Compile GLib wrapper which also needs gtk2
24CMAKE_ARGS+= -DENABLE_GLIB=ON 21CMAKE_ARGS+= -DENABLE_GLIB=ON
25# Do not generate glib API documentation. 22# Do not generate glib API documentation.
26CMAKE_ARGS+= -DENABLE_GTK_DOC=OFF 23CMAKE_ARGS+= -DENABLE_GTK_DOC=OFF
27# Don't build and install the tools 24# Don't build and install the tools
28CMAKE_ARGS+= -DENABLE_UTILS=OFF 25CMAKE_ARGS+= -DENABLE_UTILS=OFF
29# Don't compile poppler cpp wrapper. 26# Don't compile poppler cpp wrapper.
30CMAKE_ARGS+= -DENABLE_CPP=OFF 27CMAKE_ARGS+= -DENABLE_CPP=OFF
31# Don't compile poppler qt4 wrapper. 
32CMAKE_ARGS+= -DENABLE_QT4=OFF 
33# Don't compile poppler qt5 wrapper. 28# Don't compile poppler qt5 wrapper.
34CMAKE_ARGS+= -DENABLE_QT5=OFF 29CMAKE_ARGS+= -DENABLE_QT5=OFF
35# Don't build libcurl based HTTP support. ## might want to include 30# Don't build libcurl based HTTP support. ## might want to include
36CMAKE_ARGS+= -DENABLE_LIBCURL=OFF 31CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
37 32
38# enable for verbose build messages 
39#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE 
40 
41CFLAGS.FreeBSD+= -DLLONG_MAX=__LLONG_MAX 33CFLAGS.FreeBSD+= -DLLONG_MAX=__LLONG_MAX
42 34
43BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*} 35BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*}
44.include "../../print/poppler/buildlink3.mk" 36.include "../../print/poppler/buildlink3.mk"
45 37
46INSTALL_DIRS= glib 38INSTALL_DIRS= glib
47 39
48INSTALLATION_DIRS+= lib/pkgconfig 40INSTALLATION_DIRS+= lib/pkgconfig
49 41
50post-install: 42post-install:
51 ${INSTALL_DATA} ${WRKSRC}/poppler-cairo.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 43 ${INSTALL_DATA} ${WRKSRC}/poppler-cairo.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
52 ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 44 ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
53 45
cvs diff -r1.23 -r1.24 pkgsrc/print/poppler-includes/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler-includes/Makefile 2018/03/12 11:17:27 1.23
+++ pkgsrc/print/poppler-includes/Makefile 2018/04/17 05:20:34 1.24
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.23 2018/03/12 11:17:27 wiz Exp $ 1# $NetBSD: Makefile,v 1.24 2018/04/17 05:20:34 wiz Exp $
2 2
3PKGREVISION= 1 
4.include "../../print/poppler/Makefile.common" 3.include "../../print/poppler/Makefile.common"
5 4
6PKGNAME= poppler-includes-${POPPLER_VERS} 5PKGNAME= poppler-includes-${POPPLER_VERS}
7 6
8COMMENT= Poppler Xpdf includes (unsupported) 7COMMENT= Poppler Xpdf includes (unsupported)
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10 9
11CONFLICTS+= poppler-0.5.1 poppler-0.5.1nb1 poppler-0.5.1nb2 10CONFLICTS+= poppler-0.5.1 poppler-0.5.1nb1 poppler-0.5.1nb2
12 11
13NO_BUILD= yes 12NO_BUILD= yes
14 13
15CMAKE_ARGS+= -DENABLE_XPDF_HEADERS=ON 14CMAKE_ARGS+= -DENABLE_XPDF_HEADERS=ON
16 15
cvs diff -r1.23 -r1.24 pkgsrc/print/poppler-qt5/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler-qt5/Makefile 2018/04/14 07:34:38 1.23
+++ pkgsrc/print/poppler-qt5/Makefile 2018/04/17 05:20:34 1.24
@@ -1,35 +1,30 @@ @@ -1,35 +1,30 @@
1# $NetBSD: Makefile,v 1.23 2018/04/14 07:34:38 adam Exp $ 1# $NetBSD: Makefile,v 1.24 2018/04/17 05:20:34 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
10CMAKE_ARGS+= -DENABLE_SPLASH=ON 9CMAKE_ARGS+= -DENABLE_SPLASH=ON
11CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=TRUE 
12CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF 10CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
13CMAKE_ARGS+= -DENABLE_GLIB=OFF 11CMAKE_ARGS+= -DENABLE_GLIB=OFF
14CMAKE_ARGS+= -DENABLE_UTILS=OFF 12CMAKE_ARGS+= -DENABLE_UTILS=OFF
15CMAKE_ARGS+= -DENABLE_CPP=OFF 13CMAKE_ARGS+= -DENABLE_CPP=OFF
16CMAKE_ARGS+= -DENABLE_QT4=OFF 
17CMAKE_ARGS+= -DENABLE_QT5=ON 14CMAKE_ARGS+= -DENABLE_QT5=ON
18# Don't build libcurl based HTTP support. ## might want to include 15# Don't build libcurl based HTTP support. ## might want to include
19CMAKE_ARGS+= -DENABLE_LIBCURL=OFF 16CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
20 17
21CMAKE_ARGS+= -DMOCQT5=${QTDIR}/bin/moc 
22 
23BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS} 18BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
24.include "../../print/poppler/buildlink3.mk" 19.include "../../print/poppler/buildlink3.mk"
25 20
26PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-qt5.pc.in 21PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-qt5.pc.in
27 22
28INSTALLATION_DIRS+= lib include/poppler lib/pkgconfig 23INSTALLATION_DIRS+= lib include/poppler lib/pkgconfig
29 24
30BUILD_DIRS= qt5/src 25BUILD_DIRS= qt5/src
31 26
32pre-build: 27pre-build:
33 cd ${WRKSRC}/qt5/src && ${BUILD_MAKE_CMD} 28 cd ${WRKSRC}/qt5/src && ${BUILD_MAKE_CMD}
34 29
35post-install: 30post-install:
cvs diff -r1.4 -r1.5 pkgsrc/print/poppler-qt5/PLIST (expand / switch to unified diff)

--- pkgsrc/print/poppler-qt5/PLIST 2018/01/10 21:56:51 1.4
+++ pkgsrc/print/poppler-qt5/PLIST 2018/04/17 05:20:34 1.5
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1@comment $NetBSD: PLIST,v 1.4 2018/01/10 21:56:51 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.5 2018/04/17 05:20:34 wiz Exp $
2include/poppler/qt5/poppler-annotation.h 2include/poppler/qt5/poppler-annotation.h
3include/poppler/qt5/poppler-export.h 3include/poppler/qt5/poppler-export.h
4include/poppler/qt5/poppler-form.h 4include/poppler/qt5/poppler-form.h
5include/poppler/qt5/poppler-link.h 5include/poppler/qt5/poppler-link.h
6include/poppler/qt5/poppler-media.h 6include/poppler/qt5/poppler-media.h
7include/poppler/qt5/poppler-optcontent.h 7include/poppler/qt5/poppler-optcontent.h
8include/poppler/qt5/poppler-page-transition.h 8include/poppler/qt5/poppler-page-transition.h
9include/poppler/qt5/poppler-qt5.h 9include/poppler/qt5/poppler-qt5.h
10lib/libpoppler-qt5.so 10lib/libpoppler-qt5.so
11lib/libpoppler-qt5.so.1 11lib/libpoppler-qt5.so.1
12lib/libpoppler-qt5.so.1.12.0 12lib/libpoppler-qt5.so.1.13.0
13lib/pkgconfig/poppler-qt5.pc 13lib/pkgconfig/poppler-qt5.pc
cvs diff -r1.38 -r1.39 pkgsrc/print/poppler-utils/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler-utils/Makefile 2018/03/12 11:17:27 1.38
+++ pkgsrc/print/poppler-utils/Makefile 2018/04/17 05:20:34 1.39
@@ -1,37 +1,34 @@ @@ -1,37 +1,34 @@
1# $NetBSD: Makefile,v 1.38 2018/03/12 11:17:27 wiz Exp $ 1# $NetBSD: Makefile,v 1.39 2018/04/17 05:20:34 wiz Exp $
2 2
3PKGREVISION= 1 
4.include "../../print/poppler/Makefile.common" 3.include "../../print/poppler/Makefile.common"
5 4
6PKGNAME= poppler-utils-${POPPLER_VERS} 5PKGNAME= poppler-utils-${POPPLER_VERS}
7COMMENT= PDF utilities (from poppler) 6COMMENT= PDF utilities (from poppler)
8MAINTAINER= reed@reedmedia.net 7MAINTAINER= reed@reedmedia.net
9 8
10CONFLICTS+= poppler-0.5.1 poppler-0.5.1nb1 poppler-0.5.1nb2 9CONFLICTS+= poppler-0.5.1 poppler-0.5.1nb1 poppler-0.5.1nb2
11CONFLICTS+= xpdf<3.02pl4nb1 10CONFLICTS+= xpdf<3.02pl4nb1
12 11
13# Build the splash graphics backend. ## for pdftoppm 12# Build the splash graphics backend. ## for pdftoppm
14CMAKE_ARGS+= -DENABLE_SPLASH=ON 13CMAKE_ARGS+= -DENABLE_SPLASH=ON
15# Don't compile GTK+ test program. 14# Don't compile GTK+ test program.
16CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF 15CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
17# Don't compile GLib wrapper which also needs gtk2 16# Don't compile GLib wrapper which also needs gtk2
18CMAKE_ARGS+= -DENABLE_GLIB=OFF 17CMAKE_ARGS+= -DENABLE_GLIB=OFF
19# Build and install the tools 18# Build and install the tools
20CMAKE_ARGS+= -DENABLE_UTILS=ON 19CMAKE_ARGS+= -DENABLE_UTILS=ON
21# Don't compile poppler cpp wrapper. 20# Don't compile poppler cpp wrapper.
22CMAKE_ARGS+= -DENABLE_CPP=OFF 21CMAKE_ARGS+= -DENABLE_CPP=OFF
23# Don't compile poppler qt4 wrapper. 
24CMAKE_ARGS+= -DENABLE_QT4=OFF 
25# Don't compile poppler qt5 wrapper. 22# Don't compile poppler qt5 wrapper.
26CMAKE_ARGS+= -DENABLE_QT5=OFF 23CMAKE_ARGS+= -DENABLE_QT5=OFF
27# Don't build libcurl based HTTP support. ## might want to include 24# Don't build libcurl based HTTP support. ## might want to include
28CMAKE_ARGS+= -DENABLE_LIBCURL=OFF 25CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
29 26
30 27
31BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS} 28BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
32.include "../../print/poppler/buildlink3.mk" 29.include "../../print/poppler/buildlink3.mk"
33 30
34INSTALL_DIRS= utils 31INSTALL_DIRS= utils
35 32
36.include "../../mk/bsd.prefs.mk" 33.include "../../mk/bsd.prefs.mk"
37 34