diff --git a/graphics/poppler-qt5/pkg-plist b/graphics/poppler-qt5/pkg-plist
index c5427ae04222..f6c2ea2ecf4c 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.37.0
+lib/libpoppler-qt5.so.1.38.0
 libdata/pkgconfig/poppler-qt5.pc
diff --git a/graphics/poppler-qt6/pkg-plist b/graphics/poppler-qt6/pkg-plist
index 431222f2c84e..799a56b8851b 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.9.0
+lib/libpoppler-qt6.so.3.10.0
 libdata/pkgconfig/poppler-qt6.pc
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 3d093292c70a..8717cb70b3c4 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -1,117 +1,118 @@
 PORTNAME=	poppler
-DISTVERSION=	25.02.0
+DISTVERSION=	25.04.0
 CATEGORIES=	graphics print
 MASTER_SITES=	https://poppler.freedesktop.org/
 
 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 \
-		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++20-lang cpe gperf jpeg \
 		localbase pathfix pkgconfig tar:xz
 CPE_VENDOR=	freedesktop
 USE_LDCONFIG=	yes
 CMAKE_ON=	ENABLE_BOOST \
-		ENABLE_GPGME \
 		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"
 
 # 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=146
+PLIST_SUB+=	SHLIB_VER=148
 
-OPTIONS_DEFINE=		CURL OPENJPEG
-OPTIONS_DEFAULT=	OPENJPEG
+OPTIONS_DEFINE=		CURL OPENJPEG GNUPG
+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}
 
 CMAKE_ARGS+=		-DENABLE_LIBOPENJPEG:STRING="none" \
 			-DENABLE_LIBCURL: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/gpgme-cpp
+
 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
 .elif ${_SLAVE_PORT} == qt6
 	${INSTALL_DATA} ${WRKSRC}/poppler-qt6.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index d5959f62b10e..2c310994dfb2 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742579130
-SHA256 (poppler-25.02.0.tar.xz) = 21234cb2a9647d73c752ce4031e65a79d11a511a835f2798284c2497b8701dee
-SIZE (poppler-25.02.0.tar.xz) = 1943728
+TIMESTAMP = 1744042785
+SHA256 (poppler-25.04.0.tar.xz) = b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d
+SIZE (poppler-25.04.0.tar.xz) = 1957260
diff --git a/graphics/poppler/files/patch-poppler_FlateStream.cc b/graphics/poppler/files/patch-poppler_FlateStream.cc
new file mode 100644
index 000000000000..5e1b2da32a64
--- /dev/null
+++ b/graphics/poppler/files/patch-poppler_FlateStream.cc
@@ -0,0 +1,33 @@
+--- poppler/FlateStream.cc.orig	2025-04-09 19:16:40 UTC
++++ poppler/FlateStream.cc
+@@ -133,18 +133,22 @@ int FlateStream::fill_buffer()
+     return 0;
+ }
+ 
+-GooString *FlateStream::getPSFilter(int psLevel, const char *indent)
++std::optional<std::string> FlateStream::getPSFilter(int psLevel, const char *indent)
+ {
+-    GooString *s;
+-
+     if (psLevel < 3 || pred) {
+-        return NULL;
++        return std::nullopt;
+     }
+-    if (!(s = str->getPSFilter(psLevel, indent))) {
+-        return NULL;
++
++    auto inner = str->getPSFilter(psLevel, indent);
++    if (!inner.has_value()) {
++        return std::nullopt;
+     }
+-    s->append(indent)->append("<< >> /FlateDecode filter\n");
+-    return s;
++
++    std::string result = *inner;
++    result.append(indent);
++    result.append("<< >> /FlateDecode filter\n");
++
++    return result;
+ }
+ 
+ bool FlateStream::isBinary(bool last) const
diff --git a/graphics/poppler/files/patch-poppler_FlateStream.h b/graphics/poppler/files/patch-poppler_FlateStream.h
new file mode 100644
index 000000000000..a8909b42032e
--- /dev/null
+++ b/graphics/poppler/files/patch-poppler_FlateStream.h
@@ -0,0 +1,11 @@
+--- poppler/FlateStream.h.orig	2025-04-09 19:14:40 UTC
++++ poppler/FlateStream.h
+@@ -45,7 +45,7 @@ class FlateStream : public FilterStream (public)
+     int lookChar() override;
+     int getRawChar() override;
+     void getRawChars(int nChars, int *buffer) override;
+-    GooString *getPSFilter(int psLevel, const char *indent) override;
++    std::optional<std::string> getPSFilter(int psLevel, const char *indent) override;
+     bool isBinary(bool last = true) const override;
+ 
+ private:
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index db057dea03b5..58019476d0d8 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -1,121 +1,121 @@
 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/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.0.0
+lib/libpoppler-cpp.so.2.1.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