zepto-forks/meta-kde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add patch for Marble compatibility with recent gpsd

Browse Source
This commit is contained in:
Andreas Cord-Landwehr
2022-05-29 12:16:32 +02:00
parent 4dd9801e9a
commit 2861160af0
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
recipes-application/education/marble/0001_gpsd_8aadc3eb8f9484a65d497d442cd8c61fe1462bef.patch Normal file
View File

@@ -0,0 +1,32 @@
From 8aadc3eb8f9484a65d497d442cd8c61fe1462bef Mon Sep 17 00:00:00 2001
From: ivan tkachenko <me@ratijas.tk>
Date: Wed, 29 Sep 2021 00:55:23 +0300
Subject: [PATCH] Fix build with gpsd 3.23.1
STATUS_NO_FIX was renamed to STATUS_UNK.
https://gitlab.com/gpsd/gpsd/-/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427
Co-Authored-By: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
---
.../positionprovider/gpsd/GpsdPositionProviderPlugin.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
index 6aaf3a34c..30b955cd1 100644
--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
@@ -74,7 +74,9 @@ 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 defined(STATUS_UNK) // STATUS_NO_FIX was renamed to STATUS_UNK without bumping API version
+ if ( data.fix.status == STATUS_UNK || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) )
+#elif 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 ) )
--
GitLab

5
recipes-application/education/marble_21.08.0.bb
View File

@@ -2,5 +2,8 @@
# SPDX-License-Identifier: CC0-1.0
require ${PN}.inc
SRC_URI = "https://download.kde.org/stable/release-service/21.08.0/src/marble-21.08.0.tar.xz"
SRC_URI = "\
https://download.kde.org/stable/release-service/21.08.0/src/marble-21.08.0.tar.xz \
file://0001_gpsd_8aadc3eb8f9484a65d497d442cd8c61fe1462bef.patch \
"
SRC_URI[sha256sum] = "f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f"