Thu Jun 29 06:05:02 2023 UTC ()
poppler: disable gpgme in Makefile.common


(wiz)
diff -r1.96 -r1.97 pkgsrc/print/poppler/Makefile
diff -r1.148 -r1.149 pkgsrc/print/poppler/Makefile.common
cvs diff -r1.96 -r1.97 pkgsrc/print/poppler/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler/Makefile 2023/06/28 21:33:19 1.96
+++ pkgsrc/print/poppler/Makefile 2023/06/29 06:05:02 1.97
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: Makefile,v 1.96 2023/06/28 21:33:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.97 2023/06/29 06:05:02 wiz Exp $
2 2
3.include "../../print/poppler/Makefile.common" 3.include "../../print/poppler/Makefile.common"
4 4
5COMMENT= PDF rendering library 5COMMENT= PDF rendering library
6 6
7PKGCONFIG_OVERRIDE+= poppler.pc.cmake 7PKGCONFIG_OVERRIDE+= poppler.pc.cmake
8 8
9INSTALLATION_DIRS+= include/poppler share/doc/poppler 9INSTALLATION_DIRS+= include/poppler share/doc/poppler
10 10
11# Don't compile GTK+ test program. 11# Don't compile GTK+ test program.
12CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF 12CMAKE_ARGS+= -DBUILD_GTK_TESTS=OFF
13# Don't compile GLib wrapper which also needs gtk2 13# Don't compile GLib wrapper which also needs gtk2
14CMAKE_ARGS+= -DENABLE_GLIB=OFF 14CMAKE_ARGS+= -DENABLE_GLIB=OFF
15# Don't compile gpgme crypto backend 
16CMAKE_ARGS+= -DWITH_Gpgmepp:BOOL=OFF 
17# Don't build and install the tools 15# Don't build and install the tools
18CMAKE_ARGS+= -DENABLE_UTILS=OFF 16CMAKE_ARGS+= -DENABLE_UTILS=OFF
19# Don't compile poppler cpp wrapper. 17# Don't compile poppler cpp wrapper.
20CMAKE_ARGS+= -DENABLE_CPP=OFF 18CMAKE_ARGS+= -DENABLE_CPP=OFF
21# Don't compile poppler qt5/6 wrapper. 19# Don't compile poppler qt5/6 wrapper.
22CMAKE_ARGS+= -DENABLE_QT5=OFF 20CMAKE_ARGS+= -DENABLE_QT5=OFF
23CMAKE_ARGS+= -DENABLE_QT6=OFF 21CMAKE_ARGS+= -DENABLE_QT6=OFF
24# Don't build libcurl based HTTP support. ## might want to include 22# Don't build libcurl based HTTP support. ## might want to include
25CMAKE_ARGS+= -DENABLE_LIBCURL=OFF 23CMAKE_ARGS+= -DENABLE_LIBCURL=OFF
26# Don't run gperf if it's present 24# Don't run gperf if it's present
27CMAKE_ARGS+= -DRUN_GPERF_IF_PRESENT=OFF 25CMAKE_ARGS+= -DRUN_GPERF_IF_PRESENT=OFF
28 26
29.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
cvs diff -r1.148 -r1.149 pkgsrc/print/poppler/Makefile.common (expand / switch to unified diff)

--- pkgsrc/print/poppler/Makefile.common 2023/06/28 20:04:12 1.148
+++ pkgsrc/print/poppler/Makefile.common 2023/06/29 06:05:02 1.149
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.148 2023/06/28 20:04:12 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.149 2023/06/29 06:05:02 wiz Exp $
2# 2#
3# used by print/poppler/Makefile 3# used by print/poppler/Makefile
4# used by print/poppler-cpp/Makefile 4# used by print/poppler-cpp/Makefile
5# used by print/poppler-glib/Makefile 5# used by print/poppler-glib/Makefile
6# used by print/poppler-includes/Makefile 6# used by print/poppler-includes/Makefile
7# used by print/poppler-qt5/Makefile 7# used by print/poppler-qt5/Makefile
8# used by print/poppler-qt6/Makefile 8# used by print/poppler-qt6/Makefile
9# used by print/poppler-utils/Makefile 9# used by print/poppler-utils/Makefile
10 10
11POPPLER_VERS= 23.06.0 11POPPLER_VERS= 23.06.0
12DISTNAME= poppler-${POPPLER_VERS} 12DISTNAME= poppler-${POPPLER_VERS}
13CATEGORIES= print 13CATEGORIES= print
14MASTER_SITES= https://poppler.freedesktop.org/ 14MASTER_SITES= https://poppler.freedesktop.org/
@@ -16,26 +16,29 @@ EXTRACT_SUFX= .tar.xz @@ -16,26 +16,29 @@ EXTRACT_SUFX= .tar.xz
16 16
17MAINTAINER= reed@reedmedia.net 17MAINTAINER= reed@reedmedia.net
18HOMEPAGE= https://poppler.freedesktop.org/ 18HOMEPAGE= https://poppler.freedesktop.org/
19LICENSE= gnu-gpl-v2 19LICENSE= gnu-gpl-v2
20 20
21DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo 21DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo
22#PATCHDIR= ${.CURDIR}/../../print/poppler/patches 22#PATCHDIR= ${.CURDIR}/../../print/poppler/patches
23 23
24USE_CMAKE= yes 24USE_CMAKE= yes
25USE_LANGUAGES= c c++17 25USE_LANGUAGES= c c++17
26USE_TOOLS+= pkg-config gsed 26USE_TOOLS+= pkg-config gsed
27GCC_REQD+= 8 # std::optional 27GCC_REQD+= 8 # std::optional
28 28
 29# Don't compile gpgme crypto backend
 30CMAKE_ARGS+= -DWITH_Gpgmepp:BOOL=OFF
 31
29.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
30 33
31# This package will link against libstdc++.so from the pkgsrc GCC when the 34# This package will link against libstdc++.so from the pkgsrc GCC when the
32# base OS GCC doesn't meet the minimum requirement. Thus we do this so the 35# base OS GCC doesn't meet the minimum requirement. Thus we do this so the
33# appropriate gcc-libs package will be captured as a dependency, otherwise 36# appropriate gcc-libs package will be captured as a dependency, otherwise
34# binary packages will be broken. 37# binary packages will be broken.
35.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 090000 38.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 090000
36USE_PKGSRC_GCC= yes 39USE_PKGSRC_GCC= yes
37USE_PKGSRC_GCC_RUNTIME= yes 40USE_PKGSRC_GCC_RUNTIME= yes
38.endif 41.endif
39 42
40.include "../../mk/compiler.mk" 43.include "../../mk/compiler.mk"
41.if !empty(PKGSRC_COMPILER:Mclang) 44.if !empty(PKGSRC_COMPILER:Mclang)