diff options
| author | spz <spz@pkgsrc.org> | 2017-12-08 07:48:11 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2017-12-08 07:48:11 +0000 |
| commit | e0d31d00444cf97bdd0dffdda31266ddae636bee (patch) | |
| tree | a8cb145b3feb1161a2852730e902beb5c7d24108 | |
| parent | e75e243767be7a3bf2bae3d8e6384805e271542d (diff) | |
| download | pkgsrc-e0d31d00444cf97bdd0dffdda31266ddae636bee.tar.gz | |
Update poppler packages from 0.59.0 to 0.61.1
fixing CVE-2017-14517 CVE-2017-14518 CVE-2017-14519 CVE-2017-14520
CVE-2017-15565
upstream notable changes:
Release 0.61.1
core:
* CairoOutputDev: don't overflow y * stride when accessing image data
cpp:
* Fix for corrupted image files on Windows. Bug #102494
build system:
* Fix incorrect paths in .pc files. Bug #103578
* add the custom buildtests target only once. Bug #103003
Release 0.61.0
core:
* Fix crashes in broken files
* Cleanup unused functions from GlobalParams
* Tweak LZWStream::processNextCode error handling. Bug #103174
* Warning fixes
* Remove t1lib code
qt5:
* Clean up the remaining Splash code in Arthur backend. Bug #103117
* ArthurOutputDev: Properly implement saveState/restoreState. Bug #103118
* Fix leak in ArthurOutputDev::updateFont. Bug #103508
build system:
* Use GNUInstallDirs. Bug #103211
* mingw: Install pkg-config files
* mingw: change library names to include the soversion. Bug #103157
* Fix installing a .cc file as header
* Use -pthread flag instead of -lpthread
Release 0.60.1
qt5:
* ArthurOutputDev: Add missing 'return' in error paths
build system:
* FindLIBOPENJPEG.cmake: Add CheckCXXSourceCompiles
Release 0.60.0
core:
* Enable libcurl support by default
* PSOutputDev: Fix wrong text generation. Bug #102760
* Added methods to get and set the font size of text fields. Bug #101692
* CairoOutputDev: Do not extend the pattern in drawImageMaskRegular
* CairoOutputDev: do not use the custom downscaling for rendering images when using cairo >= 1.14
* Fix build with old clang
* Fix various crashes in broken files
* Fix some warnings
* Add some constness to the basic classes
* Remove unused functions from GlobalParams
qt5:
* Added methods to get and set the font size of text fields. Bug #101692
* Add whether renderToImage shows annotations
* ArthurOutputDev: Replace Splash font rendering by Qt font rendering
* ArthurOutputDev: Implement the drawSoftMaskedImage method
* ArthurOutputDev: Fix several small bugs related to dash pattern handling
* Fix two minor typos
build system:
* cmake is now the default build system
* autotools based build system has been removed
utils:
* pdfinfo: don't truncate dest name
27 files changed, 184 insertions, 419 deletions
diff --git a/print/poppler-cpp/Makefile b/print/poppler-cpp/Makefile index 7e10b0c79e2..ba04092958c 100644 --- a/print/poppler-cpp/Makefile +++ b/print/poppler-cpp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2017/08/14 19:26:04 nros Exp $ +# $NetBSD: Makefile,v 1.14 2017/12/08 07:48:12 spz Exp $ .include "../../print/poppler/Makefile.common" @@ -9,20 +9,26 @@ MAINTAINER= reed@reedmedia.net CONFLICTS+= poppler<0.4.5nb1 -GNU_CONFIGURE= yes -USE_TOOLS+= gmake -PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cpp.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cpp.pc.cmake -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} # Don't build the cairo graphics backend, required by glib. -CONFIGURE_ARGS+= --disable-cairo-output -# Don't build the splash graphics backend. -CONFIGURE_ARGS+= --disable-splash-output -# Don't compile poppler qt wrapper. -CONFIGURE_ARGS+= --disable-poppler-qt +CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=TRUE +# Don't build the cairo graphics backend, required by glib. +CMAKE_ARGS+= -DENABLE_SPLASH=OFF # Don't compile GTK+ test program. -CONFIGURE_ARGS+= --disable-gtk-test -CONFIGURE_ARGS+= --disable-utils +CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF +# Don't compile GLib wrapper which also needs gtk2 +CMAKE_ARGS+= -DENABLE_GLIB=OFF +# Don't build and install the tools +CMAKE_ARGS+= -DENABLE_UTILS=OFF +# Compile poppler cpp wrapper. +CMAKE_ARGS+= -DENABLE_CPP=ON +# Don't compile poppler qt4 wrapper. +CMAKE_ARGS+= -DENABLE_QT4=OFF +# Don't compile poppler qt5 wrapper. +CMAKE_ARGS+= -DENABLE_QT5=OFF +# Don't build libcurl based HTTP support. ## might want to include +CMAKE_ARGS+= -DENABLE_LIBCURL=OFF BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*} .include "../../print/poppler/buildlink3.mk" @@ -39,9 +45,8 @@ CHECK_BUILTIN.iconv:= yes CHECK_BUILTIN.iconv:= no .if !empty(USE_BUILTIN.iconv:M[nN][oO]) -CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} -.else -CONFIGURE_ARGS+= --with-libiconv-prefix +CMAKE_ARGS+= -DICONV_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.iconv}/include +CMAKE_ARGS+= -DICONV_LIBRARIES:PATH=${BUILDLINK_PREFIX.iconv}/lib .endif post-install: diff --git a/print/poppler-cpp/PLIST b/print/poppler-cpp/PLIST index 631f9d93b5e..1c390993a75 100644 --- a/print/poppler-cpp/PLIST +++ b/print/poppler-cpp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2011/10/20 16:32:57 drochner Exp $ +@comment $NetBSD: PLIST,v 1.2 2017/12/08 07:48:12 spz Exp $ include/poppler/cpp/poppler-document.h include/poppler/cpp/poppler-embedded-file.h include/poppler/cpp/poppler-font.h @@ -10,5 +10,7 @@ include/poppler/cpp/poppler-page.h include/poppler/cpp/poppler-rectangle.h include/poppler/cpp/poppler-toc.h include/poppler/cpp/poppler-version.h -lib/libpoppler-cpp.la +lib/libpoppler-cpp.so +lib/libpoppler-cpp.so.0 +lib/libpoppler-cpp.so.0.3.0 lib/pkgconfig/poppler-cpp.pc diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile index 4e431abd8a5..4eb19993e0e 100644 --- a/print/poppler-glib/Makefile +++ b/print/poppler-glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2017/10/15 23:19:12 prlw1 Exp $ +# $NetBSD: Makefile,v 1.66 2017/12/08 07:48:12 spz Exp $ .include "../../print/poppler/Makefile.common" @@ -9,28 +9,39 @@ MAINTAINER= reed@reedmedia.net CONFLICTS+= poppler<0.4.5nb1 -GNU_CONFIGURE= yes -USE_TOOLS+= gmake -PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-glib.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-glib.pc.cmake + +USE_TOOLS+= python -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} # Build the cairo graphics backend, required by glib. -CONFIGURE_ARGS+= --enable-cairo-output +CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=FALSE # Don't build the splash graphics backend. -CONFIGURE_ARGS+= --disable-splash-output -# Don't compile poppler qt wrapper. -CONFIGURE_ARGS+= --disable-poppler-qt +CMAKE_ARGS+= -DENABLE_SPLASH=OFF # Don't compile GTK+ test program. -CONFIGURE_ARGS+= --disable-gtk-test -CONFIGURE_ARGS+= --disable-utils -CONFIGURE_ARGS+= --disable-poppler-cpp +CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF +# Compile GLib wrapper which also needs gtk2 +CMAKE_ARGS+= -DENABLE_GLIB=ON +# Generate glib API documentation. +CMAKE_ARGS+= -DENABLE_GTK_DOC=ON +# Don't build and install the tools +CMAKE_ARGS+= -DENABLE_UTILS=OFF +# Don't compile poppler cpp wrapper. +CMAKE_ARGS+= -DENABLE_CPP=OFF +# Don't compile poppler qt4 wrapper. +CMAKE_ARGS+= -DENABLE_QT4=OFF +# Don't compile poppler qt5 wrapper. +CMAKE_ARGS+= -DENABLE_QT5=OFF +# Don't build libcurl based HTTP support. ## might want to include +CMAKE_ARGS+= -DENABLE_LIBCURL=OFF + +# enable for verbose build messages +#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE CFLAGS.FreeBSD+= -DLLONG_MAX=__LLONG_MAX BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*} .include "../../print/poppler/buildlink3.mk" -BUILD_DIRS= goo fofi poppler glib INSTALL_DIRS= glib INSTALLATION_DIRS+= lib/pkgconfig @@ -39,8 +50,10 @@ 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" BUILDLINK_ABI_DEPENDS.glib2+= glib2>=2.41.0 .include "../../devel/glib2/buildlink3.mk" +.include "../../textproc/gtk-doc/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/print/poppler-glib/PLIST b/print/poppler-glib/PLIST index ec9274907a7..6ab5b288b60 100644 --- a/print/poppler-glib/PLIST +++ b/print/poppler-glib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2016/08/01 14:11:12 wiz Exp $ +@comment $NetBSD: PLIST,v 1.22 2017/12/08 07:48:12 spz Exp $ include/poppler/glib/poppler-action.h include/poppler/glib/poppler-annot.h include/poppler/glib/poppler-attachment.h @@ -13,11 +13,15 @@ include/poppler/glib/poppler-movie.h include/poppler/glib/poppler-page.h include/poppler/glib/poppler-structure-element.h include/poppler/glib/poppler.h -lib/libpoppler-glib.la +lib/libpoppler-glib.so +lib/libpoppler-glib.so.8 +lib/libpoppler-glib.so.8.9.0 lib/pkgconfig/poppler-cairo.pc lib/pkgconfig/poppler-glib.pc +share/gtk-doc/html/poppler/PopplerAction.html share/gtk-doc/html/poppler/PopplerAnnot.html share/gtk-doc/html/poppler/PopplerAttachment.html +share/gtk-doc/html/poppler/PopplerColor.html share/gtk-doc/html/poppler/PopplerDocument.html share/gtk-doc/html/poppler/PopplerFormField.html share/gtk-doc/html/poppler/PopplerLayer.html @@ -44,9 +48,8 @@ share/gtk-doc/html/poppler/left-insensitive.png share/gtk-doc/html/poppler/left.png share/gtk-doc/html/poppler/poppler-Error-handling.html share/gtk-doc/html/poppler/poppler-PDF-Utility-functions.html -share/gtk-doc/html/poppler/poppler-PopplerAction.html -share/gtk-doc/html/poppler/poppler-PopplerColor.html share/gtk-doc/html/poppler/poppler-Version-and-Features-Information.html +share/gtk-doc/html/poppler/poppler-poppler-features.html share/gtk-doc/html/poppler/poppler.devhelp2 share/gtk-doc/html/poppler/right-insensitive.png share/gtk-doc/html/poppler/right.png diff --git a/print/poppler-includes/Makefile b/print/poppler-includes/Makefile index ec3487772fd..61629f14eec 100644 --- a/print/poppler-includes/Makefile +++ b/print/poppler-includes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2017/05/22 08:40:10 adam Exp $ +# $NetBSD: Makefile,v 1.19 2017/12/08 07:48:12 spz Exp $ .include "../../print/poppler/Makefile.common" @@ -9,28 +9,34 @@ MAINTAINER= pkgsrc-users@NetBSD.org CONFLICTS+= poppler-0.5.1 poppler-0.5.1nb1 poppler-0.5.1nb2 -GNU_CONFIGURE= yes NO_BUILD= yes +CMAKE_ARGS+= -DENABLE_XPDF_HEADERS=ON + INCDIR=${DESTDIR}${PREFIX}/include .include "../../mk/bsd.prefs.mk" do-install: ${INSTALL_DATA_DIR} ${INCDIR} - for subdir in fofi poppler goo splash; \ - do \ - mf=${WRKSRC}/"$$subdir"/Makefile.am; \ - d=`sed -n -f ${FILESDIR}/dir.sed "$$mf"`; \ - ${INSTALL_DATA_DIR} ${INCDIR}/"$$d"; \ - sed -n -f ${FILESDIR}/extract.sed "$$mf" \ - | { while read f; \ - do \ - ${INSTALL_DATA} ${WRKSRC}/"$$subdir/$$f" ${INCDIR}/"$$d"; \ - done }; \ - done - ${INSTALL_DATA} ${WRKSRC}/poppler/SplashOutputDev.h ${INCDIR}/poppler + ${INSTALL_DATA_DIR} ${INCDIR}/poppler + sed -n -f $(FILESDIR)/extract.sed ${WRKSRC}/CMakeLists.txt \ + | grep ^poppler/ | { while read f; \ + do \ + ${INSTALL_DATA} ${WRKSRC}/"$$f" ${INCDIR}/poppler; \ + done }; ${INSTALL_DATA} ${WRKSRC}/poppler/poppler-config.h ${INCDIR}/poppler + for d in goo fofi splash; do \ + ${INSTALL_DATA_DIR} ${INCDIR}/poppler/"$$d"; \ + sed -n -f $(FILESDIR)/extract.sed ${WRKSRC}/CMakeLists.txt \ + | grep "^$$d/" | { while read f; \ + do \ + ${INSTALL_DATA} ${WRKSRC}/"$$f" ${INCDIR}/poppler/"$$d"; \ + done }; \ + done + # do these actually belong here? + ${INSTALL_DATA} ${WRKSRC}/poppler/SignatureInfo.h ${INCDIR}/poppler + ${INSTALL_DATA} ${WRKSRC}/goo/NetPBMWriter.h ${INCDIR}/poppler/goo BUILDLINK_DEPMETHOD.fontconfig= build .include "../../fonts/fontconfig/buildlink3.mk" diff --git a/print/poppler-includes/PLIST b/print/poppler-includes/PLIST index b6cb4ca0fc4..e44ca252a05 100644 --- a/print/poppler-includes/PLIST +++ b/print/poppler-includes/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2016/04/15 14:36:21 wiz Exp $ +@comment $NetBSD: PLIST,v 1.14 2017/12/08 07:48:12 spz Exp $ include/poppler/Annot.h include/poppler/Array.h include/poppler/BuiltinFont.h @@ -9,6 +9,8 @@ include/poppler/Catalog.h include/poppler/CharCodeToUnicode.h include/poppler/CharTypes.h include/poppler/CompactFontTables.h +include/poppler/CurlCachedFile.h +include/poppler/CurlPDFDocBuilder.h include/poppler/DateInfo.h include/poppler/Decrypt.h include/poppler/Dict.h @@ -27,6 +29,8 @@ include/poppler/GlobalParams.h include/poppler/Hints.h include/poppler/JArithmeticDecoder.h include/poppler/JBIG2Stream.h +include/poppler/JPEG2000Stream.h +include/poppler/JPXStream.h include/poppler/Lexer.h include/poppler/Linearization.h include/poppler/Link.h @@ -115,9 +119,6 @@ include/poppler/splash/SplashPath.h include/poppler/splash/SplashPattern.h include/poppler/splash/SplashScreen.h include/poppler/splash/SplashState.h -include/poppler/splash/SplashT1Font.h -include/poppler/splash/SplashT1FontEngine.h -include/poppler/splash/SplashT1FontFile.h include/poppler/splash/SplashTypes.h include/poppler/splash/SplashXPath.h include/poppler/splash/SplashXPathScanner.h diff --git a/print/poppler-includes/files/dir.sed b/print/poppler-includes/files/dir.sed deleted file mode 100644 index a6008505d7e..00000000000 --- a/print/poppler-includes/files/dir.sed +++ /dev/null @@ -1,3 +0,0 @@ -1,/if ENABLE_XPDF_HEADERS/ d -/endif/,$ d -s,^[a-z_]*_includedir = ..includedir./,,p diff --git a/print/poppler-includes/files/extract.sed b/print/poppler-includes/files/extract.sed index f1c7c6a2147..bda4a416376 100644 --- a/print/poppler-includes/files/extract.sed +++ b/print/poppler-includes/files/extract.sed @@ -1,3 +1,3 @@ -1,/if ENABLE_XPDF_HEADERS/ d -/endif/,$ d -s/ \([A-Za-z0-9_-]*\.h\).*/\1/p +1,/if(ENABLE_XPDF_HEADERS)/ d +/^endif/,$ d +s/^ *\([a-z]*\/[A-Za-z0-9_-]*\.h\).*/\1/p diff --git a/print/poppler-qt4/Makefile b/print/poppler-qt4/Makefile index 4a3efaff229..3397c9d8f18 100644 --- a/print/poppler-qt4/Makefile +++ b/print/poppler-qt4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2016/04/15 14:36:21 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2017/12/08 07:48:12 spz Exp $ .include "../../print/poppler/Makefile.common" @@ -6,12 +6,18 @@ PKGNAME= poppler-qt4-${POPPLER_VERS} COMMENT= PDF rendering library (QT4 wrapper) MAINTAINER= reed@reedmedia.net -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --disable-cairo-output -CONFIGURE_ARGS+= --enable-poppler-qt4 -CONFIGURE_ARGS+= --disable-gtk-test -CONFIGURE_ARGS+= --disable-utils -CONFIGURE_ENV+= MOCQT4=${QTDIR}/bin/moc +CMAKE_ARGS+= -DENABLE_SPLASH=ON +CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=TRUE +CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF +CMAKE_ARGS+= -DENABLE_GLIB=OFF +CMAKE_ARGS+= -DENABLE_UTILS=OFF +CMAKE_ARGS+= -DENABLE_CPP=OFF +CMAKE_ARGS+= -DENABLE_QT4=ON +CMAKE_ARGS+= -DENABLE_QT5=OFF +# Don't build libcurl based HTTP support. ## might want to include +CMAKE_ARGS+= -DENABLE_LIBCURL=OFF + +CMAKE_ARGS+= -DMOCQT4=${QTDIR}/bin/moc BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS} .include "../../print/poppler/buildlink3.mk" diff --git a/print/poppler-qt4/PLIST b/print/poppler-qt4/PLIST index ed8ba66f3f7..ba5c8b06a47 100644 --- a/print/poppler-qt4/PLIST +++ b/print/poppler-qt4/PLIST @@ -1,12 +1,13 @@ -@comment $NetBSD: PLIST,v 1.8 2017/01/25 14:34:56 wiz Exp $ +@comment $NetBSD: PLIST,v 1.9 2017/12/08 07:48:12 spz Exp $ include/poppler/qt4/poppler-annotation.h include/poppler/qt4/poppler-export.h include/poppler/qt4/poppler-form.h -include/poppler/qt4/poppler-link-private.h include/poppler/qt4/poppler-link.h include/poppler/qt4/poppler-media.h include/poppler/qt4/poppler-optcontent.h include/poppler/qt4/poppler-page-transition.h include/poppler/qt4/poppler-qt4.h -lib/libpoppler-qt4.la +lib/libpoppler-qt4.so +lib/libpoppler-qt4.so.4 +lib/libpoppler-qt4.so.4.11.0 lib/pkgconfig/poppler-qt4.pc diff --git a/print/poppler-qt5/Makefile b/print/poppler-qt5/Makefile index ec818f5f903..b9d429b0f79 100644 --- a/print/poppler-qt5/Makefile +++ b/print/poppler-qt5/Makefile @@ -1,21 +1,23 @@ -# $NetBSD: Makefile,v 1.18 2017/11/30 16:45:36 adam Exp $ +# $NetBSD: Makefile,v 1.19 2017/12/08 07:48:12 spz Exp $ -PKGREVISION= 2 .include "../../print/poppler/Makefile.common" PKGNAME= poppler-qt5-${POPPLER_VERS} COMMENT= PDF rendering library (QT5 wrapper) MAINTAINER= pkgsrc-users@NetBSD.org -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --disable-cairo-output -CONFIGURE_ARGS+= --enable-poppler-qt5 -CONFIGURE_ARGS+= --disable-poppler-qt4 -CONFIGURE_ARGS+= --disable-gtk-test -CONFIGURE_ARGS+= --disable-utils -CONFIGURE_ENV+= MOCQT5=${QTDIR}/bin/moc - -USE_TOOLS+= gmake +CMAKE_ARGS+= -DENABLE_SPLASH=ON +CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=TRUE +CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF +CMAKE_ARGS+= -DENABLE_GLIB=OFF +CMAKE_ARGS+= -DENABLE_UTILS=OFF +CMAKE_ARGS+= -DENABLE_CPP=OFF +CMAKE_ARGS+= -DENABLE_QT4=OFF +CMAKE_ARGS+= -DENABLE_QT5=ON +# Don't build libcurl based HTTP support. ## might want to include +CMAKE_ARGS+= -DENABLE_LIBCURL=OFF + +CMAKE_ARGS+= -DMOCQT5=${QTDIR}/bin/moc BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS} .include "../../print/poppler/buildlink3.mk" diff --git a/print/poppler-qt5/PLIST b/print/poppler-qt5/PLIST index f73866e4575..bef0a9d0024 100644 --- a/print/poppler-qt5/PLIST +++ b/print/poppler-qt5/PLIST @@ -1,12 +1,13 @@ -@comment $NetBSD: PLIST,v 1.2 2017/01/25 14:34:56 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2017/12/08 07:48:12 spz Exp $ include/poppler/qt5/poppler-annotation.h include/poppler/qt5/poppler-export.h include/poppler/qt5/poppler-form.h -include/poppler/qt5/poppler-link-private.h include/poppler/qt5/poppler-link.h include/poppler/qt5/poppler-media.h include/poppler/qt5/poppler-optcontent.h include/poppler/qt5/poppler-page-transition.h include/poppler/qt5/poppler-qt5.h -lib/libpoppler-qt5.la +lib/libpoppler-qt5.so +lib/libpoppler-qt5.so.1 +lib/libpoppler-qt5.so.1.11.0 lib/pkgconfig/poppler-qt5.pc diff --git a/print/poppler-utils/Makefile b/print/poppler-utils/Makefile index 68948267b57..21818e0681f 100644 --- a/print/poppler-utils/Makefile +++ b/print/poppler-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2017/07/11 16:35:03 adam Exp $ +# $NetBSD: Makefile,v 1.35 2017/12/08 07:48:12 spz Exp $ .include "../../print/poppler/Makefile.common" @@ -9,26 +9,27 @@ MAINTAINER= reed@reedmedia.net CONFLICTS+= poppler-0.5.1 poppler-0.5.1nb1 poppler-0.5.1nb2 CONFLICTS+= xpdf<3.02pl4nb1 -GNU_CONFIGURE= yes -USE_TOOLS+= gmake - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -# Don't build the splash graphics backend. -CONFIGURE_ARGS+= --disable-splash-output -# Don't compile poppler qt wrapper. -CONFIGURE_ARGS+= --disable-poppler-qt +# Build the splash graphics backend. ## for pdftoppm +CMAKE_ARGS+= -DENABLE_SPLASH=ON # Don't compile GTK+ test program. -CONFIGURE_ARGS+= --disable-gtk-test +CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF # Don't compile GLib wrapper which also needs gtk2 -CONFIGURE_ARGS+= --disable-poppler-glib -# Enable build and install of the tools -CONFIGURE_ARGS+= --enable-utils # the default +CMAKE_ARGS+= -DENABLE_GLIB=OFF +# Build and install the tools +CMAKE_ARGS+= -DENABLE_UTILS=ON +# Don't compile poppler cpp wrapper. +CMAKE_ARGS+= -DENABLE_CPP=OFF +# Don't compile poppler qt4 wrapper. +CMAKE_ARGS+= -DENABLE_QT4=OFF +# Don't compile poppler qt5 wrapper. +CMAKE_ARGS+= -DENABLE_QT5=OFF +# Don't build libcurl based HTTP support. ## might want to include +CMAKE_ARGS+= -DENABLE_LIBCURL=OFF + BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS} .include "../../print/poppler/buildlink3.mk" -# needed to build libpoppler-cairo -BUILD_DIRS= fofi goo poppler utils INSTALL_DIRS= utils .include "../../mk/bsd.prefs.mk" diff --git a/print/poppler/Makefile b/print/poppler/Makefile index 2a94267f6d1..8d11c4c805b 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -1,32 +1,35 @@ -# $NetBSD: Makefile,v 1.66 2013/10/29 19:05:23 drochner Exp $ +# $NetBSD: Makefile,v 1.67 2017/12/08 07:48:11 spz Exp $ .include "../../print/poppler/Makefile.common" COMMENT= PDF rendering library MAINTAINER= reed@reedmedia.net -USE_TOOLS+= gmake - -#PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-splash.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler.pc.in -GNU_CONFIGURE= yes +#PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.cmake +PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-splash.pc.cmake +PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler.pc.cmake INSTALLATION_DIRS+= include/poppler share/doc/poppler -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} # TODO: Later add an option to choose Splash versus Cairo backend. # Build the Splash graphics backend. -CONFIGURE_ARGS+= --enable-splash-output -# Don't build the cairo graphics backend. -CONFIGURE_ARGS+= --disable-cairo-output +CMAKE_ARGS+= -DENABLE_SPLASH=ON +CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_CAIRO=TRUE # Don't compile GTK+ test program. -CONFIGURE_ARGS+= --disable-gtk-test +CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF # Don't compile GLib wrapper which also needs gtk2 -CONFIGURE_ARGS+= --disable-poppler-glib +CMAKE_ARGS+= -DENABLE_GLIB=OFF # Don't build and install the tools -CONFIGURE_ARGS+= --disable-utils -CONFIGURE_ARGS+= --disable-poppler-cpp +CMAKE_ARGS+= -DENABLE_UTILS=OFF +# Don't compile poppler cpp wrapper. +CMAKE_ARGS+= -DENABLE_CPP=OFF +# Don't compile poppler qt4 wrapper. +CMAKE_ARGS+= -DENABLE_QT4=OFF +# Don't compile poppler qt5 wrapper. +CMAKE_ARGS+= -DENABLE_QT5=OFF +# Don't build libcurl based HTTP support. ## might want to include +CMAKE_ARGS+= -DENABLE_LIBCURL=OFF + .include "../../mk/bsd.prefs.mk" diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common index 6c838e2fe65..75ba1f0b1aa 100644 --- a/print/poppler/Makefile.common +++ b/print/poppler/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.92 2017/09/04 19:57:18 ryoon Exp $ +# $NetBSD: Makefile.common,v 1.93 2017/12/08 07:48:11 spz Exp $ # # used by print/poppler/Makefile # used by print/poppler-cpp/Makefile @@ -8,7 +8,7 @@ # used by print/poppler-qt5/Makefile # used by print/poppler-utils/Makefile -POPPLER_VERS= 0.59.0 +POPPLER_VERS= 0.61.1 DISTNAME= poppler-${POPPLER_VERS} CATEGORIES= print MASTER_SITES= https://poppler.freedesktop.org/ @@ -24,8 +24,10 @@ USE_TOOLS+= pkg-config USE_LIBTOOL= yes USE_LANGUAGES= c c++ +USE_CMAKE= yes + # Don't accidentally find libtiff -CONFIGURE_ARGS+= --disable-libtiff +CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) diff --git a/print/poppler/PLIST b/print/poppler/PLIST index 2e6c9023261..006a2c3d93b 100644 --- a/print/poppler/PLIST +++ b/print/poppler/PLIST @@ -1,5 +1,7 @@ -@comment $NetBSD: PLIST,v 1.7 2009/06/14 21:16:22 joerg Exp $ -lib/libpoppler.la +@comment $NetBSD: PLIST,v 1.8 2017/12/08 07:48:11 spz Exp $ +lib/libpoppler.so +lib/libpoppler.so.72 +lib/libpoppler.so.72.0.0 lib/pkgconfig/poppler-splash.pc lib/pkgconfig/poppler.pc share/doc/poppler/README diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk index 9bc93202244..47350563c98 100644 --- a/print/poppler/buildlink3.mk +++ b/print/poppler/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.56 2017/09/04 19:57:18 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.57 2017/12/08 07:48:11 spz Exp $ BUILDLINK_TREE+= poppler @@ -6,7 +6,7 @@ BUILDLINK_TREE+= poppler POPPLER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poppler+= poppler>=0.5.1 -BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.59.0 +BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.61.0 BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler .include "../../graphics/lcms2/buildlink3.mk" diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 8194abc0189..746722805d2 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,15 +1,8 @@ -$NetBSD: distinfo,v 1.122 2017/09/20 15:21:10 jperkin Exp $ +$NetBSD: distinfo,v 1.123 2017/12/08 07:48:11 spz Exp $ -SHA1 (poppler-0.59.0.tar.xz) = 1b7d0a22aaf9a472181823ee9b38439471a4b045 -RMD160 (poppler-0.59.0.tar.xz) = 8e0c2861dba339f911713d86ebbf97207c2de5dc -SHA512 (poppler-0.59.0.tar.xz) = 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e -Size (poppler-0.59.0.tar.xz) = 1712004 bytes -SHA1 (patch-aa) = f97ea3f4d381c189fc81552d91a50cd62bd0c1a1 -SHA1 (patch-ab) = 5424a59d53c64ef3a40c569aac3111ce7c32dfbc -SHA1 (patch-ag) = d4df4fdf141186e1cc653bb467b31b3335d733ff +SHA1 (poppler-0.61.1.tar.xz) = 70a3440e0ac9957cee94ff6a56a173f3377b02ba +RMD160 (poppler-0.61.1.tar.xz) = 62fa0f917e31e0c733228ea9289b4493a0fc29a8 +SHA512 (poppler-0.61.1.tar.xz) = 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d +Size (poppler-0.61.1.tar.xz) = 1433696 bytes SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa -SHA1 (patch-ar) = b064ff2dc9080ff5f1a1361e7798480ace11f3a3 -SHA1 (patch-as) = 1238357e57fa310ba9c9f00768c46074b8325739 -SHA1 (patch-poppler_Form.cc) = 6a5c85b80b8bbcd9d9d3bafcfa07857c8a2cd06b -SHA1 (patch-poppler_StructElement.cc) = 59c3c1c5e91d315cc443a4c455de3d1cd63c24c4 -SHA1 (patch-qt5_src_Makefile.in) = c3a47fde201d61a7b7674020f5c998173a61b216 +SHA1 (patch-gtkdoc.py) = 22f12d2eabfa0bff78dc88f87cd6d7bf536c8056 diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa deleted file mode 100644 index 7aea66b7241..00000000000 --- a/print/poppler/patches/patch-aa +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-aa,v 1.17 2016/05/22 18:17:17 wiz Exp $ - -Use installed copy of poppler library so we can have a separate -poppler-glib package. - ---- glib/Makefile.in.orig 2016-05-21 16:59:38.000000000 +0000 -+++ glib/Makefile.in -@@ -143,7 +143,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libpoppler_glib_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ $(prefix)/lib/libpoppler.la \ - $(top_builddir)/poppler/libpoppler-cairo.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -@@ -569,7 +569,7 @@ libpoppler_glib_la_CPPFLAGS = \ - $(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES) - - libpoppler_glib_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ $(prefix)/lib/libpoppler.la \ - $(top_builddir)/poppler/libpoppler-cairo.la \ - $(PTHREAD_LIBS) \ - $(POPPLER_GLIB_LIBS) \ diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab deleted file mode 100644 index 0577ffa8f4d..00000000000 --- a/print/poppler/patches/patch-ab +++ /dev/null @@ -1,131 +0,0 @@ -$NetBSD: patch-ab,v 1.22 2017/09/04 15:08:29 wiz Exp $ - -Use installed poppler library so we can have a separate poppler-utils -package. - -Always build pdftoppm. - ---- utils/Makefile.in.orig 2017-09-01 18:15:13.000000000 +0000 -+++ utils/Makefile.in -@@ -96,10 +96,10 @@ host_triplet = @host@ - @BUILD_UTILS_TRUE@ pdfunite$(EXEEXT) $(am__EXEEXT_1) \ - @BUILD_UTILS_TRUE@ $(am__EXEEXT_2) $(am__EXEEXT_3) - @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__append_1 = pdfsig --@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_2 = pdftoppm -+am__append_2 = pdftoppm - @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_3 = pdftocairo - @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__append_4 = pdfsig.1 --@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_5 = pdftoppm.1 -+am__append_5 = pdftoppm.1 - @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_6 = pdftocairo.1 - @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_7 = $(LCMS_CFLAGS) - @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_8 = $(LCMS_LIBS) -@@ -129,8 +129,8 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent - am__v_lt_1 = - @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_1 = pdfsig$(EXEEXT) --@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_2 = \ --@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@ pdftoppm$(EXEEXT) -+am__EXEEXT_2 = \ -+ pdftoppm$(EXEEXT) - @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_3 = pdftocairo$(EXEEXT) - am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" - PROGRAMS = $(bin_PROGRAMS) -@@ -138,34 +138,34 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX - pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS) - pdfdetach_LDADD = $(LDADD) - pdfdetach_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+ $(prefix)/lib/libpoppler.la - am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) - pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) - pdffonts_LDADD = $(LDADD) - pdffonts_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+ $(prefix)/lib/libpoppler.la - am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ - JSInfo.$(OBJEXT) - pdfimages_OBJECTS = $(am_pdfimages_OBJECTS) - pdfimages_LDADD = $(LDADD) - pdfimages_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+ $(prefix)/lib/libpoppler.la - am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \ - JSInfo.$(OBJEXT) - pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS) - pdfinfo_LDADD = $(LDADD) - pdfinfo_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+ $(prefix)/lib/libpoppler.la - am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) - pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS) - pdfseparate_LDADD = $(LDADD) - pdfseparate_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+ $(prefix)/lib/libpoppler.la - am_pdfsig_OBJECTS = pdfsig-pdfsig.$(OBJEXT) - pdfsig_OBJECTS = $(am_pdfsig_OBJECTS) - pdfsig_LDADD = $(LDADD) - pdfsig_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+ $(prefix)/lib/libpoppler.la - pdfsig_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdfsig_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@@ -173,7 +173,7 @@ am_pdftocairo_OBJECTS = pdftocairo-pdfto - pdftocairo-pdftocairo-win32.$(OBJEXT) - pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS) - am__DEPENDENCIES_1 = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+ $(prefix)/lib/libpoppler.la - am__DEPENDENCIES_2 = - @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \ - @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2) -@@ -187,7 +187,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht - pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) - pdftohtml_LDADD = $(LDADD) - pdftohtml_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+ $(prefix)/lib/libpoppler.la - pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@@ -195,22 +195,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) - pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS) - pdftoppm_LDADD = $(LDADD) - pdftoppm_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+ $(prefix)/lib/libpoppler.la - am_pdftops_OBJECTS = pdftops.$(OBJEXT) - pdftops_OBJECTS = $(am_pdftops_OBJECTS) - pdftops_LDADD = $(LDADD) - pdftops_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+ $(prefix)/lib/libpoppler.la - am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) - pdftotext_OBJECTS = $(am_pdftotext_OBJECTS) - pdftotext_LDADD = $(LDADD) - pdftotext_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+ $(prefix)/lib/libpoppler.la - am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) - pdfunite_OBJECTS = $(am_pdfunite_OBJECTS) - pdfunite_LDADD = $(LDADD) - pdfunite_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+ $(prefix)/lib/libpoppler.la - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) - am__v_P_0 = false -@@ -553,8 +553,9 @@ AM_CPPFLAGS = \ - - LDADD = \ - libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la \ -- $(UTILS_LIBS) -+ $(prefix)/lib/libpoppler.la \ -+ $(UTILS_LIBS) \ -+ $(PTHREAD_STUBLIB) - - @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \ - @BUILD_UTILS_TRUE@ pdfinfo.1 pdftops.1 pdftotext.1 pdftohtml.1 \ diff --git a/print/poppler/patches/patch-ag b/print/poppler/patches/patch-ag deleted file mode 100644 index edcd627a273..00000000000 --- a/print/poppler/patches/patch-ag +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ag,v 1.12 2014/11/20 16:03:46 wiz Exp $ - -Use installed copy of poppler library so we can have a separate -poppler-glib package. - ---- qt4/src/Makefile.in.orig 2014-11-04 18:46:22.000000000 +0000 -+++ qt4/src/Makefile.in -@@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libpoppler_qt4_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) -+ $(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) - am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \ - libpoppler_qt4_la-poppler-page.lo \ - libpoppler_qt4_la-poppler-fontinfo.lo \ -@@ -505,7 +505,7 @@ libpoppler_qt4_la_CXXFLAGS = \ - -Dpoppler_qt4_EXPORTS - - libpoppler_qt4_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ $(prefix)/lib/libpoppler.la \ - $(POPPLER_QT4_LIBS) - - libpoppler_qt4_la_LDFLAGS = \ diff --git a/print/poppler/patches/patch-ar b/print/poppler/patches/patch-ar deleted file mode 100644 index e499b941089..00000000000 --- a/print/poppler/patches/patch-ar +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ar,v 1.7 2014/11/20 16:03:46 wiz Exp $ - -Use installed poppler library so we can have a separate poppler-cpp -package. - -Do not descend into tests directory to avoid dependency on utils/ -directory. - ---- cpp/Makefile.in.orig 2014-11-04 18:46:21.000000000 +0000 -+++ cpp/Makefile.in -@@ -130,7 +130,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libpoppler_cpp_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) -+ $(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) - am_libpoppler_cpp_la_OBJECTS = libpoppler_cpp_la-poppler-document.lo \ - libpoppler_cpp_la-poppler-embedded-file.lo \ - libpoppler_cpp_la-poppler-font.lo \ -@@ -483,7 +483,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - win32_libs = @win32_libs@ --SUBDIRS = . tests -+SUBDIRS = . - lib_LTLIBRARIES = libpoppler-cpp.la - libpoppler_cpp_includedir = $(includedir)/poppler/cpp - libpoppler_cpp_include_HEADERS = \ -@@ -536,7 +536,7 @@ libpoppler_cpp_la_CXXFLAGS = \ - -Dpoppler_cpp_EXPORTS - - libpoppler_cpp_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ $(prefix)/lib/libpoppler.la \ - $(LIBICONV) - - libpoppler_cpp_la_LDFLAGS = \ diff --git a/print/poppler/patches/patch-as b/print/poppler/patches/patch-as deleted file mode 100644 index c3027f46f34..00000000000 --- a/print/poppler/patches/patch-as +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-as,v 1.5 2014/11/20 16:03:46 wiz Exp $ - -Use installed poppler library so we can have a separate poppler-cpp -package. - ---- cpp/tests/Makefile.in.orig 2014-11-04 18:46:21.000000000 +0000 -+++ cpp/tests/Makefile.in -@@ -392,7 +392,7 @@ AM_CPPFLAGS = \ - - LDADD = \ - $(top_builddir)/utils/libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la \ -+ $(prefix)/lib/libpoppler.la \ - $(top_builddir)/cpp/libpoppler-cpp.la - - poppler_dump_SOURCES = \ diff --git a/print/poppler/patches/patch-gtkdoc.py b/print/poppler/patches/patch-gtkdoc.py new file mode 100644 index 00000000000..0dc22c477cc --- /dev/null +++ b/print/poppler/patches/patch-gtkdoc.py @@ -0,0 +1,14 @@ +$NetBSD: patch-gtkdoc.py,v 1.1 2017/12/08 07:48:11 spz Exp $ + +--- gtkdoc.py.orig 2017-11-12 18:14:32.000000000 +0000 ++++ gtkdoc.py +@@ -223,6 +223,9 @@ class GTKDoc(object): + return + + def copy_file_replacing_existing(src, dest): ++ if src == dest: ++ self.logger.debug('copy_file_replacing_existing not copying to itself: %s', src) ++ return + if os.path.isdir(src): + self.logger.debug('skipped directory %s', src) + return diff --git a/print/poppler/patches/patch-poppler_Form.cc b/print/poppler/patches/patch-poppler_Form.cc deleted file mode 100644 index edea5e1f5b6..00000000000 --- a/print/poppler/patches/patch-poppler_Form.cc +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-poppler_Form.cc,v 1.1 2017/09/05 09:39:41 tnn Exp $ - -needs <ctype.h> for isdigit(3). - ---- poppler/Form.cc.orig 2017-08-15 22:16:09.000000000 +0000 -+++ poppler/Form.cc -@@ -31,6 +31,7 @@ - #include <limits> - #include <stddef.h> - #include <string.h> -+#include <ctype.h> - #include "goo/gmem.h" - #include "goo/GooString.h" - #include "Error.h" diff --git a/print/poppler/patches/patch-poppler_StructElement.cc b/print/poppler/patches/patch-poppler_StructElement.cc deleted file mode 100644 index 7ed0d566153..00000000000 --- a/print/poppler/patches/patch-poppler_StructElement.cc +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-poppler_StructElement.cc,v 1.1 2017/09/20 15:21:10 jperkin Exp $ - -Support older clang, from Homebrew. - ---- poppler/StructElement.cc.orig 2017-08-13 18:30:15.000000000 +0000 -+++ poppler/StructElement.cc -@@ -248,6 +248,7 @@ struct AttributeMapEntry { - }; - - struct AttributeDefaults { -+ AttributeDefaults() {}; // needed to support old clang - Object Inline = Object(objName, "Inline"); - Object LrTb = Object(objName, "LrTb"); - Object Normal = Object(objName, "Normal"); diff --git a/print/poppler/patches/patch-qt5_src_Makefile.in b/print/poppler/patches/patch-qt5_src_Makefile.in deleted file mode 100644 index 83cb255d8a7..00000000000 --- a/print/poppler/patches/patch-qt5_src_Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-qt5_src_Makefile.in,v 1.5 2016/05/22 18:17:17 wiz Exp $ - -Use installed copy of poppler library so we can have a separate -poppler-qt5 package. - ---- qt5/src/Makefile.in.orig 2016-05-21 16:59:39.000000000 +0000 -+++ qt5/src/Makefile.in -@@ -139,7 +139,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libpoppler_qt5_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) -+ $(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) - am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \ - libpoppler_qt5_la-poppler-page.lo \ - libpoppler_qt5_la-poppler-fontinfo.lo \ -@@ -520,7 +520,7 @@ libpoppler_qt5_la_CXXFLAGS = \ - -Dpoppler_qt5_EXPORTS - - libpoppler_qt5_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ $(prefix)/lib/libpoppler.la \ - $(POPPLER_QT5_LIBS) - - libpoppler_qt5_la_LDFLAGS = \ |