CVS commit: pkgsrc/print

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Tue Dec  6 14:05:10 UTC 2022

Modified Files:
        pkgsrc/print: Makefile
        pkgsrc/print/poppler: Makefile.common
Added Files:
        pkgsrc/print/poppler-qt6: DESCR Makefile PLIST buildlink3.mk

Log Message:
Add print/poppler-qt6 version 22.10.0 to pkgsrc-current

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.

Poppler provides PDF rendering functionality as a shared library,
to centralize the maintenence effort and to reduce duplicated
effort. And the poppler developers would like to move libpoppler
forward in a number of areas that doesn't fit within the goals of
xpdf.


To generate a diff of this commit:
cvs rdiff -u -r1.893 -r1.894 pkgsrc/print/Makefile
cvs rdiff -u -r1.140 -r1.141 pkgsrc/print/poppler/Makefile.common
cvs rdiff -u -r0 -r1.1 pkgsrc/print/poppler-qt6/DESCR \
    pkgsrc/print/poppler-qt6/Makefile pkgsrc/print/poppler-qt6/PLIST \
    pkgsrc/print/poppler-qt6/buildlink3.mk

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

Modified files:

Index: pkgsrc/print/Makefile
diff -u pkgsrc/print/Makefile:1.893 pkgsrc/print/Makefile:1.894
--- pkgsrc/print/Makefile:1.893 Mon Nov 14 19:34:37 2022
+++ pkgsrc/print/Makefile       Tue Dec  6 14:05:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.893 2022/11/14 19:34:37 wiz Exp $
+# $NetBSD: Makefile,v 1.894 2022/12/06 14:05:09 nros Exp $
 #
 
 COMMENT=       Desktop publishing
@@ -120,6 +120,7 @@ SUBDIR+=    poppler-data
 SUBDIR+=       poppler-glib
 SUBDIR+=       poppler-includes
 SUBDIR+=       poppler-qt5
+SUBDIR+=       poppler-qt6
 SUBDIR+=       poppler-utils
 SUBDIR+=       poster
 SUBDIR+=       pscal

Index: pkgsrc/print/poppler/Makefile.common
diff -u pkgsrc/print/poppler/Makefile.common:1.140 pkgsrc/print/poppler/Makefile.common:1.141
--- pkgsrc/print/poppler/Makefile.common:1.140  Thu Oct 13 10:56:03 2022
+++ pkgsrc/print/poppler/Makefile.common        Tue Dec  6 14:05:09 2022
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.common,v 1.140 2022/10/13 10:56:03 wiz Exp $
+# $NetBSD: Makefile.common,v 1.141 2022/12/06 14:05:09 nros Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
 # used by print/poppler-glib/Makefile
 # used by print/poppler-includes/Makefile
 # used by print/poppler-qt5/Makefile
+# used by print/poppler-qt6/Makefile
 # used by print/poppler-utils/Makefile
 
 POPPLER_VERS=  22.10.0

Added files:

Index: pkgsrc/print/poppler-qt6/DESCR
diff -u /dev/null pkgsrc/print/poppler-qt6/DESCR:1.1
--- /dev/null   Tue Dec  6 14:05:10 2022
+++ pkgsrc/print/poppler-qt6/DESCR      Tue Dec  6 14:05:10 2022
@@ -0,0 +1,9 @@
+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.
+
+Poppler provides PDF rendering functionality as a shared library,
+to centralize the maintenence effort and to reduce duplicated
+effort. And the poppler developers would like to move libpoppler
+forward in a number of areas that doesn't fit within the goals of
+xpdf.
Index: pkgsrc/print/poppler-qt6/Makefile
diff -u /dev/null pkgsrc/print/poppler-qt6/Makefile:1.1
--- /dev/null   Tue Dec  6 14:05:10 2022
+++ pkgsrc/print/poppler-qt6/Makefile   Tue Dec  6 14:05:10 2022
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1 2022/12/06 14:05:10 nros Exp $
+
+# this must be set before compiler.mk
+# is included in Makefile.common
+GCC_REQD+=     9 # required by Qt6 headers
+
+.include "../../print/poppler/Makefile.common"
+
+PKGNAME=       poppler-qt6-${POPPLER_VERS}
+COMMENT=       PDF rendering library (QT6 wrapper)
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+
+
+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=OFF
+CMAKE_ARGS+=   -DENABLE_QT6=ON
+# Don't build libcurl based HTTP support. ## might want to include
+CMAKE_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
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/poppler-qt6.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/print/poppler-qt6/PLIST
diff -u /dev/null pkgsrc/print/poppler-qt6/PLIST:1.1
--- /dev/null   Tue Dec  6 14:05:10 2022
+++ pkgsrc/print/poppler-qt6/PLIST      Tue Dec  6 14:05:10 2022
@@ -0,0 +1,14 @@
+@comment $NetBSD: PLIST,v 1.1 2022/12/06 14:05:10 nros Exp $
+include/poppler/qt6/poppler-annotation.h
+include/poppler/qt6/poppler-export.h
+include/poppler/qt6/poppler-form.h
+include/poppler/qt6/poppler-link.h
+include/poppler/qt6/poppler-media.h
+include/poppler/qt6/poppler-optcontent.h
+include/poppler/qt6/poppler-page-transition.h
+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.2.0
+lib/pkgconfig/poppler-qt6.pc
Index: pkgsrc/print/poppler-qt6/buildlink3.mk
diff -u /dev/null pkgsrc/print/poppler-qt6/buildlink3.mk:1.1
--- /dev/null   Tue Dec  6 14:05:10 2022
+++ pkgsrc/print/poppler-qt6/buildlink3.mk      Tue Dec  6 14:05:10 2022
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2022/12/06 14:05:10 nros Exp $
+
+BUILDLINK_TREE+=       poppler-qt6
+
+.if !defined(POPPLER_QT6_BUILDLINK3_MK)
+POPPLER_QT6_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.poppler-qt6+=    poppler-qt6>=22.01.0
+BUILDLINK_PKGSRCDIR.poppler-qt6?=      ../../print/poppler-qt6
+
+.include "../../print/poppler/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.endif # POPPLER_QT6_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -poppler-qt6