Re: qt5-qtlocation missing geoclue plugin files (dbus in qtbase)

["Dr. Thomas Orgis" <thomas.orgis%uni-hamburg.de@localhost>]

Am Mon, 16 Nov 2020 15:56:09 +0100
schrieb "Dr. Thomas Orgis" <thomas.orgis%uni-hamburg.de@localhost>: 


> so that might explain the missing files. Should one introduce a PLIST
> conditional, then, that reflects the PKG_OPTIONS.qt5 setting of dbus?

How about the attached change? I suppose the plugin is not really
Linux-specific but only depending on dbus.


Alrighty then,

Thomas

-- 
Dr. Thomas Orgis
HPC @ Universität Hamburg

diff -ruN -x CVS pkgsrc-2020Q3/x11/qt5-qtlocation/Makefile pkgsrc/x11/qt5-qtlocation/Makefile
--- pkgsrc-2020Q3/x11/qt5-qtlocation/Makefile	2020-09-14 22:08:27.000000000 +0200
+++ pkgsrc/x11/qt5-qtlocation/Makefile	2020-11-16 16:32:39.034510840 +0100
@@ -17,6 +17,12 @@
 	${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
 .endfor
 
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+PLIST_VARS+=    dbus
+.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"
diff -ruN -x CVS pkgsrc-2020Q3/x11/qt5-qtlocation/PLIST pkgsrc/x11/qt5-qtlocation/PLIST
--- pkgsrc-2020Q3/x11/qt5-qtlocation/PLIST	2020-06-02 08:41:01.000000000 +0200
+++ pkgsrc/x11/qt5-qtlocation/PLIST	2020-11-16 16:32:52.685512102 +0100
@@ -358,3 +358,7 @@
 qt5/qml/QtPositioning/libdeclarative_positioning.so
 qt5/qml/QtPositioning/plugins.qmltypes
 qt5/qml/QtPositioning/qmldir
+${PLIST.dbus}qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake
+${PLIST.dbus}qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue2.cmake
+${PLIST.dbus}qt5/plugins/position/libqtposition_geoclue.so
+${PLIST.dbus}qt5/plugins/position/libqtposition_geoclue2.so
diff -ruN -x CVS pkgsrc-2020Q3/x11/qt5-qtlocation/PLIST.Linux pkgsrc/x11/qt5-qtlocation/PLIST.Linux
--- pkgsrc-2020Q3/x11/qt5-qtlocation/PLIST.Linux	2020-06-20 09:52:20.000000000 +0200
+++ pkgsrc/x11/qt5-qtlocation/PLIST.Linux	2020-11-16 16:30:25.227498467 +0100
@@ -1,7 +1,3 @@
 @comment $NetBSD: PLIST.Linux,v 1.3 2020/06/20 07:52:20 rillig Exp $
 qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryMapboxGL.cmake
-qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake
-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