<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2010f9c27954c54a8ce064b11a6f2fa8d9e3c7fe">https://github.com/macports/macports-ports/commit/2010f9c27954c54a8ce064b11a6f2fa8d9e3c7fe</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2010f9c2795 marble: fix build with new version of gpsd (fix https://trac.macports.org/ticket/62110), patches taken in marble kde repo (7039b70f and 51e0d912)
</span>2010f9c2795 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2010f9c27954c54a8ce064b11a6f2fa8d9e3c7fe
</span>Author: Nicolas Pavillon <pavillon.nicolas@gmail.com>
AuthorDate: Sun Jan 31 00:35:07 2021 +0900
<span style='display:block; white-space:pre;color:#404040;'> marble: fix build with new version of gpsd (fix https://trac.macports.org/ticket/62110), patches taken in marble kde repo (7039b70f and 51e0d912)
</span>---
kde/marble/Portfile | 3 ++-
kde/marble/files/patch-gpsd.diff | 33 +++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/marble/Portfile b/kde/marble/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f6991b2b68..34000ac404f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/marble/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/marble/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,8 @@ depends_lib-append port:libkdeedu \
</span> port:gpsd
patchfiles-append patch-GpsdSymbols.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-interfaces.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-interfaces.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gpsd.diff
</span>
if {![variant_isset docs]} {
patchfiles-append patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/marble/files/patch-gpsd.diff b/kde/marble/files/patch-gpsd.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bb838bed3c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/marble/files/patch-gpsd.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp.orig 2021-01-30 23:58:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp 2021-01-31 00:20:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PositionProviderStatus oldStatus = m_status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GeoDataCoordinates oldPosition = m_position;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 10 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( data.fix.status == STATUS_NO_FIX || isnan( data.fix.longitude ) || isnan( data.fix.latitude ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( data.status == STATUS_NO_FIX || isnan( data.fix.longitude ) || isnan( data.fix.latitude ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_status = PositionProviderStatusUnavailable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_status = PositionProviderStatusAvailable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,10 +115,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_track = data.fix.track;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 9 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( !isnan( data.fix.time.tv_sec ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( !isnan( data.fix.time ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 9 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_timestamp = QDateTime::fromMSecsSinceEpoch( data.fix.time.tv_sec * 1000 + data.fix.time.tv_nsec / 1000000 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_timestamp = QDateTime::fromMSecsSinceEpoch( data.fix.time * 1000 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m_status != oldStatus)
</span></pre><pre style='margin:0'>
</pre>