diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index c36cd76125eb..385eecd62593 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -1,103 +1,103 @@ # Created by: marcus@FreeBSD.org PORTNAME= poppler -DISTVERSION= 22.04.0 +DISTVERSION= 22.05.0 CATEGORIES= graphics print MASTER_SITES= https://poppler.freedesktop.org/ MAINTAINER?= desktop@FreeBSD.org COMMENT?= PDF rendering library LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libnspr4.so:devel/nspr \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libfreetype.so:print/freetype2 \ libnss3.so:security/nss \ libfontconfig.so:x11-fonts/fontconfig BUILD_DEPENDS= ${LOCALBASE}/include/boost/container/small_vector.hpp:devel/boost-libs RUN_DEPENDS= poppler-data>0:graphics/poppler-data USES= cmake:insource compiler:c++17-lang cpe gnome jpeg libtool \ localbase pathfix pkgconfig tar:xz CPE_VENDOR= freedesktop USE_GNOME= cairo libxml2 USE_LDCONFIG= yes CMAKE_ON= ENABLE_LIBJPEG \ ENABLE_LIBPNG \ ENABLE_LIBTIFF \ ENABLE_UNSTABLE_API_ABI_HEADERS \ ENABLE_ZLIB \ ENABLE_NSS \ ENABLE_SPLASH CMAKE_OFF= BUILD_GTK_TESTS # Ensure that path ordering does not lead to openjpeg15 being found and picked # instead of openjpeg2 on systems that have both installed # Note: since f3ba77e14cac05d43caf35100848eeaee3bc64b4 graphics/openjpeg15 installs # its cmake files to ${PREFIX}/lib/openjpeg15 CMAKE_ARGS+= -DCMAKE_IGNORE_PATH:PATH=${PREFIX}/lib/openjpeg-1.5 # Slave ports. _POPPLER_SLAVES= library glib qt5 utils _SLAVE_PORT?= library # Activate the wanted module, and deactivate the others. CMAKE_ON+= ENABLE_${_SLAVE_PORT:tu} CMAKE_OFF+= ${_POPPLER_SLAVES:N${_SLAVE_PORT}:tu:S/^/ENABLE_/} .if ${_SLAVE_PORT} == library PORTSCOUT= limitw:1,even USES+= iconv CMAKE_ON+= ENABLE_CPP -PLIST_SUB+= SHLIB_VER=120 +PLIST_SUB+= SHLIB_VER=121 OPTIONS_DEFINE= CURL OPENJPEG OPTIONS_DEFAULT= OPENJPEG OPTIONS_SUB= yes .else PORTSCOUT= ignore:1 LIB_DEPENDS+= libpoppler.so:graphics/poppler PKGNAMESUFFIX= -${_SLAVE_PORT} BUILD_WRKSRC= ${WRKSRC}/${_SLAVE_PORT} INSTALL_WRKSRC= ${WRKSRC}/${_SLAVE_PORT} CMAKE_ARGS+= -DENABLE_LIBOPENJPEG:STRING="none" \ -DENABLE_LIBCURL:BOOL=FALSE . if ${_SLAVE_PORT} == glib USES+= python:build USE_GNOME+= glib20 introspection:Build BINARY_ALIAS= python3=${PYTHON_CMD} . elif ${_SLAVE_PORT} == qt5 USES+= qt:5 USE_QT= core gui widgets xml \ buildtools_build qmake_build testlib_build . elif ${_SLAVE_PORT} == utils LIB_DEPENDS+= libpoppler-glib.so:graphics/poppler-glib USES+= gnome . endif .endif CURL_CMAKE_BOOL= ENABLE_LIBCURL CURL_LIB_DEPENDS= libcurl.so:ftp/curl OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg OPENJPEG_CMAKE_ON= -DENABLE_LIBOPENJPEG:STRING="openjpeg2" OPENJPEG_CMAKE_OFF= -DENABLE_LIBOPENJPEG:STRING="none" post-install: .if ${_SLAVE_PORT} == glib ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig .elif ${_SLAVE_PORT} == qt5 ${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig .endif .include diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index df92c7d7b737..3a9c968012a2 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648923158 -SHA256 (poppler-22.04.0.tar.xz) = 813fb4b90e7bda63df53205c548602bae728887a60f4048aae4dbd9b1927deff -SIZE (poppler-22.04.0.tar.xz) = 1817800 +TIMESTAMP = 1651637742 +SHA256 (poppler-22.05.0.tar.xz) = a969ced458e050d6202367bd7427054e2bd19bae39e8f969910d3b9151abf958 +SIZE (poppler-22.05.0.tar.xz) = 1828628 diff --git a/graphics/poppler/files/patch-cpp_poppler-global.h b/graphics/poppler/files/patch-cpp_poppler-global.h new file mode 100644 index 000000000000..bca69c7dd3ff --- /dev/null +++ b/graphics/poppler/files/patch-cpp_poppler-global.h @@ -0,0 +1,10 @@ +--- cpp/poppler-global.h.orig 2022-05-05 04:55:38 UTC ++++ cpp/poppler-global.h +@@ -25,6 +25,7 @@ + + #include "poppler_cpp_export.h" + ++#include + #include + #include + #include diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index b102eacad84a..a094c8a92c0f 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -1,144 +1,144 @@ include/poppler/Annot.h include/poppler/AnnotStampImageHelper.h include/poppler/Array.h include/poppler/BBoxOutputDev.h include/poppler/CMap.h include/poppler/CachedFile.h include/poppler/CairoFontEngine.h include/poppler/CairoOutputDev.h include/poppler/CairoRescaleBox.h include/poppler/Catalog.h include/poppler/CertificateInfo.h include/poppler/CharCodeToUnicode.h include/poppler/CharTypes.h include/poppler/FDPDFDocBuilder.h include/poppler/FILECacheLoader.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 %%OPENJPEG%%include/poppler/JPEG2000Stream.h %%NO_OPENJPEG%%include/poppler/JPXStream.h include/poppler/JSInfo.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/Sound.h include/poppler/SplashOutputDev.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/UnicodeCClassTables.h include/poppler/UnicodeCompTables.h include/poppler/UnicodeDecompTables.h include/poppler/UnicodeMap.h include/poppler/UnicodeMapFuncs.h include/poppler/UnicodeMapTables.h include/poppler/UnicodeTypeTable.h include/poppler/ViewerPreferences.h include/poppler/XRef.h include/poppler/cpp/poppler-destination.h include/poppler/cpp/poppler-document.h include/poppler/cpp/poppler-embedded-file.h include/poppler/cpp/poppler-font-private.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/cpp/poppler_cpp_export.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/GooCheckedOps.h include/poppler/goo/GooLikely.h include/poppler/goo/GooString.h include/poppler/goo/GooTimer.h include/poppler/goo/ImgWriter.h include/poppler/goo/JpegWriter.h include/poppler/goo/PNGWriter.h include/poppler/goo/TiffWriter.h include/poppler/goo/gdir.h include/poppler/goo/gfile.h include/poppler/goo/gmem.h include/poppler/goo/grandom.h include/poppler/goo/gstrtod.h include/poppler/poppler-config.h include/poppler/poppler_private_export.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/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.9.0 +lib/libpoppler-cpp.so.0.10.0 lib/libpoppler.so lib/libpoppler.so.%%SHLIB_VER%% lib/libpoppler.so.%%SHLIB_VER%%.0.0 libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler.pc