diff options
| author | prlw1 <prlw1@pkgsrc.org> | 2021-12-17 08:51:53 +0000 |
|---|---|---|
| committer | prlw1 <prlw1@pkgsrc.org> | 2021-12-17 08:51:53 +0000 |
| commit | 7a6be21e9fa73e1421dd8566cb702a319e9b9156 (patch) | |
| tree | a7a0386486d3313e948e0cbb804c7deb65e75af7 /misc/marble | |
| parent | a102706d2da3a4abb48bd7e2b81352f75aa558f1 (diff) | |
| download | pkgsrc-7a6be21e9fa73e1421dd8566cb702a319e9b9156.tar.gz | |
misc/marble: Fix build with gpsd 3.23.1
OK markd@
Diffstat (limited to 'misc/marble')
| -rw-r--r-- | misc/marble/Makefile | 4 | ||||
| -rw-r--r-- | misc/marble/distinfo | 3 | ||||
| -rw-r--r-- | misc/marble/patches/patch-src_plugins_positionprovider_gpsd_GpsdPositionProviderPlugin.cpp | 19 |
3 files changed, 23 insertions, 3 deletions
diff --git a/misc/marble/Makefile b/misc/marble/Makefile index 842890e12d1..3641401b96d 100644 --- a/misc/marble/Makefile +++ b/misc/marble/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.72 2021/12/08 16:02:22 adam Exp $ +# $NetBSD: Makefile,v 1.73 2021/12/17 08:51:53 prlw1 Exp $ DISTNAME= marble-${KAPPSVER} -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= misc HOMEPAGE= https://kde.org/applications/system/marble/ diff --git a/misc/marble/distinfo b/misc/marble/distinfo index f8a4536964d..d82dd55f318 100644 --- a/misc/marble/distinfo +++ b/misc/marble/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2021/10/26 10:59:14 nia Exp $ +$NetBSD: distinfo,v 1.19 2021/12/17 08:51:53 prlw1 Exp $ BLAKE2s (marble-20.12.3.tar.xz) = f4d65c53c3b9f6c86f620cae916980473c03518abe138c5ad750b279e7b8ec8a SHA512 (marble-20.12.3.tar.xz) = 0dc69ce2dafac196d3b494bd29a268f879e8bd14ae916454682289822024d58e077e4972588cc6d51284459f2fc9aceacd4e1e8a8302f987556e20a7acaf172a @@ -6,4 +6,5 @@ Size (marble-20.12.3.tar.xz) = 52242116 bytes SHA1 (patch-src_lib_astro_astrolib.cpp) = 541b39516af740b0ff8e485e9e4e8a339ca5d7f4 SHA1 (patch-src_lib_astro_astrolib.h) = 4123af9f32a35400e05943598e7dceff84899928 SHA1 (patch-src_lib_astro_solarsystem.cpp) = 1e00e5edf7ac5b38a1d4d29ccf4847470b6f4906 +SHA1 (patch-src_plugins_positionprovider_gpsd_GpsdPositionProviderPlugin.cpp) = 7d6efd81d30ba8ffd6e993c3843ee743c02f3afc SHA1 (patch-src_plugins_render_stars_StarsPlugin.cpp) = 06fdce98d53db7a74e972dcc39459016646246d0 diff --git a/misc/marble/patches/patch-src_plugins_positionprovider_gpsd_GpsdPositionProviderPlugin.cpp b/misc/marble/patches/patch-src_plugins_positionprovider_gpsd_GpsdPositionProviderPlugin.cpp new file mode 100644 index 00000000000..41febec7464 --- /dev/null +++ b/misc/marble/patches/patch-src_plugins_positionprovider_gpsd_GpsdPositionProviderPlugin.cpp @@ -0,0 +1,19 @@ +$NetBSD: patch-src_plugins_positionprovider_gpsd_GpsdPositionProviderPlugin.cpp,v 1.3 2021/12/17 08:51:53 prlw1 Exp $ + +Fix build with gpsd 3.23.1 +STATUS_NO_FIX was renamed to STATUS_UNK. +https://invent.kde.org/education/marble/-/commit/8aadc3eb8f9484a65d497d442cd8c61fe1462bef + +--- src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp.orig 2021-02-27 00:23:23.000000000 +0000 ++++ src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp +@@ -79,7 +79,9 @@ void GpsdPositionProviderPlugin::update( + { + 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 ) ) |