Hi, this is an update to poppler-0.43.0. It also replaces the gettext module by normal dependencies and enables libnss (for pdfsig(1)). For easier read, I've split it up into three separate diffs.
I'm currently running a bulk build with this on amd64. Tests and comments are welcome. Ciao, Kili *** part 1: replcae gettext module: Index: Makefile =================================================================== RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.104 diff -u -p -r1.104 Makefile --- Makefile 23 Mar 2016 20:09:34 -0000 1.104 +++ Makefile 29 Apr 2016 19:35:32 -0000 @@ -65,14 +65,15 @@ MODULES+= x11/qt5 CONFIGURE_ARGS+= --disable-poppler-qt5 .endif -MODULES+= devel/gettext - BUILD_DEPENDS+= devel/gobject-introspection -RUN_DEPENDS-main=${MODGETTEXT_RUN_DEPENDS} \ +RUN_DEPENDS-main= \ + devel/gettext \ print/poppler-data>=0.4.7 -LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \ +LIB_DEPENDS-main= \ + converters/libiconv \ + devel/gettext \ devel/glib2 \ graphics/cairo \ graphics/lcms2 \ @@ -94,7 +95,7 @@ LIB_DEPENDS-utils= print/poppler WANTLIB-main= ${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \ gobject-2.0 pixman-1 openjpeg X11 Xrender cairo pcre \ png pthread-stubs xcb xcb-render lcms2 xcb-shm \ - ${MODGETTEXT_WANTLIB} + iconv intl WANTLIB-qt= ${cWANTLIB} lcms2 openjpeg poppler png pthread-stubs \ ${MODQT3_WANTLIB} WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtCore QtGui QtXml \ *** part 2: update to poppler-0.43.0 diff -rup -x CVS ./Makefile ../poppler/Makefile --- ./Makefile Fri Apr 29 21:44:13 2016 +++ ../poppler/Makefile Fri Apr 29 21:44:39 2016 @@ -6,7 +6,7 @@ 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.42.0 +V= 0.43.0 DISTNAME= poppler-$V CATEGORIES= print PKGNAME-main= poppler-$V @@ -16,7 +16,7 @@ PKGNAME-qt4= poppler-qt4-$V PKGNAME-qt5= poppler-qt5-$V OLDSHIT = poppler-0.16.7 -SHARED_LIBS += poppler 35.0 # 58.0 +SHARED_LIBS += poppler 36.0 # 60.0 SHARED_LIBS += poppler-glib 15.0 # 15.0 SHARED_LIBS += poppler-qt 12.0 # 3.0 SHARED_LIBS += poppler-qt4 18.0 # 13.0 diff -rup -x CVS ./distinfo ../poppler/distinfo --- ./distinfo Fri Apr 29 21:44:13 2016 +++ ../poppler/distinfo Fri Apr 29 21:44:39 2016 @@ -1,4 +1,4 @@ SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80= -SHA256 (poppler-0.42.0.tar.xz) = n+8Hb/4qTxik4NpUfYFO9cXm+KKDr+M4dQSguxpBgBA= +SHA256 (poppler-0.43.0.tar.xz) = xyDiaibuELfryeJW0u563NtTbPhfnxxHd6OPf4H7JFY= SIZE (poppler-0.16.7.tar.gz) = 1952179 -SIZE (poppler-0.42.0.tar.xz) = 1674024 +SIZE (poppler-0.43.0.tar.xz) = 1671368 diff -rup -x CVS ./patches/patch-configure_ac ../poppler/patches/patch-configure_ac --- ./patches/patch-configure_ac Fri Apr 29 21:44:13 2016 +++ ../poppler/patches/patch-configure_ac Fri Apr 29 21:44:40 2016 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2016/03/23 20:09:34 kili Exp $ ---- configure.ac.orig Wed Mar 16 20:35:38 2016 -+++ configure.ac Mon Mar 21 11:06:07 2016 -@@ -684,6 +684,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES) +--- configure.ac.orig Fri Apr 29 00:30:06 2016 ++++ configure.ac Fri Apr 29 20:48:31 2016 +@@ -679,6 +679,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES) GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) @@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2016/03/23 20:09:3 dnl dnl Try Qt4 dnl -@@ -776,31 +794,35 @@ if test x$enable_poppler_qt5 = xyes; then +@@ -771,31 +789,35 @@ if test x$enable_poppler_qt5 = xyes; then AC_CHECK_TOOL(MOCQT5, moc) AC_MSG_CHECKING([for Qt5 moc]) mocversion=`$MOCQT5 -v 2>&1` @@ -75,7 +75,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2016/03/23 20:09:3 AC_SUBST(MOCQT5) AC_MSG_RESULT([$MOCQT5]) fi -@@ -1001,6 +1023,9 @@ glib/reference/Makefile +@@ -996,6 +1018,9 @@ glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile test/Makefile @@ -85,7 +85,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2016/03/23 20:09:3 qt4/Makefile qt4/src/Makefile qt4/tests/Makefile -@@ -1036,6 +1061,7 @@ if test x$enable_cmyk = xyes;then +@@ -1031,6 +1056,7 @@ if test x$enable_cmyk = xyes;then echo " with CMYK support" fi echo " cairo output: $use_cairo" diff -rup -x CVS ./patches/patch-poppler_XRef_cc ../poppler/patches/patch-poppler_XRef_cc --- ./patches/patch-poppler_XRef_cc Fri Apr 29 21:44:13 2016 +++ ../poppler/patches/patch-poppler_XRef_cc Fri Apr 29 21:44:40 2016 @@ -1,7 +1,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.14 2016/03/23 20:09:34 kili Exp $ ---- poppler/XRef.cc.orig Wed Mar 16 10:36:12 2016 -+++ poppler/XRef.cc Mon Mar 21 11:04:17 2016 -@@ -1077,49 +1077,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA, +--- poppler/XRef.cc.orig Thu Apr 28 09:51:41 2016 ++++ poppler/XRef.cc Fri Apr 29 20:48:29 2016 +@@ -1087,49 +1087,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA, } GBool XRef::okToPrint(GBool ignoreOwnerPW) { diff -rup -x CVS ./pkg/PLIST-main ../poppler/pkg/PLIST-main --- ./pkg/PLIST-main Fri Apr 29 21:44:13 2016 +++ ../poppler/pkg/PLIST-main Fri Apr 29 21:44:40 2016 @@ -196,7 +196,6 @@ share/gtk-doc/html/poppler/api-index-full.html share/gtk-doc/html/poppler/ch01.html share/gtk-doc/html/poppler/home.png share/gtk-doc/html/poppler/index.html -share/gtk-doc/html/poppler/index.sgml share/gtk-doc/html/poppler/left-insensitive.png share/gtk-doc/html/poppler/left.png share/gtk-doc/html/poppler/poppler-Error-handling.html *** part 3: enable libnss to get pdfsig(1): diff -rup -x CVS ./Makefile ../poppler/Makefile --- ./Makefile Fri Apr 29 21:44:39 2016 +++ ../poppler/Makefile Fri Apr 29 23:14:53 2016 @@ -45,7 +45,8 @@ MULTI_PACKAGES=-main -qt -qt4 -qt5 -utils .include <bsd.port.arch.mk> -cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z stdc++ +cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z stdc++ \ + nspr4 nss3 nss3 plc4 plds4 smime3 .if ${BUILD_PACKAGES:M-qt} MODULES+= x11/qt3 @@ -79,39 +80,48 @@ LIB_DEPENDS-main= \ graphics/lcms2 \ graphics/openjpeg \ graphics/png \ - graphics/tiff + graphics/tiff \ + security/nss LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \ - print/poppler + print/poppler \ + security/nss LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \ - print/poppler + print/poppler \ + security/nss LIB_DEPENDS-qt5=${MODQT5_LIB_DEPENDS} \ - print/poppler + print/poppler \ + security/nss -LIB_DEPENDS-utils= print/poppler +LIB_DEPENDS-utils= print/poppler \ + security/nss WANTLIB-main= ${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \ gobject-2.0 pixman-1 openjpeg X11 Xrender cairo pcre \ png pthread-stubs xcb xcb-render lcms2 xcb-shm \ - iconv intl + iconv intl nssutil3 plds4 softokn3 sqlite3 ssl3 + WANTLIB-qt= ${cWANTLIB} lcms2 openjpeg poppler png pthread-stubs \ - ${MODQT3_WANTLIB} + softokn3 ssl3 ${MODQT3_WANTLIB} + 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 openjpeg \ - png poppler pcre pthread-stubs xcb + png poppler pcre pthread-stubs xcb softokn3 ssl3 + WANTLIB-qt5= ${cWANTLIB} ${MODQT5_WANTLIB} ${MODGCC4_CPPWANTLIB} \ GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb \ Xdamage Xext Xfixes Xxf86vm drm execinfo ffi glapi \ glib-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz \ iconv icudata icui18n icuuc intl lcms2 openjpeg pcre \ - pcre16 png poppler pthread-stubs xcb xcb-dri2 xcb-glx + pcre16 png poppler pthread-stubs xcb xcb-dri2 xcb-glx \ + softokn3 ssl3 WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \ png pthread-stubs xcb xcb-render xcb-shm openjpeg \ - poppler z ${cWANTLIB} + poppler z ${cWANTLIB} softokn3 ssl3 CONFIGURE_STYLE=autoconf AUTOCONF_VERSION=2.69 @@ -119,8 +129,7 @@ CONFIGURE_ARGS+=--enable-xpdf-headers \ --enable-poppler-cpp \ --enable-utils \ --enable-zlib \ - --disable-gtk-test \ - --disable-libnss + --disable-gtk-test CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ diff -rup -x CVS ./pkg/PLIST-main ../poppler/pkg/PLIST-main --- ./pkg/PLIST-main Fri Apr 29 21:44:40 2016 +++ ../poppler/pkg/PLIST-main Sat Apr 30 20:10:42 2016 @@ -56,6 +56,7 @@ include/poppler/PreScanOutputDev.h include/poppler/ProfileData.h include/poppler/Rendition.h include/poppler/SecurityHandler.h +include/poppler/SignatureHandler.h include/poppler/SignatureInfo.h include/poppler/Sound.h include/poppler/SplashOutputDev.h diff -rup -x CVS ./pkg/PLIST-utils ../poppler/pkg/PLIST-utils --- ./pkg/PLIST-utils Mon Mar 21 11:35:41 2016 +++ ../poppler/pkg/PLIST-utils Fri Apr 29 22:47:10 2016 @@ -7,6 +7,7 @@ @bin bin/pdfimages @bin bin/pdfinfo @bin bin/pdfseparate +@bin bin/pdfsig @bin bin/pdftocairo @bin bin/pdftohtml @bin bin/pdftoppm @@ -18,6 +19,7 @@ @man man/man1/pdfimages.1 @man man/man1/pdfinfo.1 @man man/man1/pdfseparate.1 +@man man/man1/pdfsig.1 @man man/man1/pdftocairo.1 @man man/man1/pdftohtml.1 @man man/man1/pdftoppm.1