| 1 |
commit: 2760960ec94bb177c1941861a0a18a446620fcf2 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 2 13:10:49 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 2 13:13:03 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2760960e |
| 7 |
|
| 8 |
kde-apps/marble: Fix build with gpsd-3.23.1 |
| 9 |
|
| 10 |
STATUS_NO_FIX was renamed to STATUS_UNK. |
| 11 |
|
| 12 |
See also: |
| 13 |
https://invent.kde.org/education/marble/-/merge_requests/57 |
| 14 |
https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1078 |
| 15 |
|
| 16 |
Package-Manager: Portage-3.0.26, Repoman-3.0.3 |
| 17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 18 |
|
| 19 |
.../marble/files/marble-21.08.1-gpsd-3.23.1.patch | 32 ++++++++++++++++++++++ |
| 20 |
kde-apps/marble/marble-21.08.1.ebuild | 3 ++ |
| 21 |
2 files changed, 35 insertions(+) |
| 22 |
|
| 23 |
diff --git a/kde-apps/marble/files/marble-21.08.1-gpsd-3.23.1.patch b/kde-apps/marble/files/marble-21.08.1-gpsd-3.23.1.patch |
| 24 |
new file mode 100644 |
| 25 |
index 00000000000..ee01af9e438 |
| 26 |
--- /dev/null |
| 27 |
+++ b/kde-apps/marble/files/marble-21.08.1-gpsd-3.23.1.patch |
| 28 |
@@ -0,0 +1,32 @@ |
| 29 |
+From 2732740676c236b832dead0b74511043db64787e Mon Sep 17 00:00:00 2001 |
| 30 |
+From: ivan tkachenko <me@×××××××.tk> |
| 31 |
+Date: Wed, 29 Sep 2021 00:55:23 +0300 |
| 32 |
+Subject: [PATCH] Fix build with gpsd 3.23.1 |
| 33 |
+ |
| 34 |
+STATUS_NO_FIX was renamed to STATUS_UNK. |
| 35 |
+ |
| 36 |
+https://gitlab.com/gpsd/gpsd/-/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427 |
| 37 |
+ |
| 38 |
+Co-Authored-By: Vlad Zahorodnii <vlad.zahorodnii@×××.org> |
| 39 |
+--- |
| 40 |
+ .../positionprovider/gpsd/GpsdPositionProviderPlugin.cpp | 4 +++- |
| 41 |
+ 1 file changed, 3 insertions(+), 1 deletion(-) |
| 42 |
+ |
| 43 |
+diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp |
| 44 |
+index 6aaf3a34c..30b955cd1 100644 |
| 45 |
+--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp |
| 46 |
++++ b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp |
| 47 |
+@@ -74,7 +74,9 @@ void GpsdPositionProviderPlugin::update( gps_data_t data ) |
| 48 |
+ { |
| 49 |
+ PositionProviderStatus oldStatus = m_status; |
| 50 |
+ GeoDataCoordinates oldPosition = m_position; |
| 51 |
+-#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 10 ) |
| 52 |
++#if defined(STATUS_UNK) // STATUS_NO_FIX was renamed to STATUS_UNK without bumping API version |
| 53 |
++ if ( data.fix.status == STATUS_UNK || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) ) |
| 54 |
++#elif defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 10 ) |
| 55 |
+ if ( data.fix.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) ) |
| 56 |
+ #else |
| 57 |
+ if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) ) |
| 58 |
+-- |
| 59 |
+GitLab |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/kde-apps/marble/marble-21.08.1.ebuild b/kde-apps/marble/marble-21.08.1.ebuild |
| 63 |
index 0e56f3ae9a6..4bcdb54ca1c 100644 |
| 64 |
--- a/kde-apps/marble/marble-21.08.1.ebuild |
| 65 |
+++ b/kde-apps/marble/marble-21.08.1.ebuild |
| 66 |
@@ -65,6 +65,9 @@ RDEPEND="${DEPEND}" |
| 67 |
# bug 588320 |
| 68 |
RESTRICT="test" |
| 69 |
|
| 70 |
+# Upstream pending: https://invent.kde.org/education/marble/-/merge_requests/57 |
| 71 |
+PATCHES=( "${FILESDIR}/${P}-gpsd-3.23.1.patch" ) |
| 72 |
+ |
| 73 |
src_prepare() { |
| 74 |
ecm_src_prepare |
Archives