CVS commit: pkgsrc/x11/qt6-qtbase

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Feb 20 09:46:31 UTC 2023

Modified Files:
        pkgsrc/x11/qt6-qtbase: Makefile options.mk

Log Message:
qt6-qtbase: fix build without dbus

at-spi2-core transitively depends on dbus so must be avoided


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/qt6-qtbase/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/qt6-qtbase/options.mk

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

Modified files:

Index: pkgsrc/x11/qt6-qtbase/Makefile
diff -u pkgsrc/x11/qt6-qtbase/Makefile:1.4 pkgsrc/x11/qt6-qtbase/Makefile:1.5
--- pkgsrc/x11/qt6-qtbase/Makefile:1.4  Sun Jan 29 21:15:18 2023
+++ pkgsrc/x11/qt6-qtbase/Makefile      Mon Feb 20 09:46:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/01/29 21:15:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2023/02/20 09:46:30 tnn Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtbase-${QTVERSION}
@@ -207,7 +207,6 @@ PKGCONFIG_OVERRIDE+=        lib/pkgconfig/Qt6Xm
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../devel/at-spi2-core/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pcre2/buildlink3.mk"

Index: pkgsrc/x11/qt6-qtbase/options.mk
diff -u pkgsrc/x11/qt6-qtbase/options.mk:1.1 pkgsrc/x11/qt6-qtbase/options.mk:1.2
--- pkgsrc/x11/qt6-qtbase/options.mk:1.1        Thu Nov 24 11:11:38 2022
+++ pkgsrc/x11/qt6-qtbase/options.mk    Mon Feb 20 09:46:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2022/11/24 11:11:38 nros Exp $
+# $NetBSD: options.mk,v 1.2 2023/02/20 09:46:30 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qt6-qtbase
 PKG_SUPPORTED_OPTIONS+=        cups dbus gtk3
@@ -19,6 +19,7 @@ PLIST_VARS+=          dbus
 .if !empty(PKG_OPTIONS:Mdbus)
 # Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus
 USE_DBUS-ARCH-DEPS_H=  yes
+.include "../../devel/at-spi2-core/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 CONFIGURE_ARGS+=       -dbus-linked
 PLIST.dbus=            yes