Date: Wednesday, August 5, 2020 @ 12:22:33 Author: arojas Revision: 393177
gpsd 3.21 rebuild Added: marble/trunk/marble-gpsd-3.21.patch Modified: marble/trunk/PKGBUILD ------------------------+ PKGBUILD | 12 +++++++++--- marble-gpsd-3.21.patch | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-05 12:05:54 UTC (rev 393176) +++ PKGBUILD 2020-08-05 12:22:33 UTC (rev 393177) @@ -7,7 +7,7 @@ pkgbase=marble pkgname=(marble-common marble-qt marble) pkgver=20.04.3 -pkgrel=1 +pkgrel=2 pkgdesc="Desktop Globe" arch=(x86_64) url="https://www.kde.org/applications/system/marble"; @@ -14,12 +14,18 @@ license=(GPL) makedepends=(extra-cmake-modules gpsd kdoctools knewstuff kparts krunner libwlocate phonon-qt5 plasma-workspace qt5-serialport qt5-tools qt5-webengine shapelib) -source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig}) +source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig} + marble-gpsd-3.21.patch) sha256sums=('9c0b6fb13d53e1748de081c43e06cc132d5b07d46e594443b207fbaf74e1f95b' - 'SKIP') + 'SKIP' + 'cfb30ebcefd5134c7b11525160537d1deee7cbd707df4fd8d59da4d9bd5bbd9c') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <[email protected]> F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <[email protected]> +prepare() { + patch -d $pkgbase-$pkgver -p1 -i ../marble-gpsd-3.21.patch # Fix build with gpsd 3.21 +} + build() { cmake -B build -S $pkgbase-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr \ Added: marble-gpsd-3.21.patch =================================================================== --- marble-gpsd-3.21.patch (rev 0) +++ marble-gpsd-3.21.patch 2020-08-05 12:22:33 UTC (rev 393177) @@ -0,0 +1,16 @@ +diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp +index 3a787eb1f..02dc4a355 100644 +--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp ++++ b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp +@@ -79,7 +79,11 @@ void GpsdPositionProviderPlugin::update( gps_data_t data ) + { + PositionProviderStatus oldStatus = m_status; + GeoDataCoordinates oldPosition = m_position; ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 10 ) ++ if ( data.fix.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) ) ++#else + if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) ) ++#endif + m_status = PositionProviderStatusAcquiring; + else { + m_status = PositionProviderStatusAvailable;
