CVS commit: pkgsrc/print

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/print
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 9 May 2019 09:28:23 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu May  9 09:28:23 UTC 2019

Modified Files:
        pkgsrc/print/poppler: Makefile Makefile.common PLIST buildlink3.mk
            distinfo
        pkgsrc/print/poppler-cpp: Makefile buildlink3.mk
        pkgsrc/print/poppler-glib: Makefile buildlink3.mk
        pkgsrc/print/poppler-includes: Makefile PLIST buildlink3.mk
        pkgsrc/print/poppler-qt5: Makefile buildlink3.mk
        pkgsrc/print/poppler-utils: Makefile PLIST

Log Message:
poppler: updated to 0.76.1

poppler-0.76.1:

core:
 * Make the mul tables be calculated at compile time with constexpr.
 * splash: Fix compile with SPLASH_CMYK enabled
 * Some typo fixing in error messages

qt5:
 * Fix regression in annotation handling

build system:
 * Fix some typos in build system output and comments

poppler-0.76.0:

core:
 * Fix regression on case-insensitive search.
 * Remove GooList, use std::vector instead
 * Fix radiobutton reporting wrong state.
 * Handle UTF16-LE strings
 * Don't error out if there's no DA in FreeText annotation
 * cairo: Compute correct coverage values for box filter.
 * cairo: Constrain number of cycles in rescale filter.
 * Read more fields from ViewerPreferences
 * Introduce and use Ref::INVALID
 * Fix crashes in broken files
 * Fix mismatched free/delete
 * Add missing include guards

utils:
 * pdftohtml: Properly initialize HtmlOutputDev::page to avoid SIGSEGV upon error exit.

poppler-0.75.0:

core:
 * Fix rendering of some annotations
 * Fix crashes in broken files
 * Small internal code improvements

cpp:
 * Improve documentation
 * tests: Add showing version information to poppler-dump

utils:
 * pdfattach: new util
 * pdftohtml: add -dataurls parameter
 * pdftoppm: add -sep and -forcenum parameters
 * pdftohtml: make singleHtml and stout not mutually exclusive
 * pdfsig: fix use after free


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/print/poppler/Makefile \
    pkgsrc/print/poppler/buildlink3.mk
cvs rdiff -u -r1.108 -r1.109 pkgsrc/print/poppler/Makefile.common
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/poppler/PLIST
cvs rdiff -u -r1.137 -r1.138 pkgsrc/print/poppler/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/print/poppler-cpp/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/print/poppler-cpp/buildlink3.mk
cvs rdiff -u -r1.74 -r1.75 pkgsrc/print/poppler-glib/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/print/poppler-glib/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/print/poppler-includes/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/print/poppler-includes/PLIST
cvs rdiff -u -r1.41 -r1.42 pkgsrc/print/poppler-includes/buildlink3.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/print/poppler-qt5/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/print/poppler-qt5/buildlink3.mk
cvs rdiff -u -r1.42 -r1.43 pkgsrc/print/poppler-utils/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/poppler-utils/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/poppler/Makefile
diff -u pkgsrc/print/poppler/Makefile:1.72 pkgsrc/print/poppler/Makefile:1.73
--- pkgsrc/print/poppler/Makefile:1.72  Tue Apr 17 18:07:37 2018
+++ pkgsrc/print/poppler/Makefile       Thu May  9 09:28:22 2019
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2018/04/17 18:07:37 adam Exp $
+# $NetBSD: Makefile,v 1.73 2019/05/09 09:28:22 adam Exp $
 
 .include "../../print/poppler/Makefile.common"
 
-COMMENT=               PDF rendering library
-MAINTAINER=            reed%reedmedia.net@localhost
+COMMENT=       PDF rendering library
 
 #PKGCONFIG_OVERRIDE+=  ${WRKSRC}/poppler-cairo.pc.cmake
 PKGCONFIG_OVERRIDE+=   ${WRKSRC}/poppler-splash.pc.cmake
Index: pkgsrc/print/poppler/buildlink3.mk
diff -u pkgsrc/print/poppler/buildlink3.mk:1.72 pkgsrc/print/poppler/buildlink3.mk:1.73
--- pkgsrc/print/poppler/buildlink3.mk:1.72     Wed Mar 27 11:18:38 2019
+++ pkgsrc/print/poppler/buildlink3.mk  Thu May  9 09:28:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.72 2019/03/27 11:18:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.73 2019/05/09 09:28:22 adam Exp $
 
 BUILDLINK_TREE+=       poppler
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        poppler
 POPPLER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler+=        poppler>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler+=        poppler>=0.74.0
+BUILDLINK_ABI_DEPENDS.poppler+=        poppler>=0.76.0
 BUILDLINK_PKGSRCDIR.poppler?=  ../../print/poppler
 
 GCC_REQD+=     4.9

Index: pkgsrc/print/poppler/Makefile.common
diff -u pkgsrc/print/poppler/Makefile.common:1.108 pkgsrc/print/poppler/Makefile.common:1.109
--- pkgsrc/print/poppler/Makefile.common:1.108  Wed Mar 27 11:18:38 2019
+++ pkgsrc/print/poppler/Makefile.common        Thu May  9 09:28:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.108 2019/03/27 11:18:38 wiz Exp $
+# $NetBSD: Makefile.common,v 1.109 2019/05/09 09:28:22 adam Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -7,25 +7,24 @@
 # used by print/poppler-qt5/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=          0.74.0
-DISTNAME=              poppler-${POPPLER_VERS}
-CATEGORIES=            print
-MASTER_SITES=          https://poppler.freedesktop.org/
-EXTRACT_SUFX=          .tar.xz
+POPPLER_VERS=  0.76.1
+DISTNAME=      poppler-${POPPLER_VERS}
+CATEGORIES=    print
+MASTER_SITES=  https://poppler.freedesktop.org/
+EXTRACT_SUFX=  .tar.xz
+
+MAINTAINER=    reed%reedmedia.net@localhost
+HOMEPAGE=      https://poppler.freedesktop.org/
+LICENSE=       gnu-gpl-v2
 
-HOMEPAGE=              https://poppler.freedesktop.org/
-LICENSE=               gnu-gpl-v2
+DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo
+PATCHDIR=      ${.CURDIR}/../../print/poppler/patches
 
-DISTINFO_FILE=         ${.CURDIR}/../../print/poppler/distinfo
-PATCHDIR=              ${.CURDIR}/../../print/poppler/patches
-
-USE_TOOLS+=            pkg-config
-USE_LIBTOOL=           yes
+USE_CMAKE=             yes
 USE_LANGUAGES=         c c++14
+USE_TOOLS+=            pkg-config
 GCC_REQD+=             4.9
 
-USE_CMAKE=             yes
-
 # Don't accidentally find libtiff
 CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE
 

Index: pkgsrc/print/poppler/PLIST
diff -u pkgsrc/print/poppler/PLIST:1.20 pkgsrc/print/poppler/PLIST:1.21
--- pkgsrc/print/poppler/PLIST:1.20     Wed Mar 27 11:18:38 2019
+++ pkgsrc/print/poppler/PLIST  Thu May  9 09:28:22 2019
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.20 2019/03/27 11:18:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2019/05/09 09:28:22 adam Exp $
 lib/libpoppler.so
-lib/libpoppler.so.85
-lib/libpoppler.so.85.0.0
+lib/libpoppler.so.87
+lib/libpoppler.so.87.0.0
 lib/pkgconfig/poppler-splash.pc
 lib/pkgconfig/poppler.pc
 share/doc/poppler/README

Index: pkgsrc/print/poppler/distinfo
diff -u pkgsrc/print/poppler/distinfo:1.137 pkgsrc/print/poppler/distinfo:1.138
--- pkgsrc/print/poppler/distinfo:1.137 Wed Mar 27 11:18:38 2019
+++ pkgsrc/print/poppler/distinfo       Thu May  9 09:28:22 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.137 2019/03/27 11:18:38 wiz Exp $
+$NetBSD: distinfo,v 1.138 2019/05/09 09:28:22 adam Exp $
 
-SHA1 (poppler-0.74.0.tar.xz) = 9b2029e855d35d38d177512b58d972c5b2e9d61f
-RMD160 (poppler-0.74.0.tar.xz) = a50bb9ec9522f5ddf70907e0bbed1bbee10372ad
-SHA512 (poppler-0.74.0.tar.xz) = 4e48e2ffb559863ee693930db3b8594fd7e60e4b4ca3cdeb198faf90a6f4dbb5e102461492a12058221bc1218fe7e17c9085afb9e7956ae4bf26c11674315e66
-Size (poppler-0.74.0.tar.xz) = 1514044 bytes
+SHA1 (poppler-0.76.1.tar.xz) = 6f0b33b347d4dab47cdcae3cb98174dcc6f9a9eb
+RMD160 (poppler-0.76.1.tar.xz) = b1957e8052ee5c681082378161213963a8e9b506
+SHA512 (poppler-0.76.1.tar.xz) = e4af2785948ecc89c105ab00269b0072b33feea25224e5beb158d515b1de789f979084bed2d4260c9659382cf437c25c0baf2444f5b4fbbba5c58afeb707b7ac
+Size (poppler-0.76.1.tar.xz) = 1531548 bytes
 SHA1 (patch-poppler_CMap.cc) = d37745ea4cbeae76ad43c4ac74e942531f7b7dd8

Index: pkgsrc/print/poppler-cpp/Makefile
diff -u pkgsrc/print/poppler-cpp/Makefile:1.19 pkgsrc/print/poppler-cpp/Makefile:1.20
--- pkgsrc/print/poppler-cpp/Makefile:1.19      Tue Apr 17 05:20:34 2018
+++ pkgsrc/print/poppler-cpp/Makefile   Thu May  9 09:28:22 2019
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.19 2018/04/17 05:20:34 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/05/09 09:28:22 adam Exp $
 
 .include "../../print/poppler/Makefile.common"
 
-PKGNAME=               poppler-cpp-${POPPLER_VERS}
+PKGNAME=       poppler-cpp-${POPPLER_VERS}
 
-COMMENT=               PDF rendering library (cpp wrapper)
-MAINTAINER=            reed%reedmedia.net@localhost
+COMMENT=       PDF rendering library (cpp wrapper)
 
-CONFLICTS+=            poppler<0.4.5nb1
+CONFLICTS+=    poppler<0.4.5nb1
 
 PKGCONFIG_OVERRIDE+=   ${WRKSRC}/poppler-cpp.pc.cmake
 
@@ -43,8 +42,8 @@ CHECK_BUILTIN.iconv:= yes
 CHECK_BUILTIN.iconv:=  no
 
 .if !empty(USE_BUILTIN.iconv:M[nN][oO])
-CMAKE_ARGS+=           -DICONV_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.iconv}/include
-CMAKE_ARGS+=           -DICONV_LIBRARIES:PATH=${BUILDLINK_PREFIX.iconv}/lib
+CMAKE_ARGS+=   -DICONV_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.iconv}/include
+CMAKE_ARGS+=   -DICONV_LIBRARIES:PATH=${BUILDLINK_PREFIX.iconv}/lib
 .endif
 
 post-install:

Index: pkgsrc/print/poppler-cpp/buildlink3.mk
diff -u pkgsrc/print/poppler-cpp/buildlink3.mk:1.45 pkgsrc/print/poppler-cpp/buildlink3.mk:1.46
--- pkgsrc/print/poppler-cpp/buildlink3.mk:1.45 Wed Mar 27 11:18:38 2019
+++ pkgsrc/print/poppler-cpp/buildlink3.mk      Thu May  9 09:28:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.45 2019/03/27 11:18:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.46 2019/05/09 09:28:22 adam Exp $
 
 BUILDLINK_TREE+=       poppler-cpp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        poppler-cpp
 POPPLER_CPP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler-cpp+=    poppler-cpp>=0.16.7
-BUILDLINK_ABI_DEPENDS.poppler-cpp+=    poppler-cpp>=0.74.0
+BUILDLINK_ABI_DEPENDS.poppler-cpp+=    poppler-cpp>=0.76.0
 BUILDLINK_PKGSRCDIR.poppler-cpp?=      ../../print/poppler-cpp
 
 .include "../../print/poppler/buildlink3.mk"

Index: pkgsrc/print/poppler-glib/Makefile
diff -u pkgsrc/print/poppler-glib/Makefile:1.74 pkgsrc/print/poppler-glib/Makefile:1.75
--- pkgsrc/print/poppler-glib/Makefile:1.74     Thu Apr 25 07:33:14 2019
+++ pkgsrc/print/poppler-glib/Makefile  Thu May  9 09:28:22 2019
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.74 2019/04/25 07:33:14 maya Exp $
+# $NetBSD: Makefile,v 1.75 2019/05/09 09:28:22 adam Exp $
 
-PKGREVISION= 1
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=       poppler-glib-${POPPLER_VERS}
 
 COMMENT=       PDF rendering library (GLib wrapper)
-MAINTAINER=    reed%reedmedia.net@localhost
 
-CONFLICTS+=            poppler<0.4.5nb1
+CONFLICTS+=    poppler<0.4.5nb1
 
 PKGCONFIG_OVERRIDE+=   ${WRKSRC}/poppler-glib.pc.cmake
 

Index: pkgsrc/print/poppler-glib/buildlink3.mk
diff -u pkgsrc/print/poppler-glib/buildlink3.mk:1.72 pkgsrc/print/poppler-glib/buildlink3.mk:1.73
--- pkgsrc/print/poppler-glib/buildlink3.mk:1.72        Wed Mar 27 11:18:38 2019
+++ pkgsrc/print/poppler-glib/buildlink3.mk     Thu May  9 09:28:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.72 2019/03/27 11:18:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.73 2019/05/09 09:28:22 adam Exp $
 
 BUILDLINK_TREE+=       poppler-glib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        poppler-glib
 POPPLER_GLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler-glib+=   poppler-glib>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler-glib+=   poppler-glib>=0.74.0
+BUILDLINK_ABI_DEPENDS.poppler-glib+=   poppler-glib>=0.76.0
 BUILDLINK_PKGSRCDIR.poppler-glib?=     ../../print/poppler-glib
 
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/print/poppler-includes/Makefile
diff -u pkgsrc/print/poppler-includes/Makefile:1.24 pkgsrc/print/poppler-includes/Makefile:1.25
--- pkgsrc/print/poppler-includes/Makefile:1.24 Tue Apr 17 05:20:34 2018
+++ pkgsrc/print/poppler-includes/Makefile      Thu May  9 09:28:22 2019
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.24 2018/04/17 05:20:34 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/05/09 09:28:22 adam Exp $
 
 .include "../../print/poppler/Makefile.common"
 
-PKGNAME=               poppler-includes-${POPPLER_VERS}
+PKGNAME=       poppler-includes-${POPPLER_VERS}
 
-COMMENT=               Poppler Xpdf includes (unsupported)
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+COMMENT=       Poppler Xpdf includes (unsupported)
 
-CONFLICTS+=            poppler-0.5.1 poppler-0.5.1nb1 poppler-0.5.1nb2
+CONFLICTS+=    poppler-0.5.1{,nb*}
 
-NO_BUILD=              yes
+NO_BUILD=      yes
 
 CMAKE_ARGS+=   -DENABLE_XPDF_HEADERS=ON
 
@@ -20,19 +19,17 @@ INCDIR=${DESTDIR}${PREFIX}/include
 do-install:
        ${INSTALL_DATA_DIR} ${INCDIR}
        ${INSTALL_DATA_DIR} ${INCDIR}/poppler
-       sed -n -f ${FILESDIR}/extract.sed ${WRKSRC}/CMakeLists.txt       \
-         | grep ^poppler/ | { while read f;                             \
-       do                                                               \
-           ${INSTALL_DATA} ${WRKSRC}/"$$f" ${INCDIR}/poppler;           \
+       sed -n -f ${FILESDIR}/extract.sed ${WRKSRC}/CMakeLists.txt      \
+         | grep ^poppler/ | { while read f; do                         \
+           ${INSTALL_DATA} ${WRKSRC}/"$$f" ${INCDIR}/poppler;          \
        done };
        ${INSTALL_DATA} ${WRKSRC}/poppler/poppler-config.h ${INCDIR}/poppler
-       for d in goo fofi splash; do                                     \
-           ${INSTALL_DATA_DIR} ${INCDIR}/poppler/"$$d";                 \
-           sed -n -f ${FILESDIR}/extract.sed ${WRKSRC}/CMakeLists.txt   \
-             | grep "^$$d/" | { while read f;                           \
-           do                                                           \
-               ${INSTALL_DATA} ${WRKSRC}/"$$f" ${INCDIR}/poppler/"$$d"; \
-           done };                                                      \
+       for d in goo fofi splash; do                                    \
+           ${INSTALL_DATA_DIR} ${INCDIR}/poppler/"$$d";                \
+           sed -n -f ${FILESDIR}/extract.sed ${WRKSRC}/CMakeLists.txt  \
+             | grep "^$$d/" | { while read f; do                       \
+               ${INSTALL_DATA} ${WRKSRC}/"$$f" ${INCDIR}/poppler/"$$d";\
+           done };                                                     \
        done
        # do these actually belong here?
        ${INSTALL_DATA} ${WRKSRC}/poppler/SignatureInfo.h ${INCDIR}/poppler

Index: pkgsrc/print/poppler-includes/PLIST
diff -u pkgsrc/print/poppler-includes/PLIST:1.18 pkgsrc/print/poppler-includes/PLIST:1.19
--- pkgsrc/print/poppler-includes/PLIST:1.18    Sat Feb 16 13:19:38 2019
+++ pkgsrc/print/poppler-includes/PLIST Thu May  9 09:28:22 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2019/02/16 13:19:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2019/05/09 09:28:22 adam Exp $
 include/poppler/Annot.h
 include/poppler/Array.h
 include/poppler/BuiltinFont.h
@@ -87,7 +87,6 @@ include/poppler/fofi/FoFiType1C.h
 include/poppler/goo/FixedPoint.h
 include/poppler/goo/GooCheckedOps.h
 include/poppler/goo/GooLikely.h
-include/poppler/goo/GooList.h
 include/poppler/goo/GooString.h
 include/poppler/goo/GooTimer.h
 include/poppler/goo/ImgWriter.h

Index: pkgsrc/print/poppler-includes/buildlink3.mk
diff -u pkgsrc/print/poppler-includes/buildlink3.mk:1.41 pkgsrc/print/poppler-includes/buildlink3.mk:1.42
--- pkgsrc/print/poppler-includes/buildlink3.mk:1.41    Wed Mar 27 11:18:38 2019
+++ pkgsrc/print/poppler-includes/buildlink3.mk Thu May  9 09:28:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.41 2019/03/27 11:18:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.42 2019/05/09 09:28:22 adam Exp $
 
 BUILDLINK_TREE+=       poppler-includes
 
@@ -8,7 +8,7 @@ POPPLER_INCLUDES_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.poppler-includes?= build
 
 BUILDLINK_API_DEPENDS.poppler-includes+=       poppler-includes>=0.22.2
-BUILDLINK_ABI_DEPENDS.poppler-includes?=       poppler-includes>=0.74.0
+BUILDLINK_ABI_DEPENDS.poppler-includes+=       poppler-includes>=0.76.0
 BUILDLINK_PKGSRCDIR.poppler-includes?=         ../../print/poppler-includes
 .endif # POPPLER_INCLUDES_BUILDLINK3_MK
 

Index: pkgsrc/print/poppler-qt5/Makefile
diff -u pkgsrc/print/poppler-qt5/Makefile:1.31 pkgsrc/print/poppler-qt5/Makefile:1.32
--- pkgsrc/print/poppler-qt5/Makefile:1.31      Wed Apr  3 00:33:03 2019
+++ pkgsrc/print/poppler-qt5/Makefile   Thu May  9 09:28:22 2019
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.31 2019/04/03 00:33:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2019/05/09 09:28:22 adam Exp $
 
-PKGREVISION= 1
 .include "../../print/poppler/Makefile.common"
 
-PKGNAME=               poppler-qt5-${POPPLER_VERS}
-COMMENT=               PDF rendering library (QT5 wrapper)
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-
-CMAKE_ARGS+=    -DENABLE_SPLASH=ON
-CMAKE_ARGS+=    -DBUILD_GTK_TESTS=OFF
-CMAKE_ARGS+=    -DENABLE_GLIB=OFF
-CMAKE_ARGS+=    -DENABLE_UTILS=OFF
-CMAKE_ARGS+=    -DENABLE_CPP=OFF
-CMAKE_ARGS+=    -DENABLE_QT5=ON
+PKGNAME=       poppler-qt5-${POPPLER_VERS}
+COMMENT=       PDF rendering library (QT5 wrapper)
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+
+CMAKE_ARGS+=   -DENABLE_SPLASH=ON
+CMAKE_ARGS+=   -DBUILD_GTK_TESTS=OFF
+CMAKE_ARGS+=   -DENABLE_GLIB=OFF
+CMAKE_ARGS+=   -DENABLE_UTILS=OFF
+CMAKE_ARGS+=   -DENABLE_CPP=OFF
+CMAKE_ARGS+=   -DENABLE_QT5=ON
 # Don't build libcurl based HTTP support. ## might want to include
-CMAKE_ARGS+=    -DENABLE_LIBCURL=OFF
+CMAKE_ARGS+=   -DENABLE_LIBCURL=OFF
 
 BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"

Index: pkgsrc/print/poppler-qt5/buildlink3.mk
diff -u pkgsrc/print/poppler-qt5/buildlink3.mk:1.30 pkgsrc/print/poppler-qt5/buildlink3.mk:1.31
--- pkgsrc/print/poppler-qt5/buildlink3.mk:1.30 Wed Mar 27 11:18:38 2019
+++ pkgsrc/print/poppler-qt5/buildlink3.mk      Thu May  9 09:28:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2019/03/27 11:18:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2019/05/09 09:28:22 adam Exp $
 
 BUILDLINK_TREE+=       poppler-qt5
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        poppler-qt5
 POPPLER_QT5_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler-qt5+=    poppler-qt5>=0.26.0
-BUILDLINK_ABI_DEPENDS.poppler-qt5?=    poppler-qt5>=0.74.0
+BUILDLINK_ABI_DEPENDS.poppler-qt5+=    poppler-qt5>=0.76.0
 BUILDLINK_PKGSRCDIR.poppler-qt5?=      ../../print/poppler-qt5
 
 .include "../../print/poppler/buildlink3.mk"

Index: pkgsrc/print/poppler-utils/Makefile
diff -u pkgsrc/print/poppler-utils/Makefile:1.42 pkgsrc/print/poppler-utils/Makefile:1.43
--- pkgsrc/print/poppler-utils/Makefile:1.42    Mon Dec  3 08:25:50 2018
+++ pkgsrc/print/poppler-utils/Makefile Thu May  9 09:28:22 2019
@@ -1,29 +1,27 @@
-# $NetBSD: Makefile,v 1.42 2018/12/03 08:25:50 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2019/05/09 09:28:22 adam Exp $
 
 .include "../../print/poppler/Makefile.common"
 
-PKGNAME=               poppler-utils-${POPPLER_VERS}
-COMMENT=               PDF utilities (from poppler)
-MAINTAINER=            reed%reedmedia.net@localhost
+PKGNAME=       poppler-utils-${POPPLER_VERS}
+COMMENT=       PDF utilities (from poppler)
 
-CONFLICTS+=            poppler-0.5.1 poppler-0.5.1nb1 poppler-0.5.1nb2
-CONFLICTS+=            xpdf<3.02pl4nb1
+CONFLICTS+=    poppler-0.5.1{,nb*}
+CONFLICTS+=    xpdf<3.02pl4nb1
 
 # Build the splash graphics backend. ## for pdftoppm
-CMAKE_ARGS+=    -DENABLE_SPLASH=ON
+CMAKE_ARGS+=   -DENABLE_SPLASH=ON
 # Don't compile GTK+ test program.
-CMAKE_ARGS+=    -DBUILD_GTK_TESTS=OFF
+CMAKE_ARGS+=   -DBUILD_GTK_TESTS=OFF
 # Don't compile GLib wrapper which also needs gtk2
-CMAKE_ARGS+=    -DENABLE_GLIB=OFF
+CMAKE_ARGS+=   -DENABLE_GLIB=OFF
 # Build and install the tools
-CMAKE_ARGS+=    -DENABLE_UTILS=ON
+CMAKE_ARGS+=   -DENABLE_UTILS=ON
 # Don't compile poppler cpp wrapper.
-CMAKE_ARGS+=    -DENABLE_CPP=OFF
+CMAKE_ARGS+=   -DENABLE_CPP=OFF
 # Don't compile poppler qt5 wrapper.
-CMAKE_ARGS+=    -DENABLE_QT5=OFF
+CMAKE_ARGS+=   -DENABLE_QT5=OFF
 # Don't build libcurl based HTTP support. ## might want to include
-CMAKE_ARGS+=    -DENABLE_LIBCURL=OFF
-
+CMAKE_ARGS+=   -DENABLE_LIBCURL=OFF
 
 BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"

Index: pkgsrc/print/poppler-utils/PLIST
diff -u pkgsrc/print/poppler-utils/PLIST:1.5 pkgsrc/print/poppler-utils/PLIST:1.6
--- pkgsrc/print/poppler-utils/PLIST:1.5        Wed Mar 27 11:18:38 2019
+++ pkgsrc/print/poppler-utils/PLIST    Thu May  9 09:28:22 2019
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2019/03/27 11:18:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/05/09 09:28:22 adam Exp $
+bin/pdfattach
 bin/pdfdetach
 bin/pdffonts
 bin/pdfimages
@@ -10,6 +11,7 @@ bin/pdftoppm
 bin/pdftops
 bin/pdftotext
 bin/pdfunite
+man/man1/pdfattach.1
 man/man1/pdfdetach.1
 man/man1/pdffonts.1
 man/man1/pdfimages.1

Follow-Ups:
- Re: CVS commit: pkgsrc/print
  - From: Ryo ONODERA

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: Re: CVS commit: pkgsrc/print
Indexes:

Home | Main Index | Thread Index | Old Index