git: 60a6fe2cea49 - main - graphics/poppler: Update to 24.12

From: Loïc Bartoletti <lbartoletti_at_FreeBSD.org>
Date: Wed, 12 Feb 2025 16:08:04 UTC
The branch main has been updated by lbartoletti:

URL: https://cgit.FreeBSD.org/ports/commit/?id=60a6fe2cea49f90ecc61f85b17ee6c96c811ad9c

commit 60a6fe2cea49f90ecc61f85b17ee6c96c811ad9c
Author:     Loïc Bartoletti <lbartoletti@FreeBSD.org>
AuthorDate: 2025-01-25 05:54:00 +0000
Commit:     Loïc Bartoletti <lbartoletti@FreeBSD.org>
CommitDate: 2025-02-12 16:07:58 +0000

    graphics/poppler: Update to 24.12
    
    PR:             284710
    Exp-run by:     antoine
---
 graphics/poppler-glib/pkg-plist |  2 +-
 graphics/poppler-qt5/pkg-plist  |  2 +-
 graphics/poppler-qt6/pkg-plist  |  3 ++-
 graphics/poppler/Makefile       | 35 +++++++++++++++++------------------
 graphics/poppler/distinfo       |  8 +++-----
 graphics/poppler/pkg-plist      | 33 +++++----------------------------
 6 files changed, 29 insertions(+), 54 deletions(-)

diff --git a/graphics/poppler-glib/pkg-plist b/graphics/poppler-glib/pkg-plist
index 1be520be6090..bbbc017f094d 100644
--- a/graphics/poppler-glib/pkg-plist
+++ b/graphics/poppler-glib/pkg-plist
@@ -16,6 +16,6 @@ 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.26.0
+lib/libpoppler-glib.so.8.28.0
 libdata/pkgconfig/poppler-glib.pc
 share/gir-1.0/Poppler-0.18.gir
diff --git a/graphics/poppler-qt5/pkg-plist b/graphics/poppler-qt5/pkg-plist
index a8ef4da02654..c5427ae04222 100644
--- a/graphics/poppler-qt5/pkg-plist
+++ b/graphics/poppler-qt5/pkg-plist
@@ -9,5 +9,5 @@ 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.33.0
+lib/libpoppler-qt5.so.1.37.0
 libdata/pkgconfig/poppler-qt5.pc
diff --git a/graphics/poppler-qt6/pkg-plist b/graphics/poppler-qt6/pkg-plist
index 9d9be45d2230..431222f2c84e 100644
--- a/graphics/poppler-qt6/pkg-plist
+++ b/graphics/poppler-qt6/pkg-plist
@@ -1,4 +1,5 @@
 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
@@ -9,5 +10,5 @@ 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.4.0
+lib/libpoppler-qt6.so.3.9.0
 libdata/pkgconfig/poppler-qt6.pc
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 9a27423aa0d2..e5e9c4f9ed3c 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -1,12 +1,8 @@
 PORTNAME=	poppler
-DISTVERSION=	24.02.0
-PORTREVISION=	2
+DISTVERSION=	24.12.0
 CATEGORIES=	graphics print
 MASTER_SITES=	https://poppler.freedesktop.org/
 
-PATCH_SITES=	https://gitlab.freedesktop.org/poppler/${PORTNAME}/-/commit/
-PATCHFILES+=	b4ac7d9a.patch:-p1 # deprecated char_traits template has been removed in libc++ 19
-
 MAINTAINER?=	desktop@FreeBSD.org
 COMMENT?=	PDF rendering library
 WWW=		https://poppler.freedesktop.org/
@@ -16,34 +12,37 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libnspr4.so:devel/nspr \
 		liblcms2.so:graphics/lcms2 \
-		libpng.so:graphics/png \
+		libpng16.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libfreetype.so:print/freetype2 \
 		libnss3.so:security/nss \
 		libfontconfig.so:x11-fonts/fontconfig \
-		libgpgmepp.so:security/gpgme-cpp
+		libgpgme.so:security/gpgme \
+		libgpgmepp.so:security/gpgme-cpp \
+		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++17-lang cpe gnome gperf jpeg \
+USES=		cmake:insource compiler:c++17-lang cpe gperf jpeg \
 		localbase pathfix pkgconfig tar:xz
 CPE_VENDOR=	freedesktop
-USE_GNOME=	cairo libxml2
 USE_LDCONFIG=	yes
-CMAKE_ON=	ENABLE_LIBJPEG  \
-		ENABLE_LIBPNG \
+CMAKE_ON=	ENABLE_BOOST \
+		ENABLE_GPGME \
+		ENABLE_LCMS \
 		ENABLE_LIBTIFF \
+		ENABLE_NSS3 \
 		ENABLE_UNSTABLE_API_ABI_HEADERS \
-		ENABLE_ZLIB \
-		ENABLE_NSS \
-		ENABLE_SPLASH
+		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
+CMAKE_ARGS+=	-DCMAKE_IGNORE_PATH:PATH=${PREFIX}/lib/openjpeg-1.5 \
+		-DENABLE_DCTDECODER:STRING="libjpeg"
 
 # Slave ports.
 _POPPLER_SLAVES=	library glib qt5 qt6 utils
@@ -60,7 +59,7 @@ CMAKE_OFF+=	${_POPPLER_SLAVES:N${_SLAVE_PORT}:tu:S/^/ENABLE_/}
 PORTSCOUT=	limitw:1,even
 USES+=		iconv
 CMAKE_ON+=	ENABLE_CPP
-PLIST_SUB+=	SHLIB_VER=134
+PLIST_SUB+=	SHLIB_VER=144
 
 OPTIONS_DEFINE=		CURL OPENJPEG
 OPTIONS_DEFAULT=	OPENJPEG
@@ -78,8 +77,8 @@ CMAKE_ARGS+=		-DENABLE_LIBOPENJPEG:STRING="none" \
 			-DENABLE_LIBCURL:BOOL=FALSE
 
 .  if ${_SLAVE_PORT} == glib
-USES+=			python:build
-USE_GNOME+=		glib20 introspection:Build
+USES+=			gnome python:build
+USE_GNOME+=		cairo glib20 introspection:Build libxml2
 BINARY_ALIAS+=		python3=${PYTHON_CMD}
 .  elif ${_SLAVE_PORT} == qt5
 USES+=			qt:5
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 90d8fd359057..a7339e061459 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1722540994
-SHA256 (poppler-24.02.0.tar.xz) = 19187a3fdd05f33e7d604c4799c183de5ca0118640c88b370ddcf3136343222e
-SIZE (poppler-24.02.0.tar.xz) = 1897604
-SHA256 (b4ac7d9a.patch) = 0e03b8df2d44531b552dc6881ffe858e426eedd96019241b42bc37d979e66770
-SIZE (b4ac7d9a.patch) = 911
+TIMESTAMP = 1737627454
+SHA256 (poppler-24.12.0.tar.xz) = 1cf374c3146f3f685d9257701bf0c2866c61d6c202c14d1f5c01a1f3a089028a
+SIZE (poppler-24.12.0.tar.xz) = 1934024
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index b927aaba9dca..ea58d6ae25f1 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -2,26 +2,19 @@ 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/CryptoSignBackend.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/FDPDFDocBuilder.h
 include/poppler/FILECacheLoader.h
 include/poppler/FileSpec.h
-include/poppler/FontEncodingTables.h
 include/poppler/FontInfo.h
 include/poppler/Form.h
 include/poppler/Function.h
@@ -30,19 +23,14 @@ 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/HashAlgorithm.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
@@ -53,15 +41,13 @@ 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/SignatureInfo.h
 include/poppler/Sound.h
 include/poppler/SplashOutputDev.h
 include/poppler/Stream-CCITT.h
@@ -97,7 +83,6 @@ 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
@@ -107,7 +92,6 @@ 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
@@ -118,9 +102,6 @@ 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
@@ -129,14 +110,10 @@ 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.11.0
+lib/libpoppler-cpp.so.1
+lib/libpoppler-cpp.so.1.0.0
 lib/libpoppler.so
 lib/libpoppler.so.%%SHLIB_VER%%
 lib/libpoppler.so.%%SHLIB_VER%%.0.0