commit: e71b6df109fb99ae46412b8d03c422e9bd3f6867 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Sep 30 17:11:51 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Sep 30 17:22:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e71b6df1
kde-plasma/plasma-workspace: Fix build with gpsd-3.23.1 See also: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1078 Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../plasma-workspace-5.22.5-gpsd-3.23.1.patch | 30 ++++++++++++++++++++++ .../plasma-workspace-5.22.5-r2.ebuild | 1 + 2 files changed, 31 insertions(+) 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 new file mode 100644 index 00000000000..cb35751d446 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch @@ -0,0 +1,30 @@ +From e6cab5d96f7b51a5cf4be3d93a7e2d4fee1cddae Mon Sep 17 00:00:00 2001 +From: Vlad Zahorodnii <[email protected]> +Date: Thu, 23 Sep 2021 19:29:05 +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 +--- + dataengines/geolocation/location_gps.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp +index 858059ada..ec9ec14ae 100644 +--- a/dataengines/geolocation/location_gps.cpp ++++ b/dataengines/geolocation/location_gps.cpp +@@ -52,7 +52,9 @@ void Gpsd::run() + #else + if (m_gpsdata->online) { + #endif +-#if GPSD_API_MAJOR_VERSION >= 10 ++#if defined(STATUS_UNK) // STATUS_NO_FIX was renamed to STATUS_UNK without bumping API version ++ if (m_gpsdata->fix.status != STATUS_UNK) { ++#elif GPSD_API_MAJOR_VERSION >= 10 + if (m_gpsdata->fix.status != STATUS_NO_FIX) { + #else + if (m_gpsdata->status != STATUS_NO_FIX) { +-- +GitLab + 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 index 2a5454791b8..21b2c64d565 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild @@ -151,6 +151,7 @@ PATCHES=( "${FILESDIR}/${P}-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 "${FILESDIR}/${P}-fix-powermanagement-inhibition.patch" # KDE-bug 433675 "${FILESDIR}/${P}-fix-hotplug-notifications.patch" # KDE-bug 438874, bug 814284 + "${FILESDIR}/${P}-gpsd-3.23.1.patch" ) src_prepare() {
