Index: head/graphics/poppler/Makefile =================================================================== --- head/graphics/poppler/Makefile (revision 430776) +++ head/graphics/poppler/Makefile (revision 430777) @@ -1,140 +1,140 @@ # Created by: marcus@FreeBSD.org # $FreeBSD$ PORTNAME= poppler -PORTVERSION= 0.46.0 -PORTREVISION?= 2 +PORTVERSION= 0.50.0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ MAINTAINER?= gnome@FreeBSD.org COMMENT?= PDF rendering library LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libfontconfig.so:x11-fonts/fontconfig \ liblcms2.so:graphics/lcms2 \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libnss3.so:security/nss \ + libnspr4.so:devel/nspr RUN_DEPENDS= poppler-data>0:graphics/poppler-data USES= cpe gmake jpeg libtool localbase pathfix pkgconfig tar:xz CPE_VENDOR= freedesktop USE_GNOME= libxml2 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-zlib \ --enable-xpdf-headers \ --disable-libnss \ --disable-gtk-test \ --without-html-dir \ - --disable-static + --disable-static \ + --enable-libnss INSTALL_TARGET= install-strip .if !defined(SLAVEPORT) PORTSCOUT= limitw:1,even OPTIONS_DEFINE= CAIRO CURL OPENJPEG OPTIONS_DEFAULT=CAIRO OPENJPEG USES+= iconv .endif .include .if defined(SLAVEPORT) PORTSCOUT= ignore:1 LIB_DEPENDS+= libpoppler.so:graphics/poppler .if ${SLAVEPORT}==glib CONFIGURE_ARGS+=--enable-poppler-glib --enable-introspection=yes USE_GNOME+= cairo glib20 introspection:build BUILD_WRKSRC= ${WRKSRC}/glib INSTALL_WRKSRC= ${WRKSRC}/glib .else CONFIGURE_ARGS+=--disable-poppler-glib .endif .if ${SLAVEPORT}==qt4 CONFIGURE_ARGS+=--enable-poppler-qt4 CONFIGURE_ENV+= MOCQT4=${MOC} USE_QT4= gui corelib xml qtestlib moc_build BUILD_WRKSRC= ${WRKSRC}/qt4 INSTALL_WRKSRC= ${WRKSRC}/qt4 .else CONFIGURE_ARGS+=--disable-poppler-qt4 .endif .if ${SLAVEPORT}==qt5 CONFIGURE_ARGS+=--enable-poppler-qt5 CONFIGURE_ENV+= MOCQT5=${MOC} USE_QT5= core gui widgets xml buildtools_build testlib_build BUILD_WRKSRC= ${WRKSRC}/qt5 INSTALL_WRKSRC= ${WRKSRC}/qt5 .else CONFIGURE_ARGS+=--disable-poppler-qt5 .endif .if ${SLAVEPORT}==utils LIB_DEPENDS+= libpoppler-glib.so:graphics/poppler-glib CONFIGURE_ARGS+=--enable-utils BUILD_WRKSRC= ${WRKSRC}/utils INSTALL_WRKSRC= ${WRKSRC}/utils .else CONFIGURE_ARGS+=--disable-utils .endif .else # ! SLAVE options below CONFIGURE_ARGS+=--disable-poppler-glib \ --disable-poppler-qt4 \ --disable-poppler-qt5 \ --disable-utils .if ${PORT_OPTIONS:MCAIRO} LIB_DEPENDS+= libcairo.so:graphics/cairo PLIST_SUB+= CAIRO="" .else CONFIGURE_ARGS+=--disable-cairo-output PLIST_SUB+= CAIRO="@comment " .endif .if ${PORT_OPTIONS:MCURL} LIB_DEPENDS+= libcurl.so:ftp/curl CONFIGURE_ARGS+=--enable-libcurl PLIST_SUB+= CURL="" .else CONFIGURE_ARGS+=--disable-libcurl PLIST_SUB+= CURL="@comment " .endif -# stick with openjpeg1 for now due to regression in openjpeg2 (configure) -# https://bugs.freedesktop.org/show_bug.cgi?id=58906 Comment #35 .if ${PORT_OPTIONS:MOPENJPEG} -CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg1 -LIB_DEPENDS+= libopenjpeg.so:graphics/openjpeg15 +CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg2 +LIB_DEPENDS+= libopenjp2.so:graphics/openjpeg .else CONFIGURE_ARGS+=--disable-libopenjpeg .endif .endif # end of options post-patch: @${REINPLACE_CMD} -e 's|-fno-check-new||g' ${WRKSRC}/configure post-install: .if defined(SLAVEPORT) . if ${SLAVEPORT}==glib ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig . elif ${SLAVEPORT}==qt4 ${INSTALL_DATA} ${WRKSRC}/poppler-qt4.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig . elif ${SLAVEPORT}==qt5 ${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig . endif .endif .include Index: head/graphics/poppler/distinfo =================================================================== --- head/graphics/poppler/distinfo (revision 430776) +++ head/graphics/poppler/distinfo (revision 430777) @@ -1,3 +1,3 @@ -TIMESTAMP = 1469476012 -SHA256 (poppler-0.46.0.tar.xz) = 967d35d13d61dee2fee656b80efef9e388a9e752bc79b7123f15b49c7769e487 -SIZE (poppler-0.46.0.tar.xz) = 1680940 +TIMESTAMP = 1481980606 +SHA256 (poppler-0.50.0.tar.xz) = c9c93318b789d3933f6e0bad3bc65110280c28eac3f0666284bb9c9a0ab4bc36 +SIZE (poppler-0.50.0.tar.xz) = 1689260 Index: head/graphics/poppler/files/patch-poppler_PDFDoc.cc =================================================================== --- head/graphics/poppler/files/patch-poppler_PDFDoc.cc (revision 430776) +++ head/graphics/poppler/files/patch-poppler_PDFDoc.cc (nonexistent) @@ -1,17 +0,0 @@ -From: Albert Astals Cid -Date: Sat, 30 Jul 2016 17:32:59 +0200 -Subject: Fix abort on documents where the docinfo obj is not a dict - -Bug #97134 - ---- poppler/PDFDoc.cc.orig 2016-07-05 21:37:01 UTC -+++ poppler/PDFDoc.cc -@@ -646,7 +646,7 @@ void PDFDoc::setDocInfoStringEntry(const - GooString *PDFDoc::getDocInfoStringEntry(const char *key) { - Object infoObj; - getDocInfo(&infoObj); -- if (infoObj.isNull()) { -+ if (!infoObj.isDict()) { - return NULL; - } - Property changes on: head/graphics/poppler/files/patch-poppler_PDFDoc.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/poppler/pkg-plist =================================================================== --- head/graphics/poppler/pkg-plist (revision 430776) +++ head/graphics/poppler/pkg-plist (revision 430777) @@ -1,145 +1,146 @@ include/poppler/Annot.h include/poppler/Array.h include/poppler/BuiltinFont.h include/poppler/BuiltinFontTables.h include/poppler/CMap.h include/poppler/CachedFile.h include/poppler/Catalog.h include/poppler/CharCodeToUnicode.h include/poppler/CharTypes.h include/poppler/CompactFontTables.h %%CURL%%include/poppler/CurlCachedFile.h %%CURL%%include/poppler/CurlPDFDocBuilder.h include/poppler/DateInfo.h include/poppler/Decrypt.h include/poppler/Dict.h include/poppler/Error.h include/poppler/ErrorCodes.h include/poppler/FileSpec.h include/poppler/FontEncodingTables.h include/poppler/FontInfo.h include/poppler/Form.h include/poppler/Function.h include/poppler/Gfx.h include/poppler/GfxFont.h include/poppler/GfxState.h include/poppler/GfxState_helpers.h include/poppler/GlobalParams.h include/poppler/Hints.h include/poppler/JArithmeticDecoder.h include/poppler/JBIG2Stream.h include/poppler/Lexer.h include/poppler/Linearization.h include/poppler/Link.h include/poppler/LocalPDFDocBuilder.h include/poppler/MarkedContentOutputDev.h include/poppler/Movie.h include/poppler/NameToCharCode.h include/poppler/NameToUnicodeTable.h include/poppler/Object.h include/poppler/OptionalContent.h include/poppler/Outline.h include/poppler/OutputDev.h include/poppler/PDFDoc.h include/poppler/PDFDocBuilder.h include/poppler/PDFDocEncoding.h include/poppler/PDFDocFactory.h include/poppler/PSOutputDev.h include/poppler/PSTokenizer.h include/poppler/Page.h include/poppler/PageTransition.h include/poppler/Parser.h include/poppler/PopplerCache.h include/poppler/PreScanOutputDev.h include/poppler/ProfileData.h include/poppler/Rendition.h include/poppler/SecurityHandler.h +include/poppler/SignatureHandler.h include/poppler/SignatureInfo.h include/poppler/Sound.h include/poppler/SplashOutputDev.h include/poppler/StdinCachedFile.h include/poppler/StdinPDFDocBuilder.h include/poppler/Stream-CCITT.h include/poppler/Stream.h include/poppler/StructElement.h include/poppler/StructTreeRoot.h include/poppler/TextOutputDev.h include/poppler/UTF.h include/poppler/UTF8.h include/poppler/UnicodeCClassTables.h include/poppler/UnicodeCompTables.h include/poppler/UnicodeDecompTables.h include/poppler/UnicodeMap.h include/poppler/UnicodeMapTables.h include/poppler/UnicodeTypeTable.h include/poppler/ViewerPreferences.h include/poppler/XRef.h include/poppler/XpdfPluginAPI.h include/poppler/cpp/poppler-document.h include/poppler/cpp/poppler-embedded-file.h include/poppler/cpp/poppler-font.h include/poppler/cpp/poppler-global.h include/poppler/cpp/poppler-image.h include/poppler/cpp/poppler-page-renderer.h include/poppler/cpp/poppler-page-transition.h include/poppler/cpp/poppler-page.h include/poppler/cpp/poppler-rectangle.h include/poppler/cpp/poppler-toc.h include/poppler/cpp/poppler-version.h include/poppler/fofi/FoFiBase.h include/poppler/fofi/FoFiEncodings.h 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/GooHash.h include/poppler/goo/GooLikely.h include/poppler/goo/GooList.h include/poppler/goo/GooMutex.h include/poppler/goo/GooString.h include/poppler/goo/GooTimer.h include/poppler/goo/ImgWriter.h include/poppler/goo/JpegWriter.h include/poppler/goo/NetPBMWriter.h include/poppler/goo/PNGWriter.h include/poppler/goo/TiffWriter.h include/poppler/goo/gfile.h include/poppler/goo/gmem.h include/poppler/goo/grandom.h include/poppler/goo/gstrtod.h include/poppler/goo/gtypes.h include/poppler/poppler-config.h include/poppler/splash/Splash.h include/poppler/splash/SplashBitmap.h include/poppler/splash/SplashClip.h include/poppler/splash/SplashErrorCodes.h include/poppler/splash/SplashFTFont.h include/poppler/splash/SplashFTFontEngine.h include/poppler/splash/SplashFTFontFile.h include/poppler/splash/SplashFont.h include/poppler/splash/SplashFontEngine.h include/poppler/splash/SplashFontFile.h include/poppler/splash/SplashFontFileID.h include/poppler/splash/SplashGlyphBitmap.h include/poppler/splash/SplashMath.h 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 lib/libpoppler-cpp.so lib/libpoppler-cpp.so.0 lib/libpoppler-cpp.so.0.3.0 lib/libpoppler.so -lib/libpoppler.so.63 -lib/libpoppler.so.63.0.0 +lib/libpoppler.so.66 +lib/libpoppler.so.66.0.0 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler-splash.pc libdata/pkgconfig/poppler.pc Index: head/graphics/poppler-qt4/pkg-plist =================================================================== --- head/graphics/poppler-qt4/pkg-plist (revision 430776) +++ head/graphics/poppler-qt4/pkg-plist (revision 430777) @@ -1,12 +1,12 @@ include/poppler/qt4/poppler-annotation.h include/poppler/qt4/poppler-export.h include/poppler/qt4/poppler-form.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.so lib/libpoppler-qt4.so.4 -lib/libpoppler-qt4.so.4.10.0 +lib/libpoppler-qt4.so.4.11.0 libdata/pkgconfig/poppler-qt4.pc Index: head/graphics/poppler-qt5/pkg-plist =================================================================== --- head/graphics/poppler-qt5/pkg-plist (revision 430776) +++ head/graphics/poppler-qt5/pkg-plist (revision 430777) @@ -1,12 +1,12 @@ include/poppler/qt5/poppler-annotation.h include/poppler/qt5/poppler-export.h include/poppler/qt5/poppler-form.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.so lib/libpoppler-qt5.so.1 -lib/libpoppler-qt5.so.1.7.0 +lib/libpoppler-qt5.so.1.8.0 libdata/pkgconfig/poppler-qt5.pc