poppler: updated to 21.04.0

Release 21.04.0:
core:
* Hide symbols by default
* TextSelectionDumper: fix word order for RTL text
* Fix rendering of text in some files.
* Implement rendering of Masks of Image subtype.
* Forms: fix unclicking standalone form buttons.

glib:
* Expose more fields from MediaRendition in PopplerMedia
* Use stock glib macro to define boxed type
* Remove incorrecly used volatile from enum type registration code

qt5:
* Fix crash in files with malformed signatures
* Fix memory leak when QImage constructor "fails"

qt6:
* Fix crash in files with malformed signatures
* Fix memory leak when QImage constructor "fails"

utils:
* pdfsig: New paragraph for "-sign" in manpage
* pdfimages: Do not assert in "too big images".

build system:
* Require cmake >= 3.10
* Require Qt 5 >= 5.9
* Require glib >= 2.56
* Require gtk 3 >= 3.22
* Require gdk-pixbuf >= 2.36

Release 21.03.0:
core:
* Fix parsing text in some broken pdf files.
* Fix memory issue when using threads.
* TextSelectionDumper: Fix getText() for space after word
* Change signature of OutputDev:tilingPatternFill
* Make PDFDocBuilder return a std::unique_ptr
* Improve well formed check for shading functions
* Fix leak in case of fread failing
* Fix memory leak in broken file in JBIG2Stream::readGenericBitmap
* PSOutputDev: Fix stack overflow in broken files

glib:
* poppler_annot_free_text_get_callout_line: Fix wrong static cast
* poppler-structure-element: fix memleak
* Improve documentation
* demo: keep same visual appearance between displayed and copied text

utils:
* pdftotext: Add -cropbox option
* pdftoppm: Add -progress option
* pdftoppm: Fix rounding bug in computation of output bitmap size.

qt6:
* Add missing poppler-qt6.pc.cmake


Release 21.02.0:
core:
* GfxCal*ColorSpace: introduce Bradford transform for chromatic adaptation
* Fix memory leak if saving the file fails
* Internal code improvements
* Fix various issues handling broken files
* Make checkedAdd work for long long in MSVC

qt5:
* Properly export NewSignatureData class
* Fix regression in QIODeviceOutStream + MSVC

qt6:
* Properly export NewSignatureData class
* Fix regression in QIODeviceOutStream + MSVC

utils:
* pdftohtml: Fix error() parameter type

9 files changed, 23 insertions, 18 deletions

diff --git a/print/poppler-cpp/Makefile b/print/poppler-cpp/Makefile
index f89ebf4fd8c..a8fd16408f8 100644
--- a/print/poppler-cpp/Makefile
+++ b/print/poppler-cpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2020/11/20 19:08:06 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2021/04/08 06:14:38 adam Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -42,6 +42,7 @@ CHECK_BUILTIN.iconv:=	no
 .if !empty(USE_BUILTIN.iconv:M[nN][oO])
 CMAKE_ARGS+=	-DICONV_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.iconv}/include
 CMAKE_ARGS+=	-DICONV_LIBRARIES:PATH=${BUILDLINK_PREFIX.iconv}/lib
+LDFLAGS.Darwin+=-liconv
 .endif
 
 post-install:
diff --git a/print/poppler-cpp/PLIST b/print/poppler-cpp/PLIST
index e8138ede453..dd91d601833 100644
--- a/print/poppler-cpp/PLIST
+++ b/print/poppler-cpp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/11/20 19:08:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2021/04/08 06:14:38 adam Exp $
 include/poppler/cpp/poppler-destination.h
 include/poppler/cpp/poppler-document.h
 include/poppler/cpp/poppler-embedded-file.h
@@ -12,6 +12,7 @@ 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
 lib/libpoppler-cpp.so
 lib/libpoppler-cpp.so.0
 lib/libpoppler-cpp.so.0.9.0
diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index 910a40c74e8..92ae3065ec0 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2020/11/20 19:08:06 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2021/04/08 06:14:38 adam Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -35,7 +35,8 @@ CMAKE_ARGS+=	-DENABLE_LIBCURL=OFF
 CFLAGS.FreeBSD+=	-DLLONG_MAX=__LLONG_MAX
 
 # The result binary of g-ir-scanner cannot find libpoppler-glib.so.
-MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/glib
+# The second part is for Darwin: libpoppler-glib.dylib has @rpath before being installed.
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/glib:${BUILDLINK_PREFIX.poppler}/lib
 
 BUILDLINK_API_DEPENDS.poppler+=     poppler-${POPPLER_VERS}{,nb*}
 .include "../../print/poppler/buildlink3.mk"
diff --git a/print/poppler-glib/PLIST b/print/poppler-glib/PLIST
index 6dfcd8b9b66..c551494f049 100644
--- a/print/poppler-glib/PLIST
+++ b/print/poppler-glib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2020/11/20 19:08:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.32 2021/04/08 06:14:38 adam Exp $
 include/poppler/glib/poppler-action.h
 include/poppler/glib/poppler-annot.h
 include/poppler/glib/poppler-attachment.h
@@ -17,6 +17,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.19.0
+lib/libpoppler-glib.so.8.20.0
 lib/pkgconfig/poppler-glib.pc
 share/gir-1.0/Poppler-0.18.gir
diff --git a/print/poppler-includes/Makefile b/print/poppler-includes/Makefile
index fe813337f51..6c0b11a94ad 100644
--- a/print/poppler-includes/Makefile
+++ b/print/poppler-includes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2020/11/20 19:08:06 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2021/04/08 06:14:38 adam Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -22,6 +22,7 @@ do-install:
 	    ${INSTALL_DATA} ${WRKSRC}/"$$f" ${INCDIR}/poppler;		\
 	done };
 	${INSTALL_DATA} ${WRKSRC}/poppler/poppler-config.h ${INCDIR}/poppler
+	${INSTALL_DATA} ${WRKSRC}/poppler_private_export.h ${INCDIR}/poppler
 	for d in goo fofi splash; do					\
 	    ${INSTALL_DATA_DIR} ${INCDIR}/poppler/"$$d";		\
 	    sed -n -f ${FILESDIR}/extract.sed ${WRKSRC}/CMakeLists.txt	\
diff --git a/print/poppler-includes/PLIST b/print/poppler-includes/PLIST
index 4887cbc7b45..af8d4ec8f70 100644
--- a/print/poppler-includes/PLIST
+++ b/print/poppler-includes/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2020/11/20 19:08:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.24 2021/04/08 06:14:38 adam Exp $
 include/poppler/Annot.h
 include/poppler/Array.h
 include/poppler/BBoxOutputDev.h
@@ -101,6 +101,7 @@ 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
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index f43ed33989f..009de237b39 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.120 2021/01/04 17:57:50 wiz Exp $
+# $NetBSD: Makefile.common,v 1.121 2021/04/08 06:14:37 adam Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -7,7 +7,7 @@
 # used by print/poppler-qt5/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=	21.01.0
+POPPLER_VERS=	21.04.0
 DISTNAME=	poppler-${POPPLER_VERS}
 CATEGORIES=	print
 MASTER_SITES=	https://poppler.freedesktop.org/
diff --git a/print/poppler/PLIST b/print/poppler/PLIST
index 7121d89d56a..3f861f3d0b5 100644
--- a/print/poppler/PLIST
+++ b/print/poppler/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.31 2021/01/04 17:57:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.32 2021/04/08 06:14:37 adam Exp $
 lib/libpoppler.so
-lib/libpoppler.so.106
-lib/libpoppler.so.106.0.0
+lib/libpoppler.so.109
+lib/libpoppler.so.109.0.0
 lib/pkgconfig/poppler.pc
 share/doc/poppler/README-XPDF
 share/doc/poppler/README.md
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 9a3891e5e2a..8d3bfe0fbed 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.149 2021/01/04 17:57:50 wiz Exp $
+$NetBSD: distinfo,v 1.150 2021/04/08 06:14:37 adam Exp $
 
-SHA1 (poppler-21.01.0.tar.xz) = 692697b218efd08ebaeb4ff96861a4d2ad20bdc2
-RMD160 (poppler-21.01.0.tar.xz) = 413dddbde79dbd786e3fa31f96e24e166b02e8d4
-SHA512 (poppler-21.01.0.tar.xz) = aec130446df73a2fc66851a563a14cb40299212a2de4a0d03668b0fecb28312fffa70d0a82431c774d0c0e3f7293788bd2bdf28c8136aa09ad80edbca4cf0ddd
-Size (poppler-21.01.0.tar.xz) = 1680536 bytes
+SHA1 (poppler-21.04.0.tar.xz) = b84cecbfb2aaf3066c473b69c3b57e58f16a76e9
+RMD160 (poppler-21.04.0.tar.xz) = a8747887e80caafa6d920d4584c503dec2eb086c
+SHA512 (poppler-21.04.0.tar.xz) = c3391787456e8a4a3bd6e57f96faa25051bb5e15ae7eeb7072ad6fbc25e3f8a34818945cc49d90a0e6ebc3d38dd4e70d3c60ba0a5cb42c4000bd8c15c947e5bc
+Size (poppler-21.04.0.tar.xz) = 1694132 bytes
 SHA1 (patch-poppler_poppler-config.h.cmake) = d2a67beb1275f10f19468421f203806ead6fa8ff
 SHA1 (patch-qt5_src_poppler-page.cc) = e9f83a7c9d529acb5e3f6db5f112fb6c7eb2800b