commit: 2760960ec94bb177c1941861a0a18a446620fcf2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Oct 2 13:10:49 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Oct 2 13:13:03 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2760960e
kde-apps/marble: Fix build with gpsd-3.23.1 STATUS_NO_FIX was renamed to STATUS_UNK. See also: https://invent.kde.org/education/marble/-/merge_requests/57 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> .../marble/files/marble-21.08.1-gpsd-3.23.1.patch | 32 ++++++++++++++++++++++ kde-apps/marble/marble-21.08.1.ebuild | 3 ++ 2 files changed, 35 insertions(+) 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 new file mode 100644 index 00000000000..ee01af9e438 --- /dev/null +++ b/kde-apps/marble/files/marble-21.08.1-gpsd-3.23.1.patch @@ -0,0 +1,32 @@ +From 2732740676c236b832dead0b74511043db64787e Mon Sep 17 00:00:00 2001 +From: ivan tkachenko <[email protected]> +Date: Wed, 29 Sep 2021 00:55:23 +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 + +Co-Authored-By: Vlad Zahorodnii <[email protected]> +--- + .../positionprovider/gpsd/GpsdPositionProviderPlugin.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp +index 6aaf3a34c..30b955cd1 100644 +--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp ++++ b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp +@@ -74,7 +74,9 @@ void GpsdPositionProviderPlugin::update( gps_data_t data ) + { + PositionProviderStatus oldStatus = m_status; + GeoDataCoordinates oldPosition = m_position; +-#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 10 ) ++#if defined(STATUS_UNK) // STATUS_NO_FIX was renamed to STATUS_UNK without bumping API version ++ if ( data.fix.status == STATUS_UNK || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) ) ++#elif defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 10 ) + if ( data.fix.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) ) + #else + if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) ) +-- +GitLab + diff --git a/kde-apps/marble/marble-21.08.1.ebuild b/kde-apps/marble/marble-21.08.1.ebuild index 0e56f3ae9a6..4bcdb54ca1c 100644 --- a/kde-apps/marble/marble-21.08.1.ebuild +++ b/kde-apps/marble/marble-21.08.1.ebuild @@ -65,6 +65,9 @@ RDEPEND="${DEPEND}" # bug 588320 RESTRICT="test" +# Upstream pending: https://invent.kde.org/education/marble/-/merge_requests/57 +PATCHES=( "${FILESDIR}/${P}-gpsd-3.23.1.patch" ) + src_prepare() { ecm_src_prepare
