commit: 387c395751705c65010a74508f4df48be238f9df Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Sep 16 17:01:42 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Sep 17 20:14:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=387c3957
kde-plasma/plasma-workspace: Fix build with sci-geosciences/gpsd-3.21 Thanks-to: PhobosK <phobosk <AT> fastmail.fm> Closes: https://bugs.gentoo.org/742392 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/plasma-workspace-5.19.5-gpsd-3.21.patch | 29 ++++++++++++++++++++++ .../plasma-workspace-5.19.5.ebuild | 1 + 2 files changed, 30 insertions(+) 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 new file mode 100644 index 00000000000..64c5e106e10 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch @@ -0,0 +1,29 @@ +From e3134289f522edb140797818fffd60d641b86cd8 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <[email protected]> +Date: Wed, 5 Aug 2020 14:07:24 +0200 +Subject: [PATCH] Fix build with gpsd 3.21 + +Adapt to API changes +--- + dataengines/geolocation/location_gps.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp +index 021c29ac5..476117ca3 100644 +--- a/dataengines/geolocation/location_gps.cpp ++++ b/dataengines/geolocation/location_gps.cpp +@@ -65,7 +65,11 @@ void Gpsd::run() + if (m_gpsdata->online) { + #endif + //qDebug() << "online"; ++#if GPSD_API_MAJOR_VERSION >= 10 ++ if (m_gpsdata->fix.status != STATUS_NO_FIX) { ++#else + if (m_gpsdata->status != STATUS_NO_FIX) { ++#endif + //qDebug() << "fix"; + d["accuracy"] = 30; + d["latitude"] = QString::number(m_gpsdata->fix.latitude); +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild index 2c1b32f36d4..049c17d6cda 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild @@ -126,6 +126,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" "${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684 + "${FILESDIR}/${P}-gpsd-3.21.patch" # bug 742392 ) RESTRICT+=" test"
