CVS commit: pkgsrc/x11/qt5-qtlocation

["Michael Forney" <mcf%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mcf
Date:           Mon Oct 12 19:32:54 UTC 2020

Modified Files:
        pkgsrc/x11/qt5-qtlocation: Makefile PLIST.Linux

Log Message:
qt5-qtlocation: geoclue plugins depend on qt5-qtbase[dbus]

These plugins are only built when Qt has the dbus module [0].

[0] https://github.com/qt/qtlocation/blob/v5.15.1/src/plugins/position/position.pro#L5-L6


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/x11/qt5-qtlocation/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/qt5-qtlocation/PLIST.Linux

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

Modified files:

Index: pkgsrc/x11/qt5-qtlocation/Makefile
diff -u pkgsrc/x11/qt5-qtlocation/Makefile:1.48 pkgsrc/x11/qt5-qtlocation/Makefile:1.49
--- pkgsrc/x11/qt5-qtlocation/Makefile:1.48     Mon Sep 14 20:08:27 2020
+++ pkgsrc/x11/qt5-qtlocation/Makefile  Mon Oct 12 19:32:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2020/09/14 20:08:27 adam Exp $
+# $NetBSD: Makefile,v 1.49 2020/10/12 19:32:54 mcf Exp $
 
 DISTNAME=      qtlocation-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtlocation-${QTVERSION}
@@ -17,6 +17,12 @@ post-install:
        ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
 .endfor
 
+PLIST_VARS+=           dbus
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.qt5-qtbase:Mdbus}
+PLIST.dbus=            yes
+.endif
+
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../x11/qt5-qtserialport/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/qt5-qtlocation/PLIST.Linux
diff -u pkgsrc/x11/qt5-qtlocation/PLIST.Linux:1.3 pkgsrc/x11/qt5-qtlocation/PLIST.Linux:1.4
--- pkgsrc/x11/qt5-qtlocation/PLIST.Linux:1.3   Sat Jun 20 07:52:20 2020
+++ pkgsrc/x11/qt5-qtlocation/PLIST.Linux       Mon Oct 12 19:32:54 2020
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST.Linux,v 1.3 2020/06/20 07:52:20 rillig Exp $
+@comment $NetBSD: PLIST.Linux,v 1.4 2020/10/12 19:32:54 mcf Exp $
 qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryMapboxGL.cmake
-qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake
-qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue2.cmake
+${PLIST.dbus}qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake
+${PLIST.dbus}qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue2.cmake
 qt5/plugins/geoservices/libqtgeoservices_mapboxgl.so
-qt5/plugins/position/libqtposition_geoclue.so
-qt5/plugins/position/libqtposition_geoclue2.so
+${PLIST.dbus}qt5/plugins/position/libqtposition_geoclue.so
+${PLIST.dbus}qt5/plugins/position/libqtposition_geoclue2.so