Date: Wednesday, August 5, 2020 @ 12:05:43 Author: arojas Revision: 393175
gpsd 3.21 rebuild Added: plasma-workspace/trunk/plasma-workspace-gpsd-3.21.patch Modified: plasma-workspace/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 10 +++++++--- plasma-workspace-gpsd-3.21.patch | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-05 10:54:26 UTC (rev 393174) +++ PKGBUILD 2020-08-05 12:05:43 UTC (rev 393175) @@ -6,7 +6,7 @@ pkgbase=plasma-workspace pkgname=(plasma-workspace plasma-wayland-session) pkgver=5.19.4 -pkgrel=1 +pkgrel=2 pkgdesc='KDE Plasma Workspace' arch=(x86_64) url='https://www.kde.org/workspaces/plasmadesktop/' @@ -16,10 +16,12 @@ plasma-integration kdelibs4support kpeople kactivities-stats libkscreen kquickcharts kuserfeedback) makedepends=(extra-cmake-modules kdoctools gpsd baloo networkmanager-qt kdesignerplugin kinit) groups=(plasma) -source=("https://download.kde.org/stable/plasma/$pkgver/$pkgbase-$pkgver.tar.xz"{,.sig} kde.pam) +source=("https://download.kde.org/stable/plasma/$pkgver/$pkgbase-$pkgver.tar.xz"{,.sig} kde.pam + plasma-workspace-gpsd-3.21.patch) sha256sums=('584fada178f8a3d770080e1faa631cb64eebbf70af89f5d611ac9438fa868bd3' 'SKIP' - '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739') + '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739' + '27bdc2f751cb6a418d4cf08b08d260ec5621dc3190418fcea9fa80870f857348') validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell <[email protected]> '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <[email protected]> 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson <[email protected]> @@ -26,6 +28,8 @@ '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <[email protected]> prepare() { + patch -d $pkgbase-$pkgver -p1 -i ../plasma-workspace-gpsd-3.21.patch # Fix build with gpsd 3.21 + sed -e 's|dbus-run-session ||' -i $pkgbase-$pkgver/login-sessions/plasmawayland.desktop.cmake # Don't start a second user dbus session } Added: plasma-workspace-gpsd-3.21.patch =================================================================== --- plasma-workspace-gpsd-3.21.patch (rev 0) +++ plasma-workspace-gpsd-3.21.patch 2020-08-05 12:05:43 UTC (rev 393175) @@ -0,0 +1,16 @@ +diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp +index 021c29ac5..476117ca3 100644 +--- a/dataengines/geolocation/location_gps.cpp ++++ b/dataengines/geolocation/location_gps.cpp +@@ -65,7 +65,11 @@ void Gpsd::run() + if (m_gpsdata->online) { + #endif + //qDebug() << "online"; ++#if GPSD_API_MAJOR_VERSION >= 10 ++ if (m_gpsdata->fix.status != STATUS_NO_FIX) { ++#else + if (m_gpsdata->status != STATUS_NO_FIX) { ++#endif + //qDebug() << "fix"; + d["accuracy"] = 30; + d["latitude"] = QString::number(m_gpsdata->fix.latitude);
