| 1 |
commit: 387c395751705c65010a74508f4df48be238f9df |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 16 17:01:42 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 17 20:14:47 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=387c3957 |
| 7 |
|
| 8 |
kde-plasma/plasma-workspace: Fix build with sci-geosciences/gpsd-3.21 |
| 9 |
|
| 10 |
Thanks-to: PhobosK <phobosk <AT> fastmail.fm> |
| 11 |
Closes: https://bugs.gentoo.org/742392 |
| 12 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/plasma-workspace-5.19.5-gpsd-3.21.patch | 29 ++++++++++++++++++++++ |
| 16 |
.../plasma-workspace-5.19.5.ebuild | 1 + |
| 17 |
2 files changed, 30 insertions(+) |
| 18 |
|
| 19 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..64c5e106e10 |
| 22 |
--- /dev/null |
| 23 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch |
| 24 |
@@ -0,0 +1,29 @@ |
| 25 |
+From e3134289f522edb140797818fffd60d641b86cd8 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Antonio Rojas <arojas@×××××××××.org> |
| 27 |
+Date: Wed, 5 Aug 2020 14:07:24 +0200 |
| 28 |
+Subject: [PATCH] Fix build with gpsd 3.21 |
| 29 |
+ |
| 30 |
+Adapt to API changes |
| 31 |
+--- |
| 32 |
+ dataengines/geolocation/location_gps.cpp | 4 ++++ |
| 33 |
+ 1 file changed, 4 insertions(+) |
| 34 |
+ |
| 35 |
+diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp |
| 36 |
+index 021c29ac5..476117ca3 100644 |
| 37 |
+--- a/dataengines/geolocation/location_gps.cpp |
| 38 |
++++ b/dataengines/geolocation/location_gps.cpp |
| 39 |
+@@ -65,7 +65,11 @@ void Gpsd::run() |
| 40 |
+ if (m_gpsdata->online) { |
| 41 |
+ #endif |
| 42 |
+ //qDebug() << "online"; |
| 43 |
++#if GPSD_API_MAJOR_VERSION >= 10 |
| 44 |
++ if (m_gpsdata->fix.status != STATUS_NO_FIX) { |
| 45 |
++#else |
| 46 |
+ if (m_gpsdata->status != STATUS_NO_FIX) { |
| 47 |
++#endif |
| 48 |
+ //qDebug() << "fix"; |
| 49 |
+ d["accuracy"] = 30; |
| 50 |
+ d["latitude"] = QString::number(m_gpsdata->fix.latitude); |
| 51 |
+-- |
| 52 |
+GitLab |
| 53 |
+ |
| 54 |
|
| 55 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild |
| 56 |
index 2c1b32f36d4..049c17d6cda 100644 |
| 57 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild |
| 58 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild |
| 59 |
@@ -126,6 +126,7 @@ PDEPEND=" |
| 60 |
PATCHES=( |
| 61 |
"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" |
| 62 |
"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684 |
| 63 |
+ "${FILESDIR}/${P}-gpsd-3.21.patch" # bug 742392 |
| 64 |
) |
| 65 |
|
| 66 |
RESTRICT+=" test" |
Archives