diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2021-08-09 13:16:56 -0600 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2021-08-09 13:16:56 -0600 |
| commit | ad32e9c45b382a1194a1645acbd3534bbb1f3a6c (patch) | |
| tree | b722c8633a9405930a844980b1fd4d81b31b6db3 | |
| parent | 7c500a0a3b2414e7fac4e86cf7cf1536f758ca00 (diff) | |
community/marble: fix build with gpsd 3.23
| -rw-r--r-- | community/marble/APKBUILD | 8 | ||||
| -rw-r--r-- | community/marble/gpsd-3.23.patch | 26 |
2 files changed, 32 insertions, 2 deletions
diff --git a/community/marble/APKBUILD b/community/marble/APKBUILD index 38b82a2c594..f3c1acf75ad 100644 --- a/community/marble/APKBUILD +++ b/community/marble/APKBUILD @@ -11,7 +11,8 @@ url='https://marble.kde.org' license="LGPL-2.1-or-later AND GPL-3.0-or-later" depends_dev="qt5-qtbase-dev qt5-qtsvg-dev qt5-qtdeclarative-dev qt5-qtwebengine-dev qt5-qttools-dev qt5-qtserialport-dev qt5-qtlocation-dev kdoctools-dev phonon-dev gpsd-dev kcrash-dev kcoreaddons-dev kwallet-dev knewstuff-dev kparts-dev plasma-framework-dev krunner-dev ki18n-dev kio-dev shared-mime-info" makedepends="$depends_dev extra-cmake-modules" -source="https://download.kde.org/stable/release-service/$pkgver/src/marble-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/marble-$pkgver.tar.xz + gpsd-3.23.patch" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" options="!check" # Requires itself to be installed @@ -34,4 +35,7 @@ check() { package() { DESTDIR="$pkgdir" cmake --build build --target install } -sha512sums="44a0a6ad7aa77452482d86ffc88083ed1adc187b1ecb34dd5d5c211e6a692019cfa06579647a7943c423fdc911300e0efb8352de95da84ce9c27aeb4f1365b55 marble-20.04.2.tar.xz" +sha512sums=" +44a0a6ad7aa77452482d86ffc88083ed1adc187b1ecb34dd5d5c211e6a692019cfa06579647a7943c423fdc911300e0efb8352de95da84ce9c27aeb4f1365b55 marble-20.04.2.tar.xz +9788462e37fb88eb1682e9844dddf319442e1e1605a985b972891fa9e99882ffc5098d66691f63be880c5b7fdc33245e98968c4840fc1e148a0eaf3b9c54429e gpsd-3.23.patch +" diff --git a/community/marble/gpsd-3.23.patch b/community/marble/gpsd-3.23.patch new file mode 100644 index 00000000000..c4d60a38816 --- /dev/null +++ b/community/marble/gpsd-3.23.patch @@ -0,0 +1,26 @@ +From 7039b70f0255376e5d67dad603f5d67f8c3c07db Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <arojas@archlinux.org> +Date: Wed, 5 Aug 2020 14:20:37 +0200 +Subject: [PATCH] Fix build with gpsd 3.21 + +Adapt to API changes +--- + .../positionprovider/gpsd/GpsdPositionProviderPlugin.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +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; |