CVS commit: pkgsrc/print

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Feb 28 20:05:03 UTC 2023

Modified Files:
        pkgsrc/print/poppler: Makefile
        pkgsrc/print/poppler-cpp: Makefile
        pkgsrc/print/poppler-glib: Makefile
        pkgsrc/print/poppler-qt5: Makefile

Log Message:
poppler-*: disable qt6 consistently except for in the poppler-qt6 package


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/print/poppler/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/print/poppler-cpp/Makefile
cvs rdiff -u -r1.104 -r1.105 pkgsrc/print/poppler-glib/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/print/poppler-qt5/Makefile

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.91 pkgsrc/print/poppler/Makefile:1.92
--- pkgsrc/print/poppler/Makefile:1.91  Thu Feb 16 08:17:28 2023
+++ pkgsrc/print/poppler/Makefile       Tue Feb 28 20:05:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2023/02/16 08:17:28 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2023/02/28 20:05:02 tnn Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -16,9 +16,8 @@ CMAKE_ARGS+=  -DENABLE_GLIB=OFF
 CMAKE_ARGS+=   -DENABLE_UTILS=OFF
 # Don't compile poppler cpp wrapper.
 CMAKE_ARGS+=   -DENABLE_CPP=OFF
-# Don't compile poppler qt5 wrapper.
+# Don't compile poppler qt5/6 wrapper.
 CMAKE_ARGS+=   -DENABLE_QT5=OFF
-# Don't compile poppler qt6 wrapper.
 CMAKE_ARGS+=   -DENABLE_QT6=OFF
 # Don't build libcurl based HTTP support. ## might want to include
 CMAKE_ARGS+=   -DENABLE_LIBCURL=OFF

Index: pkgsrc/print/poppler-cpp/Makefile
diff -u pkgsrc/print/poppler-cpp/Makefile:1.35 pkgsrc/print/poppler-cpp/Makefile:1.36
--- pkgsrc/print/poppler-cpp/Makefile:1.35      Thu Feb 16 08:17:29 2023
+++ pkgsrc/print/poppler-cpp/Makefile   Tue Feb 28 20:05:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2023/02/16 08:17:29 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2023/02/28 20:05:02 tnn Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -18,8 +18,9 @@ CMAKE_ARGS+=  -DENABLE_GLIB=OFF
 CMAKE_ARGS+=   -DENABLE_UTILS=OFF
 # Compile poppler cpp wrapper.
 CMAKE_ARGS+=   -DENABLE_CPP=ON
-# Don't compile poppler qt5 wrapper.
+# Don't compile poppler qt5/6 wrapper.
 CMAKE_ARGS+=   -DENABLE_QT5=OFF
+CMAKE_ARGS+=   -DENABLE_QT6=OFF
 # Don't build libcurl based HTTP support. ## might want to include
 CMAKE_ARGS+=   -DENABLE_LIBCURL=OFF
 

Index: pkgsrc/print/poppler-glib/Makefile
diff -u pkgsrc/print/poppler-glib/Makefile:1.104 pkgsrc/print/poppler-glib/Makefile:1.105
--- pkgsrc/print/poppler-glib/Makefile:1.104    Thu Feb 16 08:17:29 2023
+++ pkgsrc/print/poppler-glib/Makefile  Tue Feb 28 20:05:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2023/02/16 08:17:29 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2023/02/28 20:05:02 tnn Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -27,8 +27,9 @@ CMAKE_ARGS+=  -DENABLE_GTK_DOC=OFF
 CMAKE_ARGS+=   -DENABLE_UTILS=OFF
 # Don't compile poppler cpp wrapper.
 CMAKE_ARGS+=   -DENABLE_CPP=OFF
-# Don't compile poppler qt5 wrapper.
+# Don't compile poppler qt5/6 wrapper.
 CMAKE_ARGS+=   -DENABLE_QT5=OFF
+CMAKE_ARGS+=   -DENABLE_QT6=OFF
 # Don't build libcurl based HTTP support. ## might want to include
 CMAKE_ARGS+=   -DENABLE_LIBCURL=OFF
 

Index: pkgsrc/print/poppler-qt5/Makefile
diff -u pkgsrc/print/poppler-qt5/Makefile:1.59 pkgsrc/print/poppler-qt5/Makefile:1.60
--- pkgsrc/print/poppler-qt5/Makefile:1.59      Thu Feb 16 08:17:29 2023
+++ pkgsrc/print/poppler-qt5/Makefile   Tue Feb 28 20:05:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2023/02/16 08:17:29 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2023/02/28 20:05:02 tnn Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -11,6 +11,7 @@ CMAKE_ARGS+=  -DENABLE_GLIB=OFF
 CMAKE_ARGS+=   -DENABLE_UTILS=OFF
 CMAKE_ARGS+=   -DENABLE_CPP=OFF
 CMAKE_ARGS+=   -DENABLE_QT5=ON
+CMAKE_ARGS+=   -DENABLE_QT6=OFF
 # Don't build libcurl based HTTP support. ## might want to include
 CMAKE_ARGS+=   -DENABLE_LIBCURL=OFF