| 1 |
commit: e71b6df109fb99ae46412b8d03c422e9bd3f6867 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 30 17:11:51 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 30 17:22:11 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e71b6df1 |
| 7 |
|
| 8 |
kde-plasma/plasma-workspace: Fix build with gpsd-3.23.1 |
| 9 |
|
| 10 |
See also: |
| 11 |
https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1078 |
| 12 |
|
| 13 |
Package-Manager: Portage-3.0.26, Repoman-3.0.3 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
.../plasma-workspace-5.22.5-gpsd-3.23.1.patch | 30 ++++++++++++++++++++++ |
| 17 |
.../plasma-workspace-5.22.5-r2.ebuild | 1 + |
| 18 |
2 files changed, 31 insertions(+) |
| 19 |
|
| 20 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..cb35751d446 |
| 23 |
--- /dev/null |
| 24 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch |
| 25 |
@@ -0,0 +1,30 @@ |
| 26 |
+From e6cab5d96f7b51a5cf4be3d93a7e2d4fee1cddae Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Vlad Zahorodnii <vlad.zahorodnii@×××.org> |
| 28 |
+Date: Thu, 23 Sep 2021 19:29:05 +0300 |
| 29 |
+Subject: [PATCH] Fix build with gpsd 3.23.1 |
| 30 |
+ |
| 31 |
+STATUS_NO_FIX was renamed to STATUS_UNK. |
| 32 |
+ |
| 33 |
+https://gitlab.com/gpsd/gpsd/-/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427 |
| 34 |
+--- |
| 35 |
+ dataengines/geolocation/location_gps.cpp | 4 +++- |
| 36 |
+ 1 file changed, 3 insertions(+), 1 deletion(-) |
| 37 |
+ |
| 38 |
+diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp |
| 39 |
+index 858059ada..ec9ec14ae 100644 |
| 40 |
+--- a/dataengines/geolocation/location_gps.cpp |
| 41 |
++++ b/dataengines/geolocation/location_gps.cpp |
| 42 |
+@@ -52,7 +52,9 @@ void Gpsd::run() |
| 43 |
+ #else |
| 44 |
+ if (m_gpsdata->online) { |
| 45 |
+ #endif |
| 46 |
+-#if GPSD_API_MAJOR_VERSION >= 10 |
| 47 |
++#if defined(STATUS_UNK) // STATUS_NO_FIX was renamed to STATUS_UNK without bumping API version |
| 48 |
++ if (m_gpsdata->fix.status != STATUS_UNK) { |
| 49 |
++#elif GPSD_API_MAJOR_VERSION >= 10 |
| 50 |
+ if (m_gpsdata->fix.status != STATUS_NO_FIX) { |
| 51 |
+ #else |
| 52 |
+ if (m_gpsdata->status != STATUS_NO_FIX) { |
| 53 |
+-- |
| 54 |
+GitLab |
| 55 |
+ |
| 56 |
|
| 57 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild |
| 58 |
index 2a5454791b8..21b2c64d565 100644 |
| 59 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild |
| 60 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild |
| 61 |
@@ -151,6 +151,7 @@ PATCHES=( |
| 62 |
"${FILESDIR}/${P}-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 |
| 63 |
"${FILESDIR}/${P}-fix-powermanagement-inhibition.patch" # KDE-bug 433675 |
| 64 |
"${FILESDIR}/${P}-fix-hotplug-notifications.patch" # KDE-bug 438874, bug 814284 |
| 65 |
+ "${FILESDIR}/${P}-gpsd-3.23.1.patch" |
| 66 |
) |
| 67 |
|
| 68 |
src_prepare() { |
Archives