Sat Jan 8 11:16:06 2022 UTC ()
poppler*: update to 22.01.0

Release 22.01.0:
        core:
         * Allow local (relative to dll) fonts dir on Windows
         * TextOutputDev: require more spacing between columns. Issue #1093
         * Fix crash in Splash::gouraudTriangleShadedFill. Issue #1183
         * Fix crash when calling Form::reset()
         * GfxSeparationColorSpace: Check validity of colorspace and function. Issue #1184
         * Minor code improvements

        glib:
         * Include glib.h before using defines from it
         * Close file descriptors on error
         * Plug some memory leaks
         * Replace use of deprecated g_memdup/g_time_zone_new
         * Remove FD-taking functions on windows

        utils:
         * pdfsig: Add support for documents with passwords
         * pdfsig: Fix signing with -sign if nss password is needed

Release 21.12.0:
        core:
         * Add API to add images
         * CairoOutputDev: Fix de-duping of Flate images
         * Fix crash on broken files when using non-default ENABLE_ZLIB_UNCOMPRESS. Issue #393
         * Minor code improvements

        glib:
         * Add API for validation of signatures
         * Add API to read/save to file descriptor

        utils:
         * pdftohtml: Reduce sensitivity of duplicate detection. Issue #1117

        build system:
         * Increase C++ standard to 17


(wiz)
diff -r1.126 -r1.127 pkgsrc/print/poppler/Makefile.common
diff -r1.36 -r1.37 pkgsrc/print/poppler/PLIST
diff -r1.157 -r1.158 pkgsrc/print/poppler/distinfo
diff -r1.94 -r1.95 pkgsrc/print/poppler-glib/Makefile
diff -r1.33 -r1.34 pkgsrc/print/poppler-glib/PLIST
diff -r1.25 -r1.26 pkgsrc/print/poppler-includes/PLIST
diff -r1.51 -r1.52 pkgsrc/print/poppler-qt5/Makefile
cvs diff -r1.126 -r1.127 pkgsrc/print/poppler/Makefile.common (switch to unified diff)

--- pkgsrc/print/poppler/Makefile.common 2021/11/07 13:01:24 1.126
+++ pkgsrc/print/poppler/Makefile.common 2022/01/08 11:16:05 1.127
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile.common,v 1.126 2021/11/07 13:01:24 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.127 2022/01/08 11:16:05 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-qt5/Makefile 7# used by print/poppler-qt5/Makefile
8# used by print/poppler-utils/Makefile 8# used by print/poppler-utils/Makefile
9 9
10POPPLER_VERS= 21.11.0 10POPPLER_VERS= 22.01.0
11DISTNAME= poppler-${POPPLER_VERS} 11DISTNAME= poppler-${POPPLER_VERS}
12CATEGORIES= print 12CATEGORIES= print
13MASTER_SITES= https://poppler.freedesktop.org/ 13MASTER_SITES= https://poppler.freedesktop.org/
14EXTRACT_SUFX= .tar.xz 14EXTRACT_SUFX= .tar.xz
15 15
16MAINTAINER= reed@reedmedia.net 16MAINTAINER= reed@reedmedia.net
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_CMAKE= yes 23USE_CMAKE= yes
24USE_LANGUAGES= c c++14 24USE_LANGUAGES= c c++14
25USE_TOOLS+= pkg-config 25USE_TOOLS+= pkg-config
26GCC_REQD+= 5 26GCC_REQD+= 5
27 27
28.include "../../mk/compiler.mk" 28.include "../../mk/compiler.mk"
29.if !empty(PKGSRC_COMPILER:Mclang) 29.if !empty(PKGSRC_COMPILER:Mclang)
30BUILDLINK_TRANSFORM+= rm:-fno-check-new 30BUILDLINK_TRANSFORM+= rm:-fno-check-new
31.endif 31.endif
32 32
33.include "../../devel/boost-headers/buildlink3.mk" 33.include "../../devel/boost-headers/buildlink3.mk"
34.include "../../graphics/openjpeg/buildlink3.mk" 34.include "../../graphics/openjpeg/buildlink3.mk"
cvs diff -r1.36 -r1.37 pkgsrc/print/poppler/PLIST (switch to unified diff)

--- pkgsrc/print/poppler/PLIST 2021/11/07 13:01:24 1.36
+++ pkgsrc/print/poppler/PLIST 2022/01/08 11:16:05 1.37
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1@comment $NetBSD: PLIST,v 1.36 2021/11/07 13:01:24 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.37 2022/01/08 11:16:05 wiz Exp $
2lib/libpoppler.so 2lib/libpoppler.so
3lib/libpoppler.so.115 3lib/libpoppler.so.117
4lib/libpoppler.so.115.0.0 4lib/libpoppler.so.117.0.0
5lib/pkgconfig/poppler.pc 5lib/pkgconfig/poppler.pc
6share/doc/poppler/README-XPDF 6share/doc/poppler/README-XPDF
7share/doc/poppler/README.md 7share/doc/poppler/README.md
cvs diff -r1.157 -r1.158 pkgsrc/print/poppler/distinfo (switch to unified diff)

--- pkgsrc/print/poppler/distinfo 2021/11/07 13:01:24 1.157
+++ pkgsrc/print/poppler/distinfo 2022/01/08 11:16:05 1.158
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.157 2021/11/07 13:01:24 wiz Exp $ 1$NetBSD: distinfo,v 1.158 2022/01/08 11:16:05 wiz Exp $
2 2
3BLAKE2s (poppler-21.11.0.tar.xz) = 9835924437d70e2e20e9299d4ad06183473c9ca4afe826f80d936d6d12d91cd9 3BLAKE2s (poppler-22.01.0.tar.xz) = cced69fa9241f7aa0c6cc5af2ccbdf8457724f97a7e54f9c755b7b51416ce1d1
4SHA512 (poppler-21.11.0.tar.xz) = 354d6372093e7ecedf95c43e8d203e9b2781ff7ecd81cd3920cb8c72a37463b47423ce7ab3c8233c0f031f2c024ac1ba5c8d442c80e6643722192fb9638e5d3a 4SHA512 (poppler-22.01.0.tar.xz) = c6ea908a9188483ca588ac81d3e92dd15a405f90d36cc7059e618c8a7e3e9faeda82717aba5df34adb4a0a94e2fbecd472acec44972272349cc8d5a57b7405d1
5Size (poppler-21.11.0.tar.xz) = 1783592 bytes 5Size (poppler-22.01.0.tar.xz) = 1801984 bytes
6SHA1 (patch-poppler_poppler-config.h.cmake) = d2a67beb1275f10f19468421f203806ead6fa8ff 6SHA1 (patch-poppler_poppler-config.h.cmake) = d2a67beb1275f10f19468421f203806ead6fa8ff
cvs diff -r1.94 -r1.95 pkgsrc/print/poppler-glib/Makefile (switch to unified diff)

--- pkgsrc/print/poppler-glib/Makefile 2021/12/08 16:02:32 1.94
+++ pkgsrc/print/poppler-glib/Makefile 2022/01/08 11:16:05 1.95
@@ -1,59 +1,58 @@ @@ -1,59 +1,58 @@
1# $NetBSD: Makefile,v 1.94 2021/12/08 16:02:32 adam Exp $ 1# $NetBSD: Makefile,v 1.95 2022/01/08 11:16:05 wiz Exp $
2 2
3PKGREVISION= 1 
4.include "../../print/poppler/Makefile.common" 3.include "../../print/poppler/Makefile.common"
5 4
6PKGNAME= poppler-glib-${POPPLER_VERS} 5PKGNAME= poppler-glib-${POPPLER_VERS}
7 6
8COMMENT= PDF rendering library (GLib wrapper) 7COMMENT= PDF rendering library (GLib wrapper)
9 8
10CONFLICTS+= poppler<0.4.5nb1 9CONFLICTS+= poppler<0.4.5nb1
11 10
12PKGCONFIG_OVERRIDE+= poppler-glib.pc.cmake 11PKGCONFIG_OVERRIDE+= poppler-glib.pc.cmake
13 12
14.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
15 14
16.if ${OPSYS} == "Darwin" 15.if ${OPSYS} == "Darwin"
17# MacOS Xcode does not provide /usr/include, so be explicit 16# MacOS Xcode does not provide /usr/include, so be explicit
18CMAKE_ARGS+= -DGLIB2_INCLUDE_DIRS=${PREFIX}/include 17CMAKE_ARGS+= -DGLIB2_INCLUDE_DIRS=${PREFIX}/include
19.endif 18.endif
20 19
21# Don't compile GTK+ test program. 20# Don't compile GTK+ test program.
22CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF 21CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
23# Compile GLib wrapper which also needs gtk2 22# Compile GLib wrapper which also needs gtk2
24CMAKE_ARGS+= -DENABLE_GLIB=ON 23CMAKE_ARGS+= -DENABLE_GLIB=ON
25# Do not generate glib API documentation. 24# Do not generate glib API documentation.
26CMAKE_ARGS+= -DENABLE_GTK_DOC=OFF 25CMAKE_ARGS+= -DENABLE_GTK_DOC=OFF
27# Don't build and install the tools 26# Don't build and install the tools
28CMAKE_ARGS+= -DENABLE_UTILS=OFF 27CMAKE_ARGS+= -DENABLE_UTILS=OFF
29# Don't compile poppler cpp wrapper. 28# Don't compile poppler cpp wrapper.
30CMAKE_ARGS+= -DENABLE_CPP=OFF 29CMAKE_ARGS+= -DENABLE_CPP=OFF
31# Don't compile poppler qt5 wrapper. 30# Don't compile poppler qt5 wrapper.
32CMAKE_ARGS+= -DENABLE_QT5=OFF 31CMAKE_ARGS+= -DENABLE_QT5=OFF
33# Don't build libcurl based HTTP support. ## might want to include 32# Don't build libcurl based HTTP support. ## might want to include
34CMAKE_ARGS+= -DENABLE_LIBCURL=OFF 33CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
35 34
36CFLAGS.FreeBSD+= -DLLONG_MAX=__LLONG_MAX 35CFLAGS.FreeBSD+= -DLLONG_MAX=__LLONG_MAX
37 36
38# The result binary of g-ir-scanner cannot find libpoppler-glib.so. 37# The result binary of g-ir-scanner cannot find libpoppler-glib.so.
39# The second part is for Darwin: libpoppler-glib.dylib has @rpath before being installed. 38# The second part is for Darwin: libpoppler-glib.dylib has @rpath before being installed.
40MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/glib:${BUILDLINK_PREFIX.poppler}/lib 39MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/glib:${BUILDLINK_PREFIX.poppler}/lib
41 40
42BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*} 41BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*}
43.include "../../print/poppler/buildlink3.mk" 42.include "../../print/poppler/buildlink3.mk"
44 43
45INSTALL_DIRS= glib 44INSTALL_DIRS= glib
46 45
47INSTALLATION_DIRS+= lib/pkgconfig 46INSTALLATION_DIRS+= lib/pkgconfig
48 47
49post-install: 48post-install:
50 ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 49 ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
51 50
52#.include "../../lang/python/tool.mk" 51#.include "../../lang/python/tool.mk"
53BUILDLINK_API_DEPENDS.glib2+= glib2>=2.41.0 52BUILDLINK_API_DEPENDS.glib2+= glib2>=2.41.0
54.include "../../devel/glib2/buildlink3.mk" 53.include "../../devel/glib2/buildlink3.mk"
55.include "../../devel/gobject-introspection/buildlink3.mk" 54.include "../../devel/gobject-introspection/buildlink3.mk"
56.include "../../graphics/cairo-gobject/buildlink3.mk" 55.include "../../graphics/cairo-gobject/buildlink3.mk"
57.include "../../mk/jpeg.buildlink3.mk" 56.include "../../mk/jpeg.buildlink3.mk"
58.include "../../mk/pthread.buildlink3.mk" 57.include "../../mk/pthread.buildlink3.mk"
59.include "../../mk/bsd.pkg.mk" 58.include "../../mk/bsd.pkg.mk"
cvs diff -r1.33 -r1.34 pkgsrc/print/poppler-glib/PLIST (switch to unified diff)

--- pkgsrc/print/poppler-glib/PLIST 2021/05/20 11:49:47 1.33
+++ pkgsrc/print/poppler-glib/PLIST 2022/01/08 11:16:05 1.34
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1@comment $NetBSD: PLIST,v 1.33 2021/05/20 11:49:47 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.34 2022/01/08 11:16:05 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-macros.h 11include/poppler/glib/poppler-macros.h
12include/poppler/glib/poppler-media.h 12include/poppler/glib/poppler-media.h
13include/poppler/glib/poppler-movie.h 13include/poppler/glib/poppler-movie.h
14include/poppler/glib/poppler-page.h 14include/poppler/glib/poppler-page.h
15include/poppler/glib/poppler-structure-element.h 15include/poppler/glib/poppler-structure-element.h
16include/poppler/glib/poppler.h 16include/poppler/glib/poppler.h
17lib/girepository-1.0/Poppler-0.18.typelib 17lib/girepository-1.0/Poppler-0.18.typelib
18lib/libpoppler-glib.so 18lib/libpoppler-glib.so
19lib/libpoppler-glib.so.8 19lib/libpoppler-glib.so.8
20lib/libpoppler-glib.so.8.21.0 20lib/libpoppler-glib.so.8.22.0
21lib/pkgconfig/poppler-glib.pc 21lib/pkgconfig/poppler-glib.pc
22share/gir-1.0/Poppler-0.18.gir 22share/gir-1.0/Poppler-0.18.gir
cvs diff -r1.25 -r1.26 pkgsrc/print/poppler-includes/PLIST (switch to unified diff)

--- pkgsrc/print/poppler-includes/PLIST 2021/11/07 13:01:24 1.25
+++ pkgsrc/print/poppler-includes/PLIST 2022/01/08 11:16:05 1.26
@@ -1,125 +1,125 @@ @@ -1,125 +1,125 @@
1@comment $NetBSD: PLIST,v 1.25 2021/11/07 13:01:24 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.26 2022/01/08 11:16:05 wiz Exp $
2include/poppler/Annot.h 2include/poppler/Annot.h
3include/poppler/AnnotStampImageHelper.h 3include/poppler/AnnotStampImageHelper.h
4include/poppler/Array.h 4include/poppler/Array.h
5include/poppler/BBoxOutputDev.h 5include/poppler/BBoxOutputDev.h
6include/poppler/CMap.h 6include/poppler/CMap.h
7include/poppler/CachedFile.h 7include/poppler/CachedFile.h
8include/poppler/CairoFontEngine.h 8include/poppler/CairoFontEngine.h
9include/poppler/CairoOutputDev.h 9include/poppler/CairoOutputDev.h
10include/poppler/CairoRescaleBox.h 10include/poppler/CairoRescaleBox.h
11include/poppler/Catalog.h 11include/poppler/Catalog.h
12include/poppler/CertificateInfo.h 12include/poppler/CertificateInfo.h
13include/poppler/CharCodeToUnicode.h 13include/poppler/CharCodeToUnicode.h
14include/poppler/CharTypes.h 14include/poppler/CharTypes.h
15include/poppler/CurlCachedFile.h 15include/poppler/CurlCachedFile.h
16include/poppler/CurlPDFDocBuilder.h 16include/poppler/CurlPDFDocBuilder.h
17include/poppler/DateInfo.h 17include/poppler/DateInfo.h
18include/poppler/Decrypt.h 18include/poppler/Decrypt.h
19include/poppler/Dict.h 19include/poppler/Dict.h
20include/poppler/Error.h 20include/poppler/Error.h
21include/poppler/ErrorCodes.h 21include/poppler/ErrorCodes.h
 22include/poppler/FDPDFDocBuilder.h
 23include/poppler/FILECacheLoader.h
22include/poppler/FileSpec.h 24include/poppler/FileSpec.h
23include/poppler/FontEncodingTables.h 25include/poppler/FontEncodingTables.h
24include/poppler/FontInfo.h 26include/poppler/FontInfo.h
25include/poppler/Form.h 27include/poppler/Form.h
26include/poppler/Function.h 28include/poppler/Function.h
27include/poppler/Gfx.h 29include/poppler/Gfx.h
28include/poppler/GfxFont.h 30include/poppler/GfxFont.h
29include/poppler/GfxState.h 31include/poppler/GfxState.h
30include/poppler/GfxState_helpers.h 32include/poppler/GfxState_helpers.h
31include/poppler/GlobalParams.h 33include/poppler/GlobalParams.h
32include/poppler/Hints.h 34include/poppler/Hints.h
33include/poppler/JArithmeticDecoder.h 35include/poppler/JArithmeticDecoder.h
34include/poppler/JBIG2Stream.h 36include/poppler/JBIG2Stream.h
35include/poppler/JPEG2000Stream.h 37include/poppler/JPEG2000Stream.h
36include/poppler/JPXStream.h 38include/poppler/JPXStream.h
37include/poppler/JSInfo.h 39include/poppler/JSInfo.h
38include/poppler/Lexer.h 40include/poppler/Lexer.h
39include/poppler/Linearization.h 41include/poppler/Linearization.h
40include/poppler/Link.h 42include/poppler/Link.h
41include/poppler/LocalPDFDocBuilder.h 43include/poppler/LocalPDFDocBuilder.h
42include/poppler/MarkedContentOutputDev.h 44include/poppler/MarkedContentOutputDev.h
43include/poppler/Movie.h 45include/poppler/Movie.h
44include/poppler/NameToCharCode.h 46include/poppler/NameToCharCode.h
45include/poppler/NameToUnicodeTable.h 47include/poppler/NameToUnicodeTable.h
46include/poppler/Object.h 48include/poppler/Object.h
47include/poppler/OptionalContent.h 49include/poppler/OptionalContent.h
48include/poppler/Outline.h 50include/poppler/Outline.h
49include/poppler/OutputDev.h 51include/poppler/OutputDev.h
50include/poppler/PDFDoc.h 52include/poppler/PDFDoc.h
51include/poppler/PDFDocBuilder.h 53include/poppler/PDFDocBuilder.h
52include/poppler/PDFDocEncoding.h 54include/poppler/PDFDocEncoding.h
53include/poppler/PDFDocFactory.h 55include/poppler/PDFDocFactory.h
54include/poppler/PSOutputDev.h 56include/poppler/PSOutputDev.h
55include/poppler/PSTokenizer.h 57include/poppler/PSTokenizer.h
56include/poppler/Page.h 58include/poppler/Page.h
57include/poppler/PageTransition.h 59include/poppler/PageTransition.h
58include/poppler/Parser.h 60include/poppler/Parser.h
59include/poppler/PopplerCache.h 61include/poppler/PopplerCache.h
60include/poppler/PreScanOutputDev.h 62include/poppler/PreScanOutputDev.h
61include/poppler/ProfileData.h 63include/poppler/ProfileData.h
62include/poppler/Rendition.h 64include/poppler/Rendition.h
63include/poppler/SecurityHandler.h 65include/poppler/SecurityHandler.h
64include/poppler/SignatureInfo.h 66include/poppler/SignatureInfo.h
65include/poppler/Sound.h 67include/poppler/Sound.h
66include/poppler/SplashOutputDev.h 68include/poppler/SplashOutputDev.h
67include/poppler/StdinCachedFile.h 
68include/poppler/StdinPDFDocBuilder.h 
69include/poppler/Stream-CCITT.h 69include/poppler/Stream-CCITT.h
70include/poppler/Stream.h 70include/poppler/Stream.h
71include/poppler/StructElement.h 71include/poppler/StructElement.h
72include/poppler/StructTreeRoot.h 72include/poppler/StructTreeRoot.h
73include/poppler/TextOutputDev.h 73include/poppler/TextOutputDev.h
74include/poppler/UTF.h 74include/poppler/UTF.h
75include/poppler/UnicodeCClassTables.h 75include/poppler/UnicodeCClassTables.h
76include/poppler/UnicodeCompTables.h 76include/poppler/UnicodeCompTables.h
77include/poppler/UnicodeDecompTables.h 77include/poppler/UnicodeDecompTables.h
78include/poppler/UnicodeMap.h 78include/poppler/UnicodeMap.h
79include/poppler/UnicodeMapFuncs.h 79include/poppler/UnicodeMapFuncs.h
80include/poppler/UnicodeMapTables.h 80include/poppler/UnicodeMapTables.h
81include/poppler/UnicodeTypeTable.h 81include/poppler/UnicodeTypeTable.h
82include/poppler/ViewerPreferences.h 82include/poppler/ViewerPreferences.h
83include/poppler/XRef.h 83include/poppler/XRef.h
84include/poppler/fofi/FoFiBase.h 84include/poppler/fofi/FoFiBase.h
85include/poppler/fofi/FoFiEncodings.h 85include/poppler/fofi/FoFiEncodings.h
86include/poppler/fofi/FoFiIdentifier.h 86include/poppler/fofi/FoFiIdentifier.h
87include/poppler/fofi/FoFiTrueType.h 87include/poppler/fofi/FoFiTrueType.h
88include/poppler/fofi/FoFiType1.h 88include/poppler/fofi/FoFiType1.h
89include/poppler/fofi/FoFiType1C.h 89include/poppler/fofi/FoFiType1C.h
90include/poppler/goo/GooCheckedOps.h 90include/poppler/goo/GooCheckedOps.h
91include/poppler/goo/GooLikely.h 91include/poppler/goo/GooLikely.h
92include/poppler/goo/GooString.h 92include/poppler/goo/GooString.h
93include/poppler/goo/GooTimer.h 93include/poppler/goo/GooTimer.h
94include/poppler/goo/ImgWriter.h 94include/poppler/goo/ImgWriter.h
95include/poppler/goo/JpegWriter.h 95include/poppler/goo/JpegWriter.h
96include/poppler/goo/NetPBMWriter.h 96include/poppler/goo/NetPBMWriter.h
97include/poppler/goo/PNGWriter.h 97include/poppler/goo/PNGWriter.h
98include/poppler/goo/TiffWriter.h 98include/poppler/goo/TiffWriter.h
99include/poppler/goo/gdir.h 99include/poppler/goo/gdir.h
100include/poppler/goo/gfile.h 100include/poppler/goo/gfile.h
101include/poppler/goo/gmem.h 101include/poppler/goo/gmem.h
102include/poppler/goo/grandom.h 102include/poppler/goo/grandom.h
103include/poppler/goo/gstrtod.h 103include/poppler/goo/gstrtod.h
104include/poppler/poppler-config.h 104include/poppler/poppler-config.h
105include/poppler/poppler_private_export.h 105include/poppler/poppler_private_export.h
106include/poppler/splash/Splash.h 106include/poppler/splash/Splash.h
107include/poppler/splash/SplashBitmap.h 107include/poppler/splash/SplashBitmap.h
108include/poppler/splash/SplashClip.h 108include/poppler/splash/SplashClip.h
109include/poppler/splash/SplashErrorCodes.h 109include/poppler/splash/SplashErrorCodes.h
110include/poppler/splash/SplashFTFont.h 110include/poppler/splash/SplashFTFont.h
111include/poppler/splash/SplashFTFontEngine.h 111include/poppler/splash/SplashFTFontEngine.h
112include/poppler/splash/SplashFTFontFile.h 112include/poppler/splash/SplashFTFontFile.h
113include/poppler/splash/SplashFont.h 113include/poppler/splash/SplashFont.h
114include/poppler/splash/SplashFontEngine.h 114include/poppler/splash/SplashFontEngine.h
115include/poppler/splash/SplashFontFile.h 115include/poppler/splash/SplashFontFile.h
116include/poppler/splash/SplashFontFileID.h 116include/poppler/splash/SplashFontFileID.h
117include/poppler/splash/SplashGlyphBitmap.h 117include/poppler/splash/SplashGlyphBitmap.h
118include/poppler/splash/SplashMath.h 118include/poppler/splash/SplashMath.h
119include/poppler/splash/SplashPath.h 119include/poppler/splash/SplashPath.h
120include/poppler/splash/SplashPattern.h 120include/poppler/splash/SplashPattern.h
121include/poppler/splash/SplashScreen.h 121include/poppler/splash/SplashScreen.h
122include/poppler/splash/SplashState.h 122include/poppler/splash/SplashState.h
123include/poppler/splash/SplashTypes.h 123include/poppler/splash/SplashTypes.h
124include/poppler/splash/SplashXPath.h 124include/poppler/splash/SplashXPath.h
125include/poppler/splash/SplashXPathScanner.h 125include/poppler/splash/SplashXPathScanner.h
cvs diff -r1.51 -r1.52 pkgsrc/print/poppler-qt5/Makefile (switch to unified diff)

--- pkgsrc/print/poppler-qt5/Makefile 2021/12/08 16:06:15 1.51
+++ pkgsrc/print/poppler-qt5/Makefile 2022/01/08 11:16:05 1.52
@@ -1,36 +1,35 @@ @@ -1,36 +1,35 @@
1# $NetBSD: Makefile,v 1.51 2021/12/08 16:06:15 adam Exp $ 1# $NetBSD: Makefile,v 1.52 2022/01/08 11:16:05 wiz Exp $
2 2
3PKGREVISION= 1 
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+= -DBUILD_GTK_TESTS=OFF 9CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
11CMAKE_ARGS+= -DENABLE_GLIB=OFF 10CMAKE_ARGS+= -DENABLE_GLIB=OFF
12CMAKE_ARGS+= -DENABLE_UTILS=OFF 11CMAKE_ARGS+= -DENABLE_UTILS=OFF
13CMAKE_ARGS+= -DENABLE_CPP=OFF 12CMAKE_ARGS+= -DENABLE_CPP=OFF
14CMAKE_ARGS+= -DENABLE_QT5=ON 13CMAKE_ARGS+= -DENABLE_QT5=ON
15# Don't build libcurl based HTTP support. ## might want to include 14# Don't build libcurl based HTTP support. ## might want to include
16CMAKE_ARGS+= -DENABLE_LIBCURL=OFF 15CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
17 16
18BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS} 17BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
19.include "../../print/poppler/buildlink3.mk" 18.include "../../print/poppler/buildlink3.mk"
20 19
21PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-qt5.pc.cmake 20PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-qt5.pc.cmake
22 21
23INSTALLATION_DIRS+= lib include/poppler lib/pkgconfig 22INSTALLATION_DIRS+= lib include/poppler lib/pkgconfig
24 23
25BUILD_DIRS= qt5/src 24BUILD_DIRS= qt5/src
26 25
27pre-build: 26pre-build:
28 cd ${WRKSRC}/qt5/src && ${BUILD_MAKE_CMD} 27 cd ${WRKSRC}/qt5/src && ${BUILD_MAKE_CMD}
29 28
30post-install: 29post-install:
31 ${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 30 ${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
32 31
33.include "../../devel/boost-headers/buildlink3.mk" 32.include "../../devel/boost-headers/buildlink3.mk"
34.include "../../x11/qt5-qtbase/buildlink3.mk" 33.include "../../x11/qt5-qtbase/buildlink3.mk"
35.include "../../mk/pthread.buildlink3.mk" 34.include "../../mk/pthread.buildlink3.mk"
36.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"