CVS commit: pkgsrc/misc/marble

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Sep 23 22:18:28 UTC 2020

Modified Files:
        pkgsrc/misc/marble: Makefile distinfo
Added Files:
        pkgsrc/misc/marble/patches:
            patch-src_plugins_positionprovider_gpsd_GpsdPositionProviderPlugin.cpp

Log Message:
marble: fix build with gpsd >=3.21


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/misc/marble/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/misc/marble/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/marble/patches/patch-src_plugins_positionprovider_gpsd_GpsdPositionProviderPlugin.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/marble/Makefile
diff -u pkgsrc/misc/marble/Makefile:1.57 pkgsrc/misc/marble/Makefile:1.58
--- pkgsrc/misc/marble/Makefile:1.57    Mon Aug 31 18:10:21 2020
+++ pkgsrc/misc/marble/Makefile Wed Sep 23 22:18:28 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2020/08/31 18:10:21 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2020/09/23 22:18:28 markd Exp $
 
 DISTNAME=      marble-${KAPPSVER}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    misc
 
 HOMEPAGE=      https://kde.org/applications/system/marble/

Index: pkgsrc/misc/marble/distinfo
diff -u pkgsrc/misc/marble/distinfo:1.14 pkgsrc/misc/marble/distinfo:1.15
--- pkgsrc/misc/marble/distinfo:1.14    Tue Jun  9 11:56:16 2020
+++ pkgsrc/misc/marble/distinfo Wed Sep 23 22:18:28 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2020/06/09 11:56:16 markd Exp $
+$NetBSD: distinfo,v 1.15 2020/09/23 22:18:28 markd Exp $
 
 SHA1 (marble-20.04.1.tar.xz) = 1501384faed46a7cec18e32991b6be3f5e7e3812
 RMD160 (marble-20.04.1.tar.xz) = 0a2a9b953edda0c97e32804b933b6c6dd2c87412
@@ -7,4 +7,5 @@ Size (marble-20.04.1.tar.xz) = 52197400 
 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) = 2ee8a2904e4a798400e47e605ab9cf1c61461df7
 SHA1 (patch-src_plugins_render_stars_StarsPlugin.cpp) = 06fdce98d53db7a74e972dcc39459016646246d0

Added files:

Index: pkgsrc/misc/marble/patches/patch-src_plugins_positionprovider_gpsd_GpsdPositionProviderPlugin.cpp
diff -u /dev/null pkgsrc/misc/marble/patches/patch-src_plugins_positionprovider_gpsd_GpsdPositionProviderPlugin.cpp:1.1
--- /dev/null   Wed Sep 23 22:18:28 2020
+++ pkgsrc/misc/marble/patches/patch-src_plugins_positionprovider_gpsd_GpsdPositionProviderPlugin.cpp   Wed Sep 23 22:18:28 2020
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_plugins_positionprovider_gpsd_GpsdPositionProviderPlugin.cpp,v 1.1 2020/09/23 22:18:28 markd Exp $
+
+Handle gpsd>=3.21
+
+--- src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp.orig      2020-05-11 07:18:57.000000000 +0000
++++ src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+@@ -79,7 +79,11 @@ void GpsdPositionProviderPlugin::update(
+ {
+     PositionProviderStatus oldStatus = m_status;
+     GeoDataCoordinates oldPosition = m_position;
++#if 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 ) )
++#endif
+         m_status = PositionProviderStatusAcquiring;
+     else {
+         m_status = PositionProviderStatusAvailable;