[pkgsrc/trunk]: pkgsrc/print poppler*: reenable splash backend - needed to di...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b86d6119d8dd
branches:  trunk
changeset: 423937:b86d6119d8dd
user:      markd <markd%pkgsrc.org@localhost>
date:      Sun Mar 01 11:18:58 2020 +0000

description:
poppler*: reenable splash backend - needed to display output in poppler-qt
based backends.
also add nss dependency and be explicit in the tiff dependency.

diffstat:

 print/poppler-cpp/Makefile    |  4 +---
 print/poppler-glib/Makefile   |  5 ++---
 print/poppler-qt5/Makefile    |  5 ++---
 print/poppler-utils/Makefile  |  5 ++---
 print/poppler-utils/PLIST     |  6 +++++-
 print/poppler/Makefile        |  7 ++++---
 print/poppler/Makefile.common |  6 ++----
 print/poppler/PLIST           |  3 ++-
 print/poppler/buildlink3.mk   |  4 +++-
 9 files changed, 23 insertions(+), 22 deletions(-)

diffs (202 lines):

diff -r a47dbb1277ed -r b86d6119d8dd print/poppler-cpp/Makefile
--- a/print/poppler-cpp/Makefile        Sun Mar 01 11:18:45 2020 +0000
+++ b/print/poppler-cpp/Makefile        Sun Mar 01 11:18:58 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/11/04 19:58:00 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2020/03/01 11:18:58 markd Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -10,8 +10,6 @@
 
 PKGCONFIG_OVERRIDE+=   ${WRKSRC}/poppler-cpp.pc.cmake
 
-# Don't build the cairo graphics backend, required by glib.
-CMAKE_ARGS+=   -DENABLE_SPLASH=OFF
 # Don't compile GTK+ test program.
 CMAKE_ARGS+=   -DBUILD_GTK_TESTS=OFF
 # Don't compile GLib wrapper which also needs gtk2
diff -r a47dbb1277ed -r b86d6119d8dd print/poppler-glib/Makefile
--- a/print/poppler-glib/Makefile       Sun Mar 01 11:18:45 2020 +0000
+++ b/print/poppler-glib/Makefile       Sun Mar 01 11:18:58 2020 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.82 2020/02/24 17:29:25 brook Exp $
+# $NetBSD: Makefile,v 1.83 2020/03/01 11:18:59 markd Exp $
 
+PKGREVISION=   1
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=       poppler-glib-${POPPLER_VERS}
@@ -17,8 +18,6 @@
 CMAKE_ARGS+=   -DGLIB2_INCLUDE_DIRS=${PREFIX}/include
 .endif
 
-# Don't build the splash graphics backend.
-CMAKE_ARGS+=   -DENABLE_SPLASH=OFF
 # Don't compile GTK+ test program.
 CMAKE_ARGS+=   -DBUILD_GTK_TESTS=OFF
 # Compile GLib wrapper which also needs gtk2
diff -r a47dbb1277ed -r b86d6119d8dd print/poppler-qt5/Makefile
--- a/print/poppler-qt5/Makefile        Sun Mar 01 11:18:45 2020 +0000
+++ b/print/poppler-qt5/Makefile        Sun Mar 01 11:18:58 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2020/01/18 21:50:32 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2020/03/01 11:18:59 markd Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=       poppler-qt5-${POPPLER_VERS}
@@ -9,7 +9,6 @@
 
 CMAKE_ARGS+=   -DBUILD_GTK_TESTS=OFF
 CMAKE_ARGS+=   -DENABLE_GLIB=OFF
-CMAKE_ARGS+=   -DENABLE_SPLASH=OFF
 CMAKE_ARGS+=   -DENABLE_UTILS=OFF
 CMAKE_ARGS+=   -DENABLE_CPP=OFF
 CMAKE_ARGS+=   -DENABLE_QT5=ON
diff -r a47dbb1277ed -r b86d6119d8dd print/poppler-utils/Makefile
--- a/print/poppler-utils/Makefile      Sun Mar 01 11:18:45 2020 +0000
+++ b/print/poppler-utils/Makefile      Sun Mar 01 11:18:58 2020 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2019/10/19 12:37:05 nia Exp $
+# $NetBSD: Makefile,v 1.45 2020/03/01 11:18:59 markd Exp $
 
+PKGREVISION=   1
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=       poppler-utils-${POPPLER_VERS}
@@ -8,8 +9,6 @@
 CONFLICTS+=    poppler-0.5.1{,nb*}
 CONFLICTS+=    xpdf<3.02pl4nb1
 
-# Don't build the splash graphics backend.
-CMAKE_ARGS+=   -DENABLE_SPLASH=OFF
 # Don't compile GTK+ test program.
 CMAKE_ARGS+=   -DBUILD_GTK_TESTS=OFF
 # Don't compile GLib wrapper which also needs gtk2
diff -r a47dbb1277ed -r b86d6119d8dd print/poppler-utils/PLIST
--- a/print/poppler-utils/PLIST Sun Mar 01 11:18:45 2020 +0000
+++ b/print/poppler-utils/PLIST Sun Mar 01 11:18:58 2020 +0000
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2019/10/19 12:37:05 nia Exp $
+@comment $NetBSD: PLIST,v 1.8 2020/03/01 11:18:59 markd Exp $
 bin/pdfattach
 bin/pdfdetach
 bin/pdffonts
 bin/pdfimages
 bin/pdfinfo
 bin/pdfseparate
+bin/pdfsig
 bin/pdftocairo
 bin/pdftohtml
+bin/pdftoppm
 bin/pdftops
 bin/pdftotext
 bin/pdfunite
@@ -16,8 +18,10 @@
 man/man1/pdfimages.1
 man/man1/pdfinfo.1
 man/man1/pdfseparate.1
+man/man1/pdfsig.1
 man/man1/pdftocairo.1
 man/man1/pdftohtml.1
+man/man1/pdftoppm.1
 man/man1/pdftops.1
 man/man1/pdftotext.1
 man/man1/pdfunite.1
diff -r a47dbb1277ed -r b86d6119d8dd print/poppler/Makefile
--- a/print/poppler/Makefile    Sun Mar 01 11:18:45 2020 +0000
+++ b/print/poppler/Makefile    Sun Mar 01 11:18:58 2020 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2019/10/19 12:37:04 nia Exp $
+# $NetBSD: Makefile,v 1.76 2020/03/01 11:18:58 markd Exp $
 
+PKGREVISION=   1
 .include "../../print/poppler/Makefile.common"
 
 COMMENT=       PDF rendering library
@@ -9,8 +10,6 @@
 
 INSTALLATION_DIRS+=    include/poppler share/doc/poppler
 
-# Don't build the splash graphics backend.
-CMAKE_ARGS+=   -DENABLE_SPLASH=OFF
 # Don't compile GTK+ test program.
 CMAKE_ARGS+=   -DBUILD_GTK_TESTS=OFF
 # Don't compile GLib wrapper which also needs gtk2
@@ -36,10 +35,12 @@
        ${INSTALL_MAN} ${WRKSRC}/README-XPDF ${DESTDIR}${PREFIX}/share/doc/poppler/
        ${RMDIR} ${DESTDIR}${PREFIX}/include/poppler || ${TRUE}
 
+.include "../../devel/nss/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a47dbb1277ed -r b86d6119d8dd print/poppler/Makefile.common
--- a/print/poppler/Makefile.common     Sun Mar 01 11:18:45 2020 +0000
+++ b/print/poppler/Makefile.common     Sun Mar 01 11:18:58 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.114 2020/01/10 13:24:18 wiz Exp $
+# $NetBSD: Makefile.common,v 1.115 2020/03/01 11:18:58 markd Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -25,12 +25,10 @@
 USE_TOOLS+=            pkg-config
 GCC_REQD+=             5
 
-# Don't accidentally find libtiff
-CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE
-
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 BUILDLINK_TRANSFORM+=   rm:-fno-check-new
 .endif
 
+.include "../../devel/boost-headers/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
diff -r a47dbb1277ed -r b86d6119d8dd print/poppler/PLIST
--- a/print/poppler/PLIST       Sun Mar 01 11:18:45 2020 +0000
+++ b/print/poppler/PLIST       Sun Mar 01 11:18:58 2020 +0000
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.25 2020/01/10 13:24:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.26 2020/03/01 11:18:58 markd Exp $
 lib/libpoppler.so
 lib/libpoppler.so.94
 lib/libpoppler.so.94.0.0
 lib/pkgconfig/poppler-cairo.pc
+lib/pkgconfig/poppler-splash.pc
 lib/pkgconfig/poppler.pc
 share/doc/poppler/README-XPDF
 share/doc/poppler/README.md
diff -r a47dbb1277ed -r b86d6119d8dd print/poppler/buildlink3.mk
--- a/print/poppler/buildlink3.mk       Sun Mar 01 11:18:45 2020 +0000
+++ b/print/poppler/buildlink3.mk       Sun Mar 01 11:18:58 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.77 2019/11/07 12:38:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.78 2020/03/01 11:18:58 markd Exp $
 
 BUILDLINK_TREE+=       poppler
 
@@ -11,12 +11,14 @@
 
 GCC_REQD+=     5
 
+.include "../../devel/nss/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .endif # POPPLER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -poppler