diff --git a/graphics/poppler-qt5/Makefile b/graphics/poppler-qt5/Makefile index 0ca2a84d9b7d..7c9b8a8cc0e1 100644 --- a/graphics/poppler-qt5/Makefile +++ b/graphics/poppler-qt5/Makefile @@ -1,8 +1,13 @@ COMMENT= Qt 5 bindings to poppler +# needed for tests +USE_LOCALE= en_US.UTF-8 + MASTERDIR= ${.CURDIR}/../../graphics/poppler _SLAVE_PORT= qt5 PLIST= ${.CURDIR}/pkg-plist +OPTIONS_DEFINE= TEST + .include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler-qt5/pkg-plist b/graphics/poppler-qt5/pkg-plist index 84b5da57331a..97d85a8bd19b 100644 --- a/graphics/poppler-qt5/pkg-plist +++ b/graphics/poppler-qt5/pkg-plist @@ -1,13 +1,13 @@ 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 include/poppler/qt5/poppler-version.h lib/libpoppler-qt5.so lib/libpoppler-qt5.so.1 -lib/libpoppler-qt5.so.1.39.0 +lib/libpoppler-qt5.so.1.40.0 libdata/pkgconfig/poppler-qt5.pc diff --git a/graphics/poppler-qt6/Makefile b/graphics/poppler-qt6/Makefile index 193287587b11..af6702dd29f5 100644 --- a/graphics/poppler-qt6/Makefile +++ b/graphics/poppler-qt6/Makefile @@ -1,8 +1,10 @@ COMMENT= Qt 6 bindings to poppler MASTERDIR= ${.CURDIR}/../../graphics/poppler _SLAVE_PORT= qt6 PLIST= ${.CURDIR}/pkg-plist +OPTIONS_DEFINE= TEST + .include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler-qt6/pkg-plist b/graphics/poppler-qt6/pkg-plist index a4fea298027b..4a0e6e463801 100644 --- a/graphics/poppler-qt6/pkg-plist +++ b/graphics/poppler-qt6/pkg-plist @@ -1,14 +1,14 @@ include/poppler/qt6/poppler-annotation.h include/poppler/qt6/poppler-converter.h include/poppler/qt6/poppler-export.h include/poppler/qt6/poppler-form.h include/poppler/qt6/poppler-link.h include/poppler/qt6/poppler-media.h include/poppler/qt6/poppler-optcontent.h include/poppler/qt6/poppler-page-transition.h include/poppler/qt6/poppler-qt6.h include/poppler/qt6/poppler-version.h lib/libpoppler-qt6.so lib/libpoppler-qt6.so.3 -lib/libpoppler-qt6.so.3.11.0 +lib/libpoppler-qt6.so.3.12.0 libdata/pkgconfig/poppler-qt6.pc diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 53b5d6b8aa0a..ca2f49415d8e 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -1,120 +1,125 @@ PORTNAME= poppler -DISTVERSION= 25.10.0 -PORTREVISION= 1 +DISTVERSION= 26.04.0 CATEGORIES= graphics print MASTER_SITES= https://poppler.freedesktop.org/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= desktop@FreeBSD.org COMMENT?= PDF rendering library WWW= https://poppler.freedesktop.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libnspr4.so:devel/nspr \ liblcms2.so:graphics/lcms2 \ libpng16.so:graphics/png \ libtiff.so:graphics/tiff \ libfreetype.so:print/freetype2 \ libnss3.so:security/nss \ libfontconfig.so:x11-fonts/fontconfig \ libassuan.so:security/libassuan BUILD_DEPENDS= ${LOCALBASE}/include/boost/container/small_vector.hpp:devel/boost-libs \ gsed:textproc/gsed RUN_DEPENDS= poppler-data>0:graphics/poppler-data -USES= cmake:insource compiler:c++20-lang cpe gperf jpeg \ +USES= cmake:testing compiler:c++20-lang cpe gperf jpeg \ localbase pathfix pkgconfig tar:xz CPE_VENDOR= freedesktop USE_LDCONFIG= yes CMAKE_ON= ENABLE_BOOST \ ENABLE_LCMS \ ENABLE_LIBTIFF \ ENABLE_NSS3 \ ENABLE_UNSTABLE_API_ABI_HEADERS \ ENABLE_ZLIB_UNCOMPRESS \ RUN_GPERF_IF_PRESENT 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 \ - -DENABLE_DCTDECODER:STRING="libjpeg" + -DENABLE_DCTDECODER:STRING="libjpeg" \ + -DTESTDATADIR:PATH=${WRKSRC}/testdata + +USE_GITLAB= nodefault # Slave ports. _POPPLER_SLAVES= library glib qt5 qt6 utils _SLAVE_PORT?= library BINARY_ALIAS= gperf=${GPERF} \ sed=${LOCALBASE}/bin/gsed # 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=154 +PLIST_SUB+= SHLIB_VER=159 -OPTIONS_DEFINE= CURL OPENJPEG GNUPG +OPTIONS_DEFINE= CURL OPENJPEG GNUPG TEST OPTIONS_DEFAULT= OPENJPEG GNUPG 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} +BUILD_WRKSRC= ${CONFIGURE_WRKSRC}/${_SLAVE_PORT} +INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}/${_SLAVE_PORT} CMAKE_ARGS+= -DENABLE_LIBOPENJPEG:STRING="none" \ -DENABLE_LIBCURL:BOOL=FALSE \ -DENABLE_GPGME:BOOL=FALSE . if ${_SLAVE_PORT} == glib USES+= gnome python:build USE_GNOME+= cairo glib20 introspection:build libxml2 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} == qt6 USES+= gl qt:6 USE_GL+= gl opengl USE_QT= base . 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" GNUPG_CMAKE_BOOL= ENABLE_GPGME GNUPG_LIB_DEPENDS= libgpgme.so:security/gpgme \ libgpgmepp.so:security/gpgmepp +TEST_GL_TUPLE= https://gitlab.freedesktop.org:poppler:test:b85e4d1ce75636b3e727555a9d31da34ad771c1c:testdata/testdata + post-install: .if ${_SLAVE_PORT} == glib - ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \ + ${INSTALL_DATA} ${BUILD_WRKSRC}/../poppler-glib.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig .elif ${_SLAVE_PORT} == qt5 - ${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc \ + ${INSTALL_DATA} ${BUILD_WRKSRC}/../poppler-qt5.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig .elif ${_SLAVE_PORT} == qt6 - ${INSTALL_DATA} ${WRKSRC}/poppler-qt6.pc \ + ${INSTALL_DATA} ${BUILD_WRKSRC}/../poppler-qt6.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig .endif .include diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index c57e6528ce42..e8d2796cd128 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1764268443 -SHA256 (poppler-25.10.0.tar.xz) = 6b5e9bb64dabb15787a14db1675291c7afaf9387438cc93a4fb7f6aec4ee6fe0 -SIZE (poppler-25.10.0.tar.xz) = 1985796 +TIMESTAMP = 1776172947 +SHA256 (poppler-26.04.0.tar.xz) = b0955163114af96bc0106f68cb24daf973a629462453d8b82775f81b0d4e0693 +SIZE (poppler-26.04.0.tar.xz) = 2032180 +SHA256 (poppler-test-b85e4d1ce75636b3e727555a9d31da34ad771c1c_GL0.tar.gz) = 2b662350a1680343a14737e4824aa98b6048a808b7972959f1da641cd5f182c7 +SIZE (poppler-test-b85e4d1ce75636b3e727555a9d31da34ad771c1c_GL0.tar.gz) = 5928271 diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index bcb50437f3a6..bf6db2f7dfb2 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -1,121 +1,122 @@ include/poppler/Annot.h include/poppler/AnnotStampImageHelper.h include/poppler/Array.h include/poppler/BBoxOutputDev.h include/poppler/CachedFile.h include/poppler/Catalog.h include/poppler/CertificateInfo.h include/poppler/CharTypes.h include/poppler/CryptoSignBackend.h %%CURL%%include/poppler/CurlCachedFile.h %%CURL%%include/poppler/CurlPDFDocBuilder.h include/poppler/DateInfo.h include/poppler/Dict.h include/poppler/Error.h include/poppler/ErrorCodes.h include/poppler/FILECacheLoader.h include/poppler/FileSpec.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/HashAlgorithm.h %%OPENJPEG%%include/poppler/JPEG2000Stream.h %%NO_OPENJPEG%%include/poppler/JPXStream.h include/poppler/JSInfo.h include/poppler/Lexer.h include/poppler/Link.h include/poppler/MarkedContentOutputDev.h include/poppler/Movie.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/PDFRectangle.h include/poppler/PSOutputDev.h include/poppler/Page.h include/poppler/PageTransition.h include/poppler/Parser.h include/poppler/PopplerCache.h include/poppler/ProfileData.h include/poppler/Rendition.h include/poppler/SignatureInfo.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/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/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/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/SplashTypes.h lib/libpoppler-cpp.so -lib/libpoppler-cpp.so.2 -lib/libpoppler-cpp.so.2.2.0 +lib/libpoppler-cpp.so.3 +lib/libpoppler-cpp.so.3.0.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