graphics/poppler: update to 22.04

Release 22.04.0:
        core:
         * Fix underline sometimes being drawn only partially
         * Fix Adobe Reader not reading some of the contents we write correctly
         * Fix code that workarounds some broken-ish files
         * FoFiTrueType: Parse CFF2 fonts too
         * FoFiTrueType: Support cmap types 2 and 13
         * Fix a few small memory leaks
         * code improvements

        qt:
         * Handle SaveAs named action
         * Annotations: don't change the text color when changing the font

        utils:
         * pdftotext: print creation and modification date when using htmlmeta param

        glib:
         * Fix returning internal data of temporary strings

        cpp:
         * Fix code incompatibility with MSVC

        build system:
         * poppler internal library is no longer forced to static on MSVC
         * Error out if iconv is not available and the cpp frontend is enabled
         * Require FreeType 2.8

Release 22.03.0:
        core:
         * Signature: Fix finding Signatures that are in Pages not not in the global the Forms object
         * Signature: Improve getting the path to the firefox certificate database
         * Splash: Fix rendering of some joints. Issue #1212
         * Fix get_poppler_localdir for relocatable Windows builds
         * Minor code improvements

        qt:
         * Minor code improvements

        utils:
         * pdfimages: Fix the wrong Stream being passed for drawMaskedImage

        build system:
         * Small code improvements

Release 22.02.0:
        core:
         * Signature: Add a way to detect unsigned FormFieldSignature
         * Signature: Suport background image when using left and right text
         * Signature: Fix path where to search for Firefox NSS in Windows
         * Signature: Fix NSS code to work correctly in Windows/Android
         * Count only signature fields in PDFDoc::getNumSignatureFields
         * Minor code improvements

        qt:
         * Allow signing unsigned signature fields
         * Allow passing a background image for the signature when signing
         * Allow passing the document password when signing
         * Fix leftFontSize being ignored when signing

        glib:
         * try with utf8 password if latin1 fails
         * New method for getting all signature fields of a document
         * Fix compile with MSVC

        utils:
         * pdfsig: Fix compile with MSVC

        build system:
         * Fix NSS cmake check for MSVC

PR:		 263009
Exp-run by:	antoine

7 files changed, 12 insertions, 11 deletions

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,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	GLib bindings to poppler
 
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
@@ -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.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,4 +1,4 @@
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	Qt 5 bindings to poppler
 
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
@@ -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.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,6 +1,6 @@
 # Created by: Michael Nottebrock <lofi@FreeBSD.org>
 
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	Poppler's xpdf-workalike command line utilities # '
 
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 68adbf3485ac..c36cd76125eb 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -1,8 +1,7 @@
 # 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/
 
@@ -53,7 +52,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=117
+PLIST_SUB+=	SHLIB_VER=120
 
 OPTIONS_DEFINE=		CURL OPENJPEG
 OPTIONS_DEFAULT=	OPENJPEG
@@ -71,7 +70,9 @@ 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 \
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