diff --git a/graphics/poppler-glib/Makefile b/graphics/poppler-glib/Makefile index feb3c15c3d2e..639d50d648ea 100644 --- a/graphics/poppler-glib/Makefile +++ b/graphics/poppler-glib/Makefile @@ -1,11 +1,11 @@ # Created by: Michael Johnson -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= GLib bindings to poppler MASTERDIR= ${.CURDIR}/../../graphics/poppler _SLAVE_PORT= glib PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler-glib/pkg-plist b/graphics/poppler-glib/pkg-plist index affa7005d0cc..e8472db41d98 100644 --- a/graphics/poppler-glib/pkg-plist +++ b/graphics/poppler-glib/pkg-plist @@ -1,21 +1,21 @@ include/poppler/glib/poppler-action.h include/poppler/glib/poppler-annot.h include/poppler/glib/poppler-attachment.h include/poppler/glib/poppler-date.h include/poppler/glib/poppler-document.h include/poppler/glib/poppler-enums.h include/poppler/glib/poppler-features.h include/poppler/glib/poppler-form-field.h include/poppler/glib/poppler-layer.h include/poppler/glib/poppler-macros.h include/poppler/glib/poppler-media.h 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/girepository-1.0/Poppler-0.18.typelib lib/libpoppler-glib.so lib/libpoppler-glib.so.8 -lib/libpoppler-glib.so.8.22.0 +lib/libpoppler-glib.so.8.23.0 libdata/pkgconfig/poppler-glib.pc share/gir-1.0/Poppler-0.18.gir diff --git a/graphics/poppler-qt5/Makefile b/graphics/poppler-qt5/Makefile index 00449c7a23d8..7c907c3f7eda 100644 --- a/graphics/poppler-qt5/Makefile +++ b/graphics/poppler-qt5/Makefile @@ -1,9 +1,9 @@ -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= Qt 5 bindings to poppler MASTERDIR= ${.CURDIR}/../../graphics/poppler _SLAVE_PORT= qt5 PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler-qt5/pkg-plist b/graphics/poppler-qt5/pkg-plist index 50f570bee4f1..149548a2c5ed 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.30.0 +lib/libpoppler-qt5.so.1.31.0 libdata/pkgconfig/poppler-qt5.pc diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile index adb80737d6d5..e762bf7224b8 100644 --- a/graphics/poppler-utils/Makefile +++ b/graphics/poppler-utils/Makefile @@ -1,11 +1,11 @@ # Created by: Michael Nottebrock -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= Poppler's xpdf-workalike command line utilities # ' MASTERDIR= ${.CURDIR}/../../graphics/poppler _SLAVE_PORT= utils PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 68adbf3485ac..c36cd76125eb 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -1,102 +1,103 @@ # Created by: marcus@FreeBSD.org PORTNAME= poppler -DISTVERSION= 22.01.0 -PORTREVISION= 1 +DISTVERSION= 22.04.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=117 +PLIST_SUB+= SHLIB_VER=120 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 6e453ab6e940..df92c7d7b737 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641399386 -SHA256 (poppler-22.01.0.tar.xz) = 7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e -SIZE (poppler-22.01.0.tar.xz) = 1801984 +TIMESTAMP = 1648923158 +SHA256 (poppler-22.04.0.tar.xz) = 813fb4b90e7bda63df53205c548602bae728887a60f4048aae4dbd9b1927deff +SIZE (poppler-22.04.0.tar.xz) = 1817800