From 5a9f8597a1d938989e2b2d010afc7c42064e5223 Mon Sep 17 00:00:00 2001 From: nia Date: Sat, 19 Oct 2019 12:37:04 +0000 Subject: poppler: Update to 0.81.0 pkgsrc changes: to avoid adding a new dependency on boost, poppler now uses cairo as the default graphics backend. the qt5 package seems to require splash (?) so that one gets a new boost dependency. we could also avoid it by forcing cmake detection to fail, but in this case it prints a warning about performance losses. Release 0.81.0: core: * Splash: Always enable support for CMYK rasterization * CairoOutputDev: Check scaled dimensions for 0. Issue #737 * BaseCryptStream: Fix potential uninitialized memory read * SplashBitmap: Fix wrong width condition for splashModeDeviceN8 * Fix crashes in malformed files Release 0.80.0: core: * Annotations: Implement support for setting a different text in the appearance stream than the real text * Splash: Optionally use small_vector from boost * Fix memory leaks on broken files * Fix abort on broken files * Small code simplifications * Remove USE_FIXEDPOINT support. Issue #821 qt5: * Fix MSVC build * Add subsitute-font information * Fix since marker of some functions * Fix leak when aborting text extraction * Small code simplifications glib: * Make print scaling getter visible * Make Duplex/NumCopies/PrintPageRange preference available in API * Implement Movie API utils: * pdftotext: Add -nodiag flag to remove diagonal text on output build system: * Mark external lib include dirs as SYSTEM --- print/poppler-cpp/buildlink3.mk | 4 ++-- print/poppler-glib/Makefile | 5 +---- print/poppler-glib/PLIST | 5 ++--- print/poppler-glib/buildlink3.mk | 5 ++--- print/poppler-includes/PLIST | 3 +-- print/poppler-includes/buildlink3.mk | 4 ++-- print/poppler-qt5/Makefile | 4 ++-- print/poppler-qt5/PLIST | 4 ++-- print/poppler-qt5/buildlink3.mk | 4 ++-- print/poppler-utils/DESCR | 1 - print/poppler-utils/Makefile | 6 +++--- print/poppler-utils/PLIST | 4 +--- print/poppler/Makefile | 11 +++++------ print/poppler/Makefile.common | 4 ++-- print/poppler/PLIST | 8 ++++---- print/poppler/buildlink3.mk | 5 +++-- print/poppler/distinfo | 10 +++++----- 17 files changed, 39 insertions(+), 48 deletions(-) (limited to 'print') diff --git a/print/poppler-cpp/buildlink3.mk b/print/poppler-cpp/buildlink3.mk index d013603e2b6..00d79fa0a9d 100644 --- a/print/poppler-cpp/buildlink3.mk +++ b/print/poppler-cpp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.47 2019/07/23 17:19:57 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.48 2019/10/19 12:37:05 nia Exp $ BUILDLINK_TREE+= poppler-cpp @@ -6,7 +6,7 @@ BUILDLINK_TREE+= poppler-cpp POPPLER_CPP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poppler-cpp+= poppler-cpp>=0.16.7 -BUILDLINK_ABI_DEPENDS.poppler-cpp+= poppler-cpp>=0.79.0 +BUILDLINK_ABI_DEPENDS.poppler-cpp+= poppler-cpp>=0.81.0 BUILDLINK_PKGSRCDIR.poppler-cpp?= ../../print/poppler-cpp .include "../../print/poppler/buildlink3.mk" diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile index 062a9924577..faf83689fac 100644 --- a/print/poppler-glib/Makefile +++ b/print/poppler-glib/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.77 2019/10/10 13:19:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.78 2019/10/19 12:37:05 nia Exp $ .include "../../print/poppler/Makefile.common" PKGNAME= poppler-glib-${POPPLER_VERS} -PKGREVISION= 1 COMMENT= PDF rendering library (GLib wrapper) @@ -43,7 +42,6 @@ INSTALL_DIRS= glib INSTALLATION_DIRS+= lib/pkgconfig post-install: - ${INSTALL_DATA} ${WRKSRC}/poppler-cairo.pc ${DESTDIR}${PREFIX}/lib/pkgconfig ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${DESTDIR}${PREFIX}/lib/pkgconfig .include "../../lang/python/tool.mk" @@ -51,7 +49,6 @@ BUILDLINK_ABI_DEPENDS.glib2+= glib2>=2.41.0 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/gobject-introspection/buildlink3.mk" #.include "../../textproc/gtk-doc/buildlink3.mk" -.include "../../graphics/cairo/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/poppler-glib/PLIST b/print/poppler-glib/PLIST index a117718cd7e..93742eba9b8 100644 --- a/print/poppler-glib/PLIST +++ b/print/poppler-glib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.28 2019/10/05 06:06:32 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.29 2019/10/19 12:37:05 nia Exp $ include/poppler/glib/poppler-action.h include/poppler/glib/poppler-annot.h include/poppler/glib/poppler-attachment.h @@ -17,7 +17,6 @@ include/poppler/glib/poppler.h lib/girepository-1.0/Poppler-0.18.typelib lib/libpoppler-glib.so lib/libpoppler-glib.so.8 -lib/libpoppler-glib.so.8.13.0 -lib/pkgconfig/poppler-cairo.pc +lib/libpoppler-glib.so.8.14.0 lib/pkgconfig/poppler-glib.pc share/gir-1.0/Poppler-0.18.gir diff --git a/print/poppler-glib/buildlink3.mk b/print/poppler-glib/buildlink3.mk index 430907f3434..413f5d363f6 100644 --- a/print/poppler-glib/buildlink3.mk +++ b/print/poppler-glib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.74 2019/07/23 17:19:57 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.75 2019/10/19 12:37:05 nia Exp $ BUILDLINK_TREE+= poppler-glib @@ -6,11 +6,10 @@ BUILDLINK_TREE+= poppler-glib POPPLER_GLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.5.1 -BUILDLINK_ABI_DEPENDS.poppler-glib+= poppler-glib>=0.79.0 +BUILDLINK_ABI_DEPENDS.poppler-glib+= poppler-glib>=0.81.0 BUILDLINK_PKGSRCDIR.poppler-glib?= ../../print/poppler-glib .include "../../devel/glib2/buildlink3.mk" -.include "../../graphics/cairo/buildlink3.mk" .include "../../print/poppler/buildlink3.mk" .endif # POPPLER_GLIB_BUILDLINK3_MK diff --git a/print/poppler-includes/PLIST b/print/poppler-includes/PLIST index e98fc182fca..e3c7499a321 100644 --- a/print/poppler-includes/PLIST +++ b/print/poppler-includes/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2019/05/09 09:28:22 adam Exp $ +@comment $NetBSD: PLIST,v 1.20 2019/10/19 12:37:05 nia Exp $ include/poppler/Annot.h include/poppler/Array.h include/poppler/BuiltinFont.h @@ -84,7 +84,6 @@ include/poppler/fofi/FoFiIdentifier.h include/poppler/fofi/FoFiTrueType.h include/poppler/fofi/FoFiType1.h include/poppler/fofi/FoFiType1C.h -include/poppler/goo/FixedPoint.h include/poppler/goo/GooCheckedOps.h include/poppler/goo/GooLikely.h include/poppler/goo/GooString.h diff --git a/print/poppler-includes/buildlink3.mk b/print/poppler-includes/buildlink3.mk index 019e4c29625..0c775779c8d 100644 --- a/print/poppler-includes/buildlink3.mk +++ b/print/poppler-includes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.43 2019/07/23 17:19:57 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.44 2019/10/19 12:37:05 nia Exp $ BUILDLINK_TREE+= poppler-includes @@ -8,7 +8,7 @@ POPPLER_INCLUDES_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.poppler-includes?= build BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.22.2 -BUILDLINK_ABI_DEPENDS.poppler-includes+= poppler-includes>=0.79.0 +BUILDLINK_ABI_DEPENDS.poppler-includes+= poppler-includes>=0.81.0 BUILDLINK_PKGSRCDIR.poppler-includes?= ../../print/poppler-includes .endif # POPPLER_INCLUDES_BUILDLINK3_MK diff --git a/print/poppler-qt5/Makefile b/print/poppler-qt5/Makefile index 05260ded842..964f9ac5ea0 100644 --- a/print/poppler-qt5/Makefile +++ b/print/poppler-qt5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2019/05/09 09:28:22 adam Exp $ +# $NetBSD: Makefile,v 1.33 2019/10/19 12:37:05 nia Exp $ .include "../../print/poppler/Makefile.common" @@ -6,7 +6,6 @@ PKGNAME= poppler-qt5-${POPPLER_VERS} COMMENT= PDF rendering library (QT5 wrapper) MAINTAINER= pkgsrc-users@NetBSD.org -CMAKE_ARGS+= -DENABLE_SPLASH=ON CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF CMAKE_ARGS+= -DENABLE_GLIB=OFF CMAKE_ARGS+= -DENABLE_UTILS=OFF @@ -30,6 +29,7 @@ pre-build: post-install: ${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc ${DESTDIR}${PREFIX}/lib/pkgconfig +.include "../../devel/boost-headers/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/poppler-qt5/PLIST b/print/poppler-qt5/PLIST index 717e05ddc28..2da80d1d9ff 100644 --- a/print/poppler-qt5/PLIST +++ b/print/poppler-qt5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2019/07/23 16:45:18 wiz Exp $ +@comment $NetBSD: PLIST,v 1.11 2019/10/19 12:37:05 nia Exp $ include/poppler/qt5/poppler-annotation.h include/poppler/qt5/poppler-export.h include/poppler/qt5/poppler-form.h @@ -10,5 +10,5 @@ include/poppler/qt5/poppler-qt5.h include/poppler/qt5/poppler-version.h lib/libpoppler-qt5.so lib/libpoppler-qt5.so.1 -lib/libpoppler-qt5.so.1.20.0 +lib/libpoppler-qt5.so.1.21.0 lib/pkgconfig/poppler-qt5.pc diff --git a/print/poppler-qt5/buildlink3.mk b/print/poppler-qt5/buildlink3.mk index d3d4dd71087..66485a93311 100644 --- a/print/poppler-qt5/buildlink3.mk +++ b/print/poppler-qt5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.32 2019/07/23 17:19:57 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.33 2019/10/19 12:37:05 nia Exp $ BUILDLINK_TREE+= poppler-qt5 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= poppler-qt5 POPPLER_QT5_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poppler-qt5+= poppler-qt5>=0.26.0 -BUILDLINK_ABI_DEPENDS.poppler-qt5+= poppler-qt5>=0.79.0 +BUILDLINK_ABI_DEPENDS.poppler-qt5+= poppler-qt5>=0.81.0 BUILDLINK_PKGSRCDIR.poppler-qt5?= ../../print/poppler-qt5 .include "../../print/poppler/buildlink3.mk" diff --git a/print/poppler-utils/DESCR b/print/poppler-utils/DESCR index 1965d69d5d7..00ee47b253e 100644 --- a/print/poppler-utils/DESCR +++ b/print/poppler-utils/DESCR @@ -7,6 +7,5 @@ pdffonts - lists fonts used in PDF files with details pdfimages - saves images from a PDF file as PPM, PBM or JPEG pdfinfo - prints document information from 'Info' dictionary pdftohtml - convert PDF files into HTML, XML and PNG images -pdftoppm - converts PDF files to PPM, PGM, or PBM image files pdftops - converts a PDF file to PostScript pdftotext - converts a PDF file to plain text diff --git a/print/poppler-utils/Makefile b/print/poppler-utils/Makefile index 5e86875fe46..1ee6c64e9a7 100644 --- a/print/poppler-utils/Makefile +++ b/print/poppler-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2019/05/09 09:28:22 adam Exp $ +# $NetBSD: Makefile,v 1.44 2019/10/19 12:37:05 nia Exp $ .include "../../print/poppler/Makefile.common" @@ -8,8 +8,8 @@ COMMENT= PDF utilities (from poppler) CONFLICTS+= poppler-0.5.1{,nb*} CONFLICTS+= xpdf<3.02pl4nb1 -# Build the splash graphics backend. ## for pdftoppm -CMAKE_ARGS+= -DENABLE_SPLASH=ON +# Don't build the splash graphics backend. +CMAKE_ARGS+= -DENABLE_SPLASH=OFF # Don't compile GTK+ test program. CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF # Don't compile GLib wrapper which also needs gtk2 diff --git a/print/poppler-utils/PLIST b/print/poppler-utils/PLIST index 52c14a78846..773d97dd7ed 100644 --- a/print/poppler-utils/PLIST +++ b/print/poppler-utils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2019/05/09 09:28:22 adam Exp $ +@comment $NetBSD: PLIST,v 1.7 2019/10/19 12:37:05 nia Exp $ bin/pdfattach bin/pdfdetach bin/pdffonts @@ -7,7 +7,6 @@ bin/pdfinfo bin/pdfseparate bin/pdftocairo bin/pdftohtml -bin/pdftoppm bin/pdftops bin/pdftotext bin/pdfunite @@ -19,7 +18,6 @@ man/man1/pdfinfo.1 man/man1/pdfseparate.1 man/man1/pdftocairo.1 man/man1/pdftohtml.1 -man/man1/pdftoppm.1 man/man1/pdftops.1 man/man1/pdftotext.1 man/man1/pdfunite.1 diff --git a/print/poppler/Makefile b/print/poppler/Makefile index 411b10e0c40..f3b82440771 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -1,18 +1,16 @@ -# $NetBSD: Makefile,v 1.74 2019/07/23 16:45:18 wiz Exp $ +# $NetBSD: Makefile,v 1.75 2019/10/19 12:37:04 nia Exp $ .include "../../print/poppler/Makefile.common" COMMENT= PDF rendering library -#PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.cmake -PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-splash.pc.cmake +PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.cmake PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler.pc.cmake INSTALLATION_DIRS+= include/poppler share/doc/poppler -# TODO: Later add an option to choose Splash versus Cairo backend. -# Build the Splash graphics backend. -CMAKE_ARGS+= -DENABLE_SPLASH=ON +# Don't build the splash graphics backend. +CMAKE_ARGS+= -DENABLE_SPLASH=OFF # Don't compile GTK+ test program. CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF # Don't compile GLib wrapper which also needs gtk2 @@ -39,6 +37,7 @@ post-install: ${RMDIR} ${DESTDIR}${PREFIX}/include/poppler || ${TRUE} .include "../../fonts/fontconfig/buildlink3.mk" +.include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/lcms2/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common index 9e43e2c25dd..5350966785d 100644 --- a/print/poppler/Makefile.common +++ b/print/poppler/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.111 2019/07/23 16:45:18 wiz Exp $ +# $NetBSD: Makefile.common,v 1.112 2019/10/19 12:37:04 nia Exp $ # # used by print/poppler/Makefile # used by print/poppler-cpp/Makefile @@ -7,7 +7,7 @@ # used by print/poppler-qt5/Makefile # used by print/poppler-utils/Makefile -POPPLER_VERS= 0.79.0 +POPPLER_VERS= 0.81.0 DISTNAME= poppler-${POPPLER_VERS} CATEGORIES= print MASTER_SITES= https://poppler.freedesktop.org/ diff --git a/print/poppler/PLIST b/print/poppler/PLIST index a4f05f55d6d..046ffd9a055 100644 --- a/print/poppler/PLIST +++ b/print/poppler/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.22 2019/07/23 16:45:18 wiz Exp $ +@comment $NetBSD: PLIST,v 1.23 2019/10/19 12:37:04 nia Exp $ lib/libpoppler.so -lib/libpoppler.so.89 -lib/libpoppler.so.89.0.0 -lib/pkgconfig/poppler-splash.pc +lib/libpoppler.so.91 +lib/libpoppler.so.91.0.0 +lib/pkgconfig/poppler-cairo.pc lib/pkgconfig/poppler.pc share/doc/poppler/README.md share/doc/poppler/README-XPDF diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk index 66ed796dcc9..1e00cf85bf1 100644 --- a/print/poppler/buildlink3.mk +++ b/print/poppler/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.75 2019/09/09 11:05:00 maya Exp $ +# $NetBSD: buildlink3.mk,v 1.76 2019/10/19 12:37:04 nia Exp $ BUILDLINK_TREE+= poppler @@ -6,11 +6,12 @@ BUILDLINK_TREE+= poppler POPPLER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poppler+= poppler>=0.5.1 -BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.79.0 +BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.81.0 BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler GCC_REQD+= 5 +.include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/lcms2/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 57cc39a0dab..a5bcdc1c633 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.139 2019/07/23 16:45:18 wiz Exp $ +$NetBSD: distinfo,v 1.140 2019/10/19 12:37:04 nia Exp $ -SHA1 (poppler-0.79.0.tar.xz) = ce6bcc5e474b524e206469640543e98fa4babbba -RMD160 (poppler-0.79.0.tar.xz) = 3b276167632bd3993c2e3531e7a0a1fbab42ea52 -SHA512 (poppler-0.79.0.tar.xz) = f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9 -Size (poppler-0.79.0.tar.xz) = 1544140 bytes +SHA1 (poppler-0.81.0.tar.xz) = 3b3e5b5a29ab88d573eaa35148a4eb242f41dc1c +RMD160 (poppler-0.81.0.tar.xz) = 3eb610e4dd3f7b2baca949c99c4425f24a552cf0 +SHA512 (poppler-0.81.0.tar.xz) = 774d650c63afe2a0d6669daad4b286c2412a0c02581d7ea2cc37d71936f77dff92dc22217367561b7e4285c9c27dcfdca4c76c187d9c3c482db2f3549919b25b +Size (poppler-0.81.0.tar.xz) = 1548944 bytes SHA1 (patch-poppler_CMap.cc) = d37745ea4cbeae76ad43c4ac74e942531f7b7dd8 -- cgit v1.2.3