On Fri, Jul 08, 2016 at 11:05:20PM +0200, Matthias Kilian wrote:
> Hi,
>
> sthen@ pointed out that poppler with pdfsig(1) introduced dependencies
> on nss, which would require WANTLIB changes on a couple of other
> ports.
>
> So we could either disable pdfsig(1) in poppler (and fix WANTLIB
> in cups-filters), or keep it and fix WANTLIB in about 9 other ports.
> I prefer the former, because I just have the diffs ready for it ;-)
>
> Everyone who would be sad about poppler without pdfsig(1) for now,
> please speak up.
I have no opinion. Do whatever you think is best.
Worst case, we can re-introduce pdfsig(1) later if someone has a real need for
it.
> Index: print/poppler/Makefile
> ===================================================================
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.107
> diff -u -p -r1.107 Makefile
> --- print/poppler/Makefile 19 Jun 2016 19:42:26 -0000 1.107
> +++ print/poppler/Makefile 8 Jul 2016 20:56:21 -0000
> @@ -16,7 +16,9 @@ PKGNAME-qt4= poppler-qt4-$V
> PKGNAME-qt5= poppler-qt5-$V
> OLDSHIT = poppler-0.16.7
>
> -SHARED_LIBS += poppler 38.0 # 62.0
> +REVISION= 0
> +
> +SHARED_LIBS += poppler 39.0 # 62.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
> @@ -45,8 +47,7 @@ MULTI_PACKAGES=-main -qt -qt4 -qt5 -util
>
> .include <bsd.port.arch.mk>
>
> -cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z stdc++ \
> - nspr4 nss3 nss3 plc4 plds4 smime3
> +cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z stdc++
>
> .if ${BUILD_PACKAGES:M-qt}
> MODULES+= x11/qt3
> @@ -79,48 +80,42 @@ LIB_DEPENDS-main= \
> graphics/lcms2 \
> graphics/openjpeg \
> graphics/png \
> - graphics/tiff \
> - security/nss
> + graphics/tiff
>
> LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \
> - print/poppler \
> - security/nss
> + print/poppler
>
> LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
> - print/poppler \
> - security/nss
> + print/poppler
>
> LIB_DEPENDS-qt5=${MODQT5_LIB_DEPENDS} \
> - print/poppler \
> - security/nss
> + print/poppler
>
> -LIB_DEPENDS-utils= print/poppler \
> - security/nss
> +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 \
> - iconv intl nssutil3 plds4 softokn3 sqlite3 ssl3
> + iconv intl
>
> WANTLIB-qt= ${cWANTLIB} lcms2 openjpeg poppler png pthread-stubs \
> - softokn3 ssl3 ${MODQT3_WANTLIB}
> + ${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 softokn3 ssl3
> + png poppler pcre pthread-stubs xcb
>
> 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 \
> - softokn3 ssl3
> + 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} softokn3 ssl3
> + poppler z ${cWANTLIB}
>
> CONFIGURE_STYLE=autoconf
> AUTOCONF_VERSION=2.69
> @@ -128,7 +123,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: print/poppler/pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
> retrieving revision 1.25
> diff -u -p -r1.25 PLIST-main
> --- print/poppler/pkg/PLIST-main 1 May 2016 12:33:24 -0000 1.25
> +++ print/poppler/pkg/PLIST-main 8 Jul 2016 20:56:21 -0000
> @@ -56,7 +56,6 @@ 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
> Index: print/poppler/pkg/PLIST-utils
> ===================================================================
> RCS file: /cvs/ports/print/poppler/pkg/PLIST-utils,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST-utils
> --- print/poppler/pkg/PLIST-utils 1 May 2016 12:33:24 -0000 1.3
> +++ print/poppler/pkg/PLIST-utils 8 Jul 2016 20:56:21 -0000
> @@ -7,7 +7,6 @@
> @bin bin/pdfimages
> @bin bin/pdfinfo
> @bin bin/pdfseparate
> -@bin bin/pdfsig
> @bin bin/pdftocairo
> @bin bin/pdftohtml
> @bin bin/pdftoppm
> @@ -19,7 +18,6 @@
> @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
> Index: print/cups-filters/Makefile
> ===================================================================
> RCS file: /cvs/ports/print/cups-filters/Makefile,v
> retrieving revision 1.89
> diff -u -p -r1.89 Makefile
> --- print/cups-filters/Makefile 11 Jun 2016 10:06:23 -0000 1.89
> +++ print/cups-filters/Makefile 8 Jul 2016 20:56:21 -0000
> @@ -8,6 +8,8 @@ COMMENT= OpenPrinting CUPS filters
> DISTNAME= cups-filters-1.9.0
> CATEGORIES= print
>
> +REVISION= 0
> +
> SHARED_LIBS += cupsfilters 1.0 # 1.0
> SHARED_LIBS += fontembed 0.0 # 1.0
>
> @@ -21,9 +23,9 @@ PERMIT_PACKAGE_CDROM= Yes
> WANTLIB += avahi-client avahi-common avahi-glib c cups cupsimage
> WANTLIB += dbus-1 expat ffi fontconfig freetype gio-2.0 glib-2.0
> WANTLIB += gmodule-2.0 gmp gnutls gobject-2.0 hogweed idn ijs
> -WANTLIB += jpeg lcms2 m nettle nspr4 nss3 openjpeg p11-kit pcre
> -WANTLIB += plc4 plds4 png poppler pthread pthread-stubs qpdf smime3
> -WANTLIB += softokn3 ssl3 tasn1 tiff z
> +WANTLIB += jpeg lcms2 m nettle openjpeg p11-kit pcre
> +WANTLIB += png poppler pthread pthread-stubs qpdf
> +WANTLIB += tasn1 tiff z
>
> MASTER_SITES= http://www.openprinting.org/download/cups-filters/
>
>
--
Antoine
