CVS commit: pkgsrc/print

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/print
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 15 Oct 2024 16:07:01 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Oct 15 16:07:01 UTC 2024

Modified Files:
        pkgsrc/print/poppler: Makefile Makefile.common PLIST buildlink3.mk
            distinfo
        pkgsrc/print/poppler-cpp: Makefile PLIST
        pkgsrc/print/poppler-includes: Makefile PLIST
        pkgsrc/print/poppler-qt5: DESCR Makefile PLIST
        pkgsrc/print/poppler-qt6: DESCR Makefile PLIST
        pkgsrc/print/poppler-utils: Makefile PLIST
Added Files:
        pkgsrc/print/poppler/patches: patch-CMakeLists.txt

Log Message:
poppler: updated to 24.10.0

24.10.0

core:
* Add support for SubmitForms Links
* Internal code improvements
* Fix crash in malformed documents

qt6:
* Add support for SubmitForms Links
* Add API for creating signature field without signing immediately

glib:
* add auto_cleanup functions so that consumers can use g_auto*
* fix closure GI annotation

qt5:
* Add support for SubmitForms Links

build system:
* Use the boosts own cmake file as suggested by cmake itself


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/print/poppler/Makefile
cvs rdiff -u -r1.155 -r1.156 pkgsrc/print/poppler/Makefile.common
cvs rdiff -u -r1.52 -r1.53 pkgsrc/print/poppler/PLIST
cvs rdiff -u -r1.100 -r1.101 pkgsrc/print/poppler/buildlink3.mk
cvs rdiff -u -r1.178 -r1.179 pkgsrc/print/poppler/distinfo
cvs rdiff -u -r1.44 -r1.45 pkgsrc/print/poppler-cpp/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/poppler-cpp/PLIST
cvs rdiff -u -r1.37 -r1.38 pkgsrc/print/poppler-includes/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/print/poppler-includes/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/poppler-qt5/DESCR
cvs rdiff -u -r1.77 -r1.78 pkgsrc/print/poppler-qt5/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/poppler-qt5/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/poppler-qt6/DESCR
cvs rdiff -u -r1.23 -r1.24 pkgsrc/print/poppler-qt6/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/poppler-qt6/PLIST
cvs rdiff -u -r1.69 -r1.70 pkgsrc/print/poppler-utils/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/poppler-utils/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/print/poppler/patches/patch-CMakeLists.txt

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.104 pkgsrc/print/poppler/Makefile:1.105
--- pkgsrc/print/poppler/Makefile:1.104 Sun Aug 25 06:19:10 2024
+++ pkgsrc/print/poppler/Makefile       Tue Oct 15 16:07:00 2024
@@ -1,19 +1,13 @@
-# $NetBSD: Makefile,v 1.104 2024/08/25 06:19:10 wiz Exp $
-
-PKGREVISION= 1
-.include "../../print/poppler/Makefile.common"
+# $NetBSD: Makefile,v 1.105 2024/10/15 16:07:00 adam Exp $
 
 COMMENT=       PDF rendering library
 
+SUPERSEDES+=   poppler-glib-[0-9]*
+
 PKGCONFIG_OVERRIDE+=   poppler.pc.cmake
 
 INSTALLATION_DIRS+=    include/poppler share/doc/poppler
 
-.if ${OPSYS} == "Darwin"
-# MacOS Xcode does not provide /usr/include, so be explicit
-CMAKE_CONFIGURE_ARGS+= -DGLIB2_INCLUDE_DIRS=${PREFIX}/include
-.endif
-
 # Don't compile GTK+ test program.
 CMAKE_CONFIGURE_ARGS+= -DBUILD_GTK_TESTS=OFF
 # Compile GLib wrapper which also needs gtk2
@@ -25,17 +19,18 @@ CMAKE_CONFIGURE_ARGS+=      -DENABLE_CPP=OFF
 # Don't compile poppler qt5/6 wrapper.
 CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5=OFF
 CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6=OFF
-# Don't build libcurl based HTTP support. ## might want to include
-CMAKE_CONFIGURE_ARGS+= -DENABLE_LIBCURL=OFF
 # Don't run gperf if it's present
 CMAKE_CONFIGURE_ARGS+= -DRUN_GPERF_IF_PRESENT=OFF
 
-SUPERSEDES+=   poppler-glib-[0-9]*
-
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "Darwin"
+# MacOS Xcode does not provide /usr/include, so be explicit
+CMAKE_CONFIGURE_ARGS+= -DGLIB2_INCLUDE_DIRS=${PREFIX}/include
+.endif
+
 .if ${USE_CROSS_COMPILE:tl} == "yes"
-ALL_ENV+=      PKG_CONFIG_SYSROOT_DIR=${CROSS_DESTDIR:Q}
+ALL_ENV+=              PKG_CONFIG_SYSROOT_DIR=${CROSS_DESTDIR:Q}
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_SYSROOT:STRING=${CROSS_DESTDIR:Q}
 .endif
 
@@ -44,11 +39,14 @@ CMAKE_CONFIGURE_ARGS+=      -DCMAKE_SYSROOT:S
 CFLAGS+=       -D__LONG_LONG_SUPPORTED=
 .endif
 
+.include "../../print/poppler/Makefile.common"
+
 post-install:
        ${INSTALL_MAN} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/poppler/
        ${INSTALL_MAN} ${WRKSRC}/README-XPDF ${DESTDIR}${PREFIX}/share/doc/poppler/
        ${RMDIR} ${DESTDIR}${PREFIX}/include/poppler || ${TRUE}
 
+.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=   glib2>=2.41.0
@@ -58,9 +56,10 @@ BUILDLINK_DEPMETHOD.gobject-introspectio
 BUILDLINK_API_DEPENDS.cairo+=   cairo>=1.18
 .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 "../../lang/python/tool.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/poppler/Makefile.common
diff -u pkgsrc/print/poppler/Makefile.common:1.155 pkgsrc/print/poppler/Makefile.common:1.156
--- pkgsrc/print/poppler/Makefile.common:1.155  Sun Aug 25 06:19:10 2024
+++ pkgsrc/print/poppler/Makefile.common        Tue Oct 15 16:07:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.155 2024/08/25 06:19:10 wiz Exp $
+# $NetBSD: Makefile.common,v 1.156 2024/10/15 16:07:00 adam Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -7,7 +7,7 @@
 # used by print/poppler-qt6/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=  24.03.0
+POPPLER_VERS=  24.10.0
 DISTNAME=      poppler-${POPPLER_VERS}
 CATEGORIES=    print
 MASTER_SITES=  https://poppler.freedesktop.org/
@@ -18,15 +18,15 @@ HOMEPAGE=   https://poppler.freedesktop.or
 LICENSE=       gnu-gpl-v2
 
 DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo
-#PATCHDIR=     ${.CURDIR}/../../print/poppler/patches
+PATCHDIR=      ${.CURDIR}/../../print/poppler/patches
 
-USE_CMAKE=             yes
-USE_LANGUAGES=         c c++17
+USE_CXX_FEATURES=      c++17
+USE_LANGUAGES=         c c++
 USE_TOOLS+=            pkg-config gsed
 GCC_REQD+=             8 # std::optional
 
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GPGME:BOOL=OFF
-CMAKE_CONFIGURE_ARGS+= -DENABLE_NSS3:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GPGME=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_NSS3=OFF
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -45,5 +45,6 @@ BUILDLINK_TRANSFORM+=   rm:-fno-check-ne
 .endif
 
 .include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/print/poppler/PLIST
diff -u pkgsrc/print/poppler/PLIST:1.52 pkgsrc/print/poppler/PLIST:1.53
--- pkgsrc/print/poppler/PLIST:1.52     Mon Mar 11 14:39:48 2024
+++ pkgsrc/print/poppler/PLIST  Tue Oct 15 16:07:00 2024
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.52 2024/03/11 14:39:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.53 2024/10/15 16:07:00 adam Exp $
 include/poppler/glib/poppler-action.h
 include/poppler/glib/poppler-annot.h
 include/poppler/glib/poppler-attachment.h
+include/poppler/glib/poppler-autocleanups.h
 include/poppler/glib/poppler-date.h
 include/poppler/glib/poppler-document.h
 include/poppler/glib/poppler-enums.h
@@ -17,10 +18,10 @@ include/poppler/glib/poppler.h
 lib/girepository-1.0/Poppler-0.18.typelib
 lib/libpoppler-glib.so
 lib/libpoppler-glib.so.8
-lib/libpoppler-glib.so.8.26.0
+lib/libpoppler-glib.so.8.27.0
 lib/libpoppler.so
-lib/libpoppler.so.135
-lib/libpoppler.so.135.0.0
+lib/libpoppler.so.142
+lib/libpoppler.so.142.0.0
 lib/pkgconfig/poppler-glib.pc
 lib/pkgconfig/poppler.pc
 share/doc/poppler/README-XPDF

Index: pkgsrc/print/poppler/buildlink3.mk
diff -u pkgsrc/print/poppler/buildlink3.mk:1.100 pkgsrc/print/poppler/buildlink3.mk:1.101
--- pkgsrc/print/poppler/buildlink3.mk:1.100    Sun Apr  7 07:34:54 2024
+++ pkgsrc/print/poppler/buildlink3.mk  Tue Oct 15 16:07:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.100 2024/04/07 07:34:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.101 2024/10/15 16:07:00 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>=24.03.0nb1
+BUILDLINK_ABI_DEPENDS.poppler+=        poppler>=24.10.0
 BUILDLINK_PKGSRCDIR.poppler?=  ../../print/poppler
 
 GCC_REQD+=     7
@@ -19,6 +19,7 @@ GCC_REQD+=    7
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .endif # POPPLER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -poppler

Index: pkgsrc/print/poppler/distinfo
diff -u pkgsrc/print/poppler/distinfo:1.178 pkgsrc/print/poppler/distinfo:1.179
--- pkgsrc/print/poppler/distinfo:1.178 Mon Mar 11 14:39:48 2024
+++ pkgsrc/print/poppler/distinfo       Tue Oct 15 16:07:00 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.178 2024/03/11 14:39:48 wiz Exp $
+$NetBSD: distinfo,v 1.179 2024/10/15 16:07:00 adam Exp $
 
-BLAKE2s (poppler-24.03.0.tar.xz) = 0b76774430d3ddb8f617a628a1eb25193d606c6859e757590bbb641156b48c76
-SHA512 (poppler-24.03.0.tar.xz) = 7b337249b3a3a4b4702447c7a0d19d2fd3ef5a6159d024d75846f397e223805758d4116eb155421545b17f02f151a96228932d162c0ff8a74147ef21424e9a96
-Size (poppler-24.03.0.tar.xz) = 1902068 bytes
+BLAKE2s (poppler-24.10.0.tar.xz) = 8ee078d9a87dc4240f8380e606e44cc0b79f63cb508d2deef51a180b19c1a421
+SHA512 (poppler-24.10.0.tar.xz) = 5515b4c439cd2e92119aedcb8960dd82e6f78a1ffd82543d3649bedb3e0e8e97689ea592f4df347cc3c97d5d90c8518c13859f80be25f157b9aea78e62a31502
+Size (poppler-24.10.0.tar.xz) = 1920580 bytes
+SHA1 (patch-CMakeLists.txt) = db4e962f42b2b4a212c6d215111114ac439b4f89

Index: pkgsrc/print/poppler-cpp/Makefile
diff -u pkgsrc/print/poppler-cpp/Makefile:1.44 pkgsrc/print/poppler-cpp/Makefile:1.45
--- pkgsrc/print/poppler-cpp/Makefile:1.44      Sun Aug 25 06:19:10 2024
+++ pkgsrc/print/poppler-cpp/Makefile   Tue Oct 15 16:07:00 2024
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2024/08/25 06:19:10 wiz Exp $
-
-PKGREVISION= 1
-.include "../../print/poppler/Makefile.common"
+# $NetBSD: Makefile,v 1.45 2024/10/15 16:07:00 adam Exp $
 
 PKGNAME=       poppler-cpp-${POPPLER_VERS}
 
@@ -9,7 +6,7 @@ COMMENT=        PDF rendering library (cpp wrap
 
 CONFLICTS+=    poppler<0.4.5nb1
 
-PKGCONFIG_OVERRIDE+=   ${WRKSRC}/poppler-cpp.pc.cmake
+PKGCONFIG_OVERRIDE+=   poppler-cpp.pc.cmake
 
 # Don't compile GTK+ test program.
 CMAKE_CONFIGURE_ARGS+= -DBUILD_GTK_TESTS=OFF
@@ -22,15 +19,8 @@ CMAKE_CONFIGURE_ARGS+=       -DENABLE_CPP=ON
 # Don't compile poppler qt5/6 wrapper.
 CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5=OFF
 CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6=OFF
-# Don't build libcurl based HTTP support. ## might want to include
-CMAKE_CONFIGURE_ARGS+= -DENABLE_LIBCURL=OFF
-
-BUILDLINK_API_DEPENDS.poppler+=        poppler-${POPPLER_VERS}{,nb*}
-.include "../../print/poppler/buildlink3.mk"
 
 BUILD_DIRS=            cpp
-INSTALL_DIRS=          cpp
-
 INSTALLATION_DIRS+=    lib/pkgconfig
 
 .include "../../converters/libiconv/buildlink3.mk"
@@ -39,14 +29,18 @@ CHECK_BUILTIN.iconv:=       yes
 .include "../../converters/libiconv/builtin.mk"
 CHECK_BUILTIN.iconv:=  no
 
-.if !empty(USE_BUILTIN.iconv:M[nN][oO])
+.if ${USE_BUILTIN.iconv:U:tl} == no
 CMAKE_CONFIGURE_ARGS+= -DICONV_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.iconv}/include
 CMAKE_CONFIGURE_ARGS+= -DICONV_LIBRARIES:PATH=${BUILDLINK_PREFIX.iconv}/lib
-LDFLAGS.Darwin+=-liconv
+LDFLAGS.Darwin+=       -liconv
 .endif
 
+.include "../../print/poppler/Makefile.common"
+
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/poppler-cpp.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+       ${INSTALL_DATA} ${WRKSRC}/${CMAKE_BUILD_DIR}/poppler-cpp.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 
+BUILDLINK_API_DEPENDS.poppler+=        poppler-${POPPLER_VERS}{,nb*}
+.include "../../print/poppler/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/poppler-cpp/PLIST
diff -u pkgsrc/print/poppler-cpp/PLIST:1.9 pkgsrc/print/poppler-cpp/PLIST:1.10
--- pkgsrc/print/poppler-cpp/PLIST:1.9  Sat Sep  3 17:01:30 2022
+++ pkgsrc/print/poppler-cpp/PLIST      Tue Oct 15 16:07:00 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2022/09/03 17:01:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2024/10/15 16:07:00 adam Exp $
 include/poppler/cpp/poppler-destination.h
 include/poppler/cpp/poppler-document.h
 include/poppler/cpp/poppler-embedded-file.h
@@ -14,6 +14,6 @@ include/poppler/cpp/poppler-toc.h
 include/poppler/cpp/poppler-version.h
 include/poppler/cpp/poppler_cpp_export.h
 lib/libpoppler-cpp.so
-lib/libpoppler-cpp.so.0
-lib/libpoppler-cpp.so.0.11.0
+lib/libpoppler-cpp.so.1
+lib/libpoppler-cpp.so.1.0.0
 lib/pkgconfig/poppler-cpp.pc

Index: pkgsrc/print/poppler-includes/Makefile
diff -u pkgsrc/print/poppler-includes/Makefile:1.37 pkgsrc/print/poppler-includes/Makefile:1.38
--- pkgsrc/print/poppler-includes/Makefile:1.37 Sun Aug 25 06:19:10 2024
+++ pkgsrc/print/poppler-includes/Makefile      Tue Oct 15 16:07:00 2024
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2024/08/25 06:19:10 wiz Exp $
-
-.include "../../print/poppler/Makefile.common"
+# $NetBSD: Makefile,v 1.38 2024/10/15 16:07:00 adam Exp $
 
 PKGNAME=       poppler-includes-${POPPLER_VERS}
 
@@ -10,12 +8,10 @@ CONFLICTS+=  poppler-0.5.1{,nb*}
 
 NO_BUILD=      yes
 
-INCDIR=        ${DESTDIR}${PREFIX}/include
-
-CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5:BOOL=OFF
-CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6:BOOL=OFF
+INCDIR=                ${DESTDIR}${PREFIX}/include
 
-.include "../../mk/bsd.prefs.mk"
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6=OFF
 
 do-install:
        ${INSTALL_DATA_DIR} ${INCDIR}
@@ -24,8 +20,10 @@ do-install:
          | grep ^poppler/ | { while read f; do                         \
            ${INSTALL_DATA} ${WRKSRC}/"$$f" ${INCDIR}/poppler;          \
        done };
-       ${INSTALL_DATA} ${WRKSRC}/poppler/poppler-config.h ${INCDIR}/poppler
-       ${INSTALL_DATA} ${WRKSRC}/poppler_private_export.h ${INCDIR}/poppler
+       ${INSTALL_DATA} ${WRKSRC}/${CMAKE_BUILD_DIR}/poppler/poppler-config.h \
+               ${INCDIR}/poppler
+       ${INSTALL_DATA} ${WRKSRC}/${CMAKE_BUILD_DIR}/poppler_private_export.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  \
@@ -37,6 +35,8 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/poppler/SignatureInfo.h ${INCDIR}/poppler
        ${INSTALL_DATA} ${WRKSRC}/goo/NetPBMWriter.h ${INCDIR}/poppler/goo
 
+.include "../../print/poppler/Makefile.common"
+
 BUILDLINK_DEPMETHOD.fontconfig= build
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"

Index: pkgsrc/print/poppler-includes/PLIST
diff -u pkgsrc/print/poppler-includes/PLIST:1.26 pkgsrc/print/poppler-includes/PLIST:1.27
--- pkgsrc/print/poppler-includes/PLIST:1.26    Sat Jan  8 11:16:05 2022
+++ pkgsrc/print/poppler-includes/PLIST Tue Oct 15 16:07:00 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2022/01/08 11:16:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.27 2024/10/15 16:07:00 adam Exp $
 include/poppler/Annot.h
 include/poppler/AnnotStampImageHelper.h
 include/poppler/Array.h
@@ -31,6 +31,7 @@ include/poppler/GfxFont.h
 include/poppler/GfxState.h
 include/poppler/GfxState_helpers.h
 include/poppler/GlobalParams.h
+include/poppler/HashAlgorithm.h
 include/poppler/Hints.h
 include/poppler/JArithmeticDecoder.h
 include/poppler/JBIG2Stream.h

Index: pkgsrc/print/poppler-qt5/DESCR
diff -u pkgsrc/print/poppler-qt5/DESCR:1.1 pkgsrc/print/poppler-qt5/DESCR:1.2
--- pkgsrc/print/poppler-qt5/DESCR:1.1  Tue Apr 29 08:05:13 2014
+++ pkgsrc/print/poppler-qt5/DESCR      Tue Oct 15 16:07:01 2024
@@ -1,4 +1,4 @@
-This is the QT5 wrapper for poppler, a PDF rendering library. It
+This is the Qt5 wrapper for poppler, a PDF rendering library. It
 is a fork of the xpdf 3.0 PDF viewer developed by Derek Noonburg
 of Glyph and Cog, LLC.
 

Index: pkgsrc/print/poppler-qt5/Makefile
diff -u pkgsrc/print/poppler-qt5/Makefile:1.77 pkgsrc/print/poppler-qt5/Makefile:1.78
--- pkgsrc/print/poppler-qt5/Makefile:1.77      Sun Aug 25 06:19:10 2024
+++ pkgsrc/print/poppler-qt5/Makefile   Tue Oct 15 16:07:01 2024
@@ -1,11 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2024/08/25 06:19:10 wiz Exp $
-
-PKGREVISION= 3
-.include "../../print/poppler/Makefile.common"
+# $NetBSD: Makefile,v 1.78 2024/10/15 16:07:01 adam Exp $
 
 PKGNAME=       poppler-qt5-${POPPLER_VERS}
-COMMENT=       PDF rendering library (QT5 wrapper)
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+COMMENT=       PDF rendering library (Qt5 wrapper)
 
 CMAKE_CONFIGURE_ARGS+= -DBUILD_GTK_TESTS=OFF
 CMAKE_CONFIGURE_ARGS+= -DENABLE_GLIB=OFF
@@ -13,25 +9,24 @@ CMAKE_CONFIGURE_ARGS+=       -DENABLE_UTILS=OF
 CMAKE_CONFIGURE_ARGS+= -DENABLE_CPP=OFF
 CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5=ON
 CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6=OFF
-# Don't build libcurl based HTTP support. ## might want to include
-CMAKE_CONFIGURE_ARGS+= -DENABLE_LIBCURL=OFF
-
-BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
-.include "../../print/poppler/buildlink3.mk"
 
 PKGCONFIG_OVERRIDE+=   ${WRKSRC}/poppler-qt5.pc.cmake
 
 INSTALLATION_DIRS+=    lib include/poppler lib/pkgconfig
 
-BUILD_DIRS=            qt5/src
+BUILD_DIRS=    qt5/src
+.include "../../print/poppler/Makefile.common"
 
-pre-build:
+zz-pre-build:
        cd ${WRKSRC}/qt5/src && ${BUILD_MAKE_CMD}
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+       ${INSTALL_DATA} ${WRKSRC}/${CMAKE_BUILD_DIR}/poppler-qt5.pc \
+               ${DESTDIR}${PREFIX}/lib/pkgconfig
 
 .include "../../devel/boost-headers/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
+.include "../../print/poppler/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/poppler-qt5/PLIST
diff -u pkgsrc/print/poppler-qt5/PLIST:1.21 pkgsrc/print/poppler-qt5/PLIST:1.22
--- pkgsrc/print/poppler-qt5/PLIST:1.21 Wed Nov 15 09:23:20 2023
+++ pkgsrc/print/poppler-qt5/PLIST      Tue Oct 15 16:07:01 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2023/11/15 09:23:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2024/10/15 16:07:01 adam Exp $
 include/poppler/qt5/poppler-annotation.h
 include/poppler/qt5/poppler-export.h
 include/poppler/qt5/poppler-form.h
@@ -10,5 +10,5 @@ include/poppler/qt5/poppler-qt5.h
 include/poppler/qt5/poppler-version.h
 lib/libpoppler-qt5.so
 lib/libpoppler-qt5.so.1
-lib/libpoppler-qt5.so.1.33.0
+lib/libpoppler-qt5.so.1.37.0
 lib/pkgconfig/poppler-qt5.pc

Index: pkgsrc/print/poppler-qt6/DESCR
diff -u pkgsrc/print/poppler-qt6/DESCR:1.1 pkgsrc/print/poppler-qt6/DESCR:1.2
--- pkgsrc/print/poppler-qt6/DESCR:1.1  Tue Dec  6 14:05:10 2022
+++ pkgsrc/print/poppler-qt6/DESCR      Tue Oct 15 16:07:01 2024
@@ -1,4 +1,4 @@
-This is the QT6 wrapper for poppler, a PDF rendering library. It
+This is the Qt6 wrapper for poppler, a PDF rendering library. It
 is a fork of the xpdf 3.0 PDF viewer developed by Derek Noonburg
 of Glyph and Cog, LLC.
 

Index: pkgsrc/print/poppler-qt6/Makefile
diff -u pkgsrc/print/poppler-qt6/Makefile:1.23 pkgsrc/print/poppler-qt6/Makefile:1.24
--- pkgsrc/print/poppler-qt6/Makefile:1.23      Sun Aug 25 06:19:10 2024
+++ pkgsrc/print/poppler-qt6/Makefile   Tue Oct 15 16:07:01 2024
@@ -1,15 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2024/08/25 06:19:10 wiz Exp $
-
-# this must be set before compiler.mk
-# is included in Makefile.common
-GCC_REQD+=     9 # required by Qt6 headers
-
-PKGREVISION= 3
-.include "../../print/poppler/Makefile.common"
+# $NetBSD: Makefile,v 1.24 2024/10/15 16:07:01 adam Exp $
 
 PKGNAME=       poppler-qt6-${POPPLER_VERS}
-COMMENT=       PDF rendering library (QT6 wrapper)
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+COMMENT=       PDF rendering library (Qt6 wrapper)
 
 CMAKE_CONFIGURE_ARGS+= -DBUILD_GTK_TESTS=OFF
 CMAKE_CONFIGURE_ARGS+= -DENABLE_GLIB=OFF
@@ -20,18 +12,21 @@ CMAKE_CONFIGURE_ARGS+=      -DENABLE_QT6=ON
 # Don't build libcurl based HTTP support. ## might want to include
 CMAKE_CONFIGURE_ARGS+= -DENABLE_LIBCURL=OFF
 
-BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
-.include "../../print/poppler/buildlink3.mk"
-
 PKGCONFIG_OVERRIDE+=   poppler-qt6.pc.cmake
 
 INSTALLATION_DIRS+=    lib/pkgconfig
 
-BUILD_DIRS=            qt6/src
+# This must be set before compiler.mk included in Makefile.common.
+GCC_REQD+=     9 # required by Qt6 headers
+BUILD_DIRS=    qt6/src
+.include "../../print/poppler/Makefile.common"
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/poppler-qt6.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+       ${INSTALL_DATA} ${WRKSRC}/${CMAKE_BUILD_DIR}/poppler-qt6.pc \
+               ${DESTDIR}${PREFIX}/lib/pkgconfig
 
+BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
+.include "../../print/poppler/buildlink3.mk"
 .include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/poppler-qt6/PLIST
diff -u pkgsrc/print/poppler-qt6/PLIST:1.3 pkgsrc/print/poppler-qt6/PLIST:1.4
--- pkgsrc/print/poppler-qt6/PLIST:1.3  Wed Nov 15 09:23:20 2023
+++ pkgsrc/print/poppler-qt6/PLIST      Tue Oct 15 16:07:01 2024
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2023/11/15 09:23:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/10/15 16:07:01 adam Exp $
 include/poppler/qt6/poppler-annotation.h
+include/poppler/qt6/poppler-converter.h
 include/poppler/qt6/poppler-export.h
 include/poppler/qt6/poppler-form.h
 include/poppler/qt6/poppler-link.h
@@ -10,5 +11,5 @@ include/poppler/qt6/poppler-qt6.h
 include/poppler/qt6/poppler-version.h
 lib/libpoppler-qt6.so
 lib/libpoppler-qt6.so.3
-lib/libpoppler-qt6.so.3.4.0
+lib/libpoppler-qt6.so.3.8.0
 lib/pkgconfig/poppler-qt6.pc

Index: pkgsrc/print/poppler-utils/Makefile
diff -u pkgsrc/print/poppler-utils/Makefile:1.69 pkgsrc/print/poppler-utils/Makefile:1.70
--- pkgsrc/print/poppler-utils/Makefile:1.69    Sun Aug 25 06:19:11 2024
+++ pkgsrc/print/poppler-utils/Makefile Tue Oct 15 16:07:01 2024
@@ -1,8 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2024/08/25 06:19:11 wiz Exp $
-
-USE_CXX_FEATURES+=     filesystem
-PKGREVISION= 1
-.include "../../print/poppler/Makefile.common"
+# $NetBSD: Makefile,v 1.70 2024/10/15 16:07:01 adam Exp $
 
 PKGNAME=       poppler-utils-${POPPLER_VERS}
 COMMENT=       PDF utilities (from poppler)
@@ -24,14 +20,14 @@ CMAKE_CONFIGURE_ARGS+=      -DENABLE_CPP=OFF
 # Don't compile poppler qt5/6 wrapper.
 CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5=OFF
 CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6=OFF
-# Don't build libcurl based HTTP support. ## might want to include
-CMAKE_CONFIGURE_ARGS+= -DENABLE_LIBCURL=OFF
+
+BUILD_DIRS=            utils
+.include "../../print/poppler/Makefile.common"
+USE_CXX_FEATURES+=     filesystem
 
 BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"
 
-INSTALL_DIRS=          utils
-
 .include "../../mk/bsd.prefs.mk"
 
 MAKE_ENV+=             PTHREAD_STUBLIB=

Index: pkgsrc/print/poppler-utils/PLIST
diff -u pkgsrc/print/poppler-utils/PLIST:1.8 pkgsrc/print/poppler-utils/PLIST:1.9
--- pkgsrc/print/poppler-utils/PLIST:1.8        Sun Mar  1 11:18:59 2020
+++ pkgsrc/print/poppler-utils/PLIST    Tue Oct 15 16:07:01 2024
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.8 2020/03/01 11:18:59 markd Exp $
+@comment $NetBSD: PLIST,v 1.9 2024/10/15 16:07:01 adam Exp $
 bin/pdfattach
 bin/pdfdetach
 bin/pdffonts
 bin/pdfimages
 bin/pdfinfo
 bin/pdfseparate
-bin/pdfsig
 bin/pdftocairo
 bin/pdftohtml
 bin/pdftoppm
@@ -18,7 +17,6 @@ man/man1/pdffonts.1
 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

Added files:

Index: pkgsrc/print/poppler/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/print/poppler/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Tue Oct 15 16:07:01 2024
+++ pkgsrc/print/poppler/patches/patch-CMakeLists.txt   Tue Oct 15 16:07:00 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2024/10/15 16:07:00 adam Exp $
+
+Boost from pkgsrc doesn't support CONFIG.
+
+--- CMakeLists.txt.orig        2024-10-15 08:19:17.603338492 +0000
++++ CMakeLists.txt
+@@ -225,7 +225,7 @@ find_soft_mandatory_package(ENABLE_QT6 Q
+ # Check for Cairo rendering backend
+ macro_optional_find_package(Cairo ${CAIRO_VERSION})
+ 
+-find_package(Boost 1.74.0 CONFIG)
++find_package(Boost 1.74.0)
+ if(Boost_FOUND)
+   set(USE_BOOST_HEADERS ON)
+ elseif(ENABLE_BOOST)

Prev by Date: CVS commit: pkgsrc/biology
Next by Date: CVS commit: pkgsrc/databases/py-peewee
Previous by Thread: CVS commit: pkgsrc/biology
Next by Thread: CVS commit: pkgsrc/databases/py-peewee
Indexes:

Home | Main Index | Thread Index | Old Index