<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cb42dbd18969c7ff5fdaa0bb30e02b47a3048824">https://github.com/macports/macports-ports/commit/cb42dbd18969c7ff5fdaa0bb30e02b47a3048824</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 cb42dbd uhd: tweak gpsd patch to work more robustly
</span>cb42dbd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cb42dbd18969c7ff5fdaa0bb30e02b47a3048824
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sat Jun 29 11:40:54 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> uhd: tweak gpsd patch to work more robustly
</span>---
science/uhd/files/patch-fix-gpsd_read-api.diff | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-fix-gpsd_read-api.diff b/science/uhd/files/patch-fix-gpsd_read-api.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 39c85c3..088810a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/files/patch-fix-gpsd_read-api.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/files/patch-fix-gpsd_read-api.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/host/lib/usrp/gpsd_iface.cpp b/host/lib/usrp/gpsd_iface.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b34132f..b439a80 100644
</span> --- a/host/lib/usrp/gpsd_iface.cpp
+++ b/host/lib/usrp/gpsd_iface.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,7 +119,7 @@ private: // member functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,7 +119,11 @@
</span> _timeout_cnt = 0;
_detected = true;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (gps_read(&_gps_data) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if GPSD_API_MAJOR_VERSION < 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (gps_read(&_gps_data) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span> + if (gps_read(&_gps_data, NULL, 0) < 0)
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span> throw std::runtime_error("error while reading");
}
}
</pre><pre style='margin:0'>
</pre>