update print/poppler

Hi,

update to poppler-0.72.0, drop the -qt4 subpackage.

Not to be committed yet, because we still have to fix/update ports
using poppler-qt4 (I'll give the diffs people sent to ports@ a try),
and because it breaks some additional ports (at least graphics/inkscape,
graphics/gdcm, graphics/pdf2djvu). I'll steal some diffs from
archlinux and/or upstream pointed out by rsadowski@.

Unfortunately, it still needs the USE_LLD=Yes on i386 (same errors
as sthen@ noticed when g-ir-scanner calls the linker).

If people can waste some time, please try this with ports that are
disabled on i386 (libreoffice, maybe others?).

Ciao,
Kili

Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.133
diff -u -p -r1.133 Makefile
--- Makefile 18 Dec 2018 00:12:14 -0000 1.133
+++ Makefile 27 Dec 2018 19:39:16 -0000
@@ -1,25 +1,22 @@
# $OpenBSD: Makefile,v 1.133 2018/12/18 00:12:14 sthen Exp $

COMMENT-main= PDF rendering library
-COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities

-V= 0.61.1
+V= 0.72.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
PKGNAME-utils= poppler-utils-$V
-PKGNAME-qt4= poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V

EXTRACT_SUFX= .tar.xz

-SHARED_LIBS += poppler 46.0 # 72.0
-SHARED_LIBS += poppler-glib 18.0 # 8.9
-SHARED_LIBS += poppler-qt4 21.0 # 4.11
-SHARED_LIBS += poppler-qt5 5.0 # 1.11
-SHARED_LIBS += poppler-cpp 9.0 # 0.3
+SHARED_LIBS += poppler 47.0 # 83.0
+SHARED_LIBS += poppler-glib 19.0 # 8.11
+SHARED_LIBS += poppler-qt5 6.0 # 1.17
+SHARED_LIBS += poppler-cpp 10.0 # 0.5

HOMEPAGE= https://poppler.freedesktop.org/

@@ -30,14 +27,13 @@ PERMIT_PACKAGE_CDROM= Yes

MASTER_SITES= ${HOMEPAGE}

-PSEUDO_FLAVORS=no_qt4 no_qt5 bootstrap
+PSEUDO_FLAVORS=no_qt5 bootstrap
# XXX not strictly a bootstrap loop, but on the critical path for libreoffice
-FLAVOR?=no_qt4 no_qt5 bootstrap
+FLAVOR?=no_qt5 bootstrap

-NOT_FOR_ARCHS-qt4 = arm
NOT_FOR_ARCHS-qt5 = arm

-MULTI_PACKAGES=-main -qt4 -qt5 -utils
+MULTI_PACKAGES=-main -qt5 -utils

# XXX build fails with ld.bfd: undefined references to X libs e.g.
#
@@ -58,12 +54,6 @@ cWANTLIB= expat freetype fontconfig jpeg

MODULES= devel/cmake

-.if ${BUILD_PACKAGES:M-qt4}
-MODULES+= x11/qt4
-.else
-CONFIGURE_ARGS+= --disable-poppler-qt4
-.endif
-
.if ${BUILD_PACKAGES:M-qt5}
MODULES+= x11/qt5
.else
@@ -85,10 +75,6 @@ LIB_DEPENDS-main=${MODGCC4_CPPLIBDEP} \
graphics/png \
graphics/tiff

-LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
- ${MODGCC4_CPPLIBDEP} \
- print/poppler
-
LIB_DEPENDS-qt5=${MODQT5_LIB_DEPENDS} \
${MODGCC4_CPPLIBDEP} \
print/poppler
@@ -101,11 +87,6 @@ WANTLIB-main= ${cWANTLIB} Xext ffi gio-2
png xcb xcb-render lcms2 xcb-shm \
iconv intl ${COMPILER_LIBCXX}

-WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtCore QtGui QtXml \
- SM X11 Xext Xi Xinerama Xrender ffi glib-2.0 \
- gobject-2.0 gthread-2.0 iconv intl lcms2 openjp2 \
- png poppler pcre ${COMPILER_LIBCXX} xcb
-
WANTLIB-qt5= ${cWANTLIB} $(COMPILER_LIBCXX) \
GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb \
Xdamage Xext Xfixes Xxf86vm drm execinfo glapi \
@@ -120,6 +101,7 @@ WANTLIB-utils= X11 Xext Xrender c cairo
CONFIGURE_ARGS+=-DENABLE_XPDF_HEADERS=True \
-DBUILD_GTK_TESTS=False \
-DENABLE_LIBCURL=False \
- -DCMAKE_DISABLE_FIND_PACKAGE_NSS3=True
+ -DCMAKE_DISABLE_FIND_PACKAGE_NSS3=True \
+ -DOpenJPEG_DIR=${LOCALBASE}/lib/openjp2

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.66
diff -u -p -r1.66 distinfo
--- distinfo 9 Dec 2018 17:47:45 -0000 1.66
+++ distinfo 27 Dec 2018 19:39:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.61.1.tar.xz) = EmYJY0P1FjwaWFEk6abURHThNF3lzf5V3HtHNXvPzak=
-SIZE (poppler-0.61.1.tar.xz) = 1433696
+SHA256 (poppler-0.72.0.tar.xz) = wXR+uPJunnU8QAHtlR2yiW7cECG20PVHoL0qJ8MK2lE=
+SIZE (poppler-0.72.0.tar.xz) = 1492912
Index: patches/patch-poppler_Form_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.2
diff -u -p -r1.2 patch-poppler_Form_cc
--- patches/patch-poppler_Form_cc 9 Dec 2018 17:47:45 -0000 1.2
+++ patches/patch-poppler_Form_cc 27 Dec 2018 19:39:16 -0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-poppler_Form_cc,v 1.2 20
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
-@@ -29,6 +29,7 @@
-