On Mon, Mar 21, 2016 at 02:53:42PM +0100, Matthias Kilian wrote:
> Hi,
>
> this updates poppler to 0.42.0. It does *not* include the new utility
> pdfsig(1), because upstream forgot to include the manpage in the
> distfile, and because it would add security/nss and the kitchensink
> as dependencies to all subpackages. I prefer to wait for the next
> release and have a look again, but if anyone thinks I should include
> it in this update, please let me know.
We can always add a subpackage for it.
>
> As always, tests are welcome. (I'm currently waiting for a dpb run
> on amd64 to finish and will then test several programs with it)
>
> Ciao,
> Kili
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.103
> diff -u -p -r1.103 Makefile
> --- Makefile 27 Feb 2016 19:21:32 -0000 1.103
> +++ Makefile 21 Mar 2016 13:42:49 -0000
> @@ -6,7 +6,7 @@ COMMENT-qt4= qt4 interface to PDF render
> COMMENT-qt5= Qt5 interface to PDF rendering library
> COMMENT-utils= PDF conversion tools and utilities
>
> -V= 0.41.0
> +V= 0.42.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 34.0 # 58.0
> +SHARED_LIBS += poppler 35.0 # 58.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
> @@ -102,11 +102,12 @@ WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WAN
> gobject-2.0 gthread-2.0 iconv intl lcms2 openjpeg \
> png poppler pcre pthread-stubs xcb
> WANTLIB-qt5= ${cWANTLIB} ${MODQT5_WANTLIB} ${MODGCC4_CPPWANTLIB} \
> - GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb Xau \
> - Xdamage Xdmcp Xext Xfixes Xxf86vm drm execinfo ffi glapi \
> - glib-2.0 gobject-2.0 gthread-2.0 iconv icudata icui18n \
> - icuuc intl lcms2 openjpeg pcre pcre16 png poppler \
> - pthread-stubs xcb xcb-dri2 xcb-glx
> + 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
> +
> WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
> png pthread-stubs xcb xcb-render xcb-shm openjpeg \
> poppler z ${cWANTLIB}
> @@ -117,7 +118,8 @@ CONFIGURE_ARGS+=--enable-xpdf-headers \
> --enable-poppler-cpp \
> --enable-utils \
> --enable-zlib \
> - --disable-gtk-test
> + --disable-gtk-test \
> + --disable-libnss
>
> CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib" \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/print/poppler/distinfo,v
> retrieving revision 1.51
> diff -u -p -r1.51 distinfo
> --- distinfo 27 Feb 2016 19:21:32 -0000 1.51
> +++ distinfo 21 Mar 2016 13:42:49 -0000
> @@ -1,4 +1,4 @@
> SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
> -SHA256 (poppler-0.41.0.tar.xz) = Qgq6q2PK7Z4e4olkoLohbRl5UGcmFkvJmtWt4okZKhs=
> +SHA256 (poppler-0.42.0.tar.xz) = n+8Hb/4qTxik4NpUfYFO9cXm+KKDr+M4dQSguxpBgBA=
> SIZE (poppler-0.16.7.tar.gz) = 1952179
> -SIZE (poppler-0.41.0.tar.xz) = 1655448
> +SIZE (poppler-0.42.0.tar.xz) = 1674024
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
> retrieving revision 1.12
> diff -u -p -r1.12 patch-Makefile_in
> --- patches/patch-Makefile_in 20 Nov 2015 07:47:44 -0000 1.12
> +++ patches/patch-Makefile_in 21 Mar 2016 13:42:49 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Makefile_in,v 1.12 2015/11/20 07:47:44 kili Exp $
> ---- Makefile.in.orig Mon Nov 16 21:45:23 2015
> -+++ Makefile.in Wed Nov 18 19:59:20 2015
> -@@ -386,6 +386,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
> +--- Makefile.in.orig Wed Mar 16 23:22:12 2016
> ++++ Makefile.in Mon Mar 21 11:04:17 2016
> +@@ -389,6 +389,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
> POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
> POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
> POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
> @@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2015/
> POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
> POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
> POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
> -@@ -448,6 +450,8 @@ infodir = @infodir@
> +@@ -451,6 +453,8 @@ infodir = @infodir@
> install_sh = @install_sh@
> libdir = @libdir@
> libexecdir = @libexecdir@
> @@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2015/
> localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
> -@@ -474,13 +478,15 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
> +@@ -477,13 +481,15 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
> @BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
> @BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
> @BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
> @@ -36,7 +36,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2015/
>
> # Add CMake buildsystem files here so they get added on make dist
> EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
> -@@ -525,6 +531,7 @@ pkgconfig_DATA = \
> +@@ -528,6 +534,7 @@ pkgconfig_DATA = \
> $(cairo_pc_file) \
> $(splash_pc_file) \
> $(glib_pc_file) \
> @@ -44,7 +44,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2015/
> $(qt4_pc_file) \
> $(qt5_pc_file) \
> $(cpp_pc_file)
> -@@ -596,6 +603,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
> +@@ -599,6 +606,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
> poppler-glib.pc: $(top_builddir)/config.status $(srcdir)/poppler-glib.pc.in
> cd $(top_builddir) && $(SHELL) ./config.status $@
> poppler-glib-uninstalled.pc: $(top_builddir)/config.status
> $(srcdir)/poppler-glib-uninstalled.pc.in
> Index: patches/patch-configure_ac
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
> retrieving revision 1.16
> diff -u -p -r1.16 patch-configure_ac
> --- patches/patch-configure_ac 18 Dec 2015 22:40:56 -0000 1.16
> +++ patches/patch-configure_ac 21 Mar 2016 13:42:49 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-configure_ac,v 1.16 2015/12/18 22:40:56 kili Exp $
> ---- configure.ac.orig Thu Dec 17 00:07:03 2015
> -+++ configure.ac Thu Dec 17 20:12:20 2015
> -@@ -643,6 +643,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
> +--- 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)
>
> GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
>
> @@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.16 2015
> dnl
> dnl Try Qt4
> dnl
> -@@ -735,31 +753,35 @@ if test x$enable_poppler_qt5 = xyes; then
> +@@ -776,31 +794,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.16 2015
> AC_SUBST(MOCQT5)
> AC_MSG_RESULT([$MOCQT5])
> fi
> -@@ -960,6 +982,9 @@ glib/reference/Makefile
> +@@ -1001,6 +1023,9 @@ glib/reference/Makefile
> glib/reference/version.xml
> glib/demo/Makefile
> test/Makefile
> @@ -85,11 +85,11 @@ $OpenBSD: patch-configure_ac,v 1.16 2015
> qt4/Makefile
> qt4/src/Makefile
> qt4/tests/Makefile
> -@@ -995,6 +1020,7 @@ if test x$enable_cmyk = xyes;then
> +@@ -1036,6 +1061,7 @@ if test x$enable_cmyk = xyes;then
> echo " with CMYK support"
> fi
> - echo " cairo output: $use_cairo"
> + echo " cairo output: $use_cairo"
> +echo " qt wrapper: $enable_poppler_qt"
> - echo " qt4 wrapper: $enable_poppler_qt4"
> - echo " qt5 wrapper: $enable_poppler_qt5"
> - echo " glib wrapper: $use_glib"
> + echo " qt4 wrapper: $enable_poppler_qt4"
> + echo " qt5 wrapper: $enable_poppler_qt5"
> + echo " glib wrapper: $use_glib"
> Index: patches/patch-poppler_XRef_cc
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
> retrieving revision 1.13
> diff -u -p -r1.13 patch-poppler_XRef_cc
> --- patches/patch-poppler_XRef_cc 28 Apr 2014 16:48:27 -0000 1.13
> +++ patches/patch-poppler_XRef_cc 21 Mar 2016 13:42:49 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-poppler_XRef_cc,v 1.13 2014/04/28 16:48:27 kili Exp $
> ---- poppler/XRef.cc.orig Sun Apr 6 16:08:14 2014
> -+++ poppler/XRef.cc Sun Apr 27 12:07:49 2014
> -@@ -1076,49 +1076,38 @@ void XRef::getEncryptionParameters(Guchar
> **fileKeyA,
> +--- 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,
> }
>
> GBool XRef::okToPrint(GBool ignoreOwnerPW) {
> Index: patches/patch-qt5_src_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_Makefile_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-qt5_src_Makefile_in
> --- patches/patch-qt5_src_Makefile_in 14 Dec 2015 14:25:47 -0000 1.1
> +++ patches/patch-qt5_src_Makefile_in 21 Mar 2016 13:42:49 -0000
> @@ -1,8 +1,8 @@
> $OpenBSD: patch-qt5_src_Makefile_in,v 1.1 2015/12/14 14:25:47 zhuk Exp $
> Reorder linking to make sure libestdc++ is picked up earlier than libstdc++.
> ---- qt5/src/Makefile.in.orig Fri Dec 11 20:57:08 2015
> -+++ qt5/src/Makefile.in Fri Dec 11 20:57:51 2015
> -@@ -517,8 +517,8 @@ libpoppler_qt5_la_CXXFLAGS = \
> +--- qt5/src/Makefile.in.orig Wed Mar 16 23:22:13 2016
> ++++ qt5/src/Makefile.in Mon Mar 21 11:04:17 2016
> +@@ -520,8 +520,8 @@ libpoppler_qt5_la_CXXFLAGS = \
> -Dpoppler_qt5_EXPORTS
>
> libpoppler_qt5_la_LIBADD = \
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
> retrieving revision 1.23
> diff -u -p -r1.23 PLIST-main
> --- pkg/PLIST-main 18 Dec 2015 22:40:57 -0000 1.23
> +++ pkg/PLIST-main 21 Mar 2016 13:42:49 -0000
> @@ -56,6 +56,7 @@ include/poppler/PreScanOutputDev.h
> include/poppler/ProfileData.h
> include/poppler/Rendition.h
> include/poppler/SecurityHandler.h
> +include/poppler/SignatureInfo.h
> include/poppler/Sound.h
> include/poppler/SplashOutputDev.h
> include/poppler/StdinCachedFile.h
> @@ -171,8 +172,6 @@ lib/pkgconfig/poppler-splash.pc
> lib/pkgconfig/poppler.pc
> share/gir-1.0/
> share/gir-1.0/Poppler-0.18.gir
> -share/gtk-doc/
> -share/gtk-doc/html/
> share/gtk-doc/html/poppler/
> share/gtk-doc/html/poppler/PopplerAnnot.html
> share/gtk-doc/html/poppler/PopplerAttachment.html
>
--
Antoine
