<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/f7d7f4bbff6fbd0cab6ba30e4af276041f7ce251">https://github.com/macports/macports-ports/commit/f7d7f4bbff6fbd0cab6ba30e4af276041f7ce251</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 f7d7f4b  stellarium-devel: update to 20190728-3e41cebb
</span>f7d7f4b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f7d7f4bbff6fbd0cab6ba30e4af276041f7ce251
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Jul 29 14:26:31 2019 -0400

<span style='display:block; white-space:pre;color:#404040;'>    stellarium-devel: update to 20190728-3e41cebb
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fix GPSD API patch to include another recent change. Works for both release and devel of both gaps and stellarium.
</span>---
 science/stellarium/Portfile                      | 14 +++++-----
 science/stellarium/files/patch-fix-gps-epe.diff  | 14 ----------
 science/stellarium/files/patch-fix-gpsd-api.diff | 35 ++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 21 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/stellarium/Portfile b/science/stellarium/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd46375..4c4b8ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/stellarium/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/stellarium/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,11 +38,11 @@ if {${name} eq ${subport}} {
</span>         This port is kept up with the Stellarium GIT master branch, which is typically updated daily to weekly.
 
     conflicts    stellarium stellarium-qt4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup Stellarium stellarium 7600d03823a3680bbf99f72c7edc3bb3bf0660bb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version   20190719-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums rmd160 4bdbd0907610335f966a93945a33fb7c0e3d5f41 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              sha256 6e8067d9b253105808c488eac31e61dce53fb0bfa436d4fce8245373bd5aafe1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              size   315459631
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup Stellarium stellarium 3e41cebb47865e8c289220475c86f6306c275125
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version   20190728-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums rmd160 88c048f0b74f41a6398f8c18e70ffd7072fa9e18 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              sha256 8e0dc8352c5a90bda57b35df3d1d6bad43ecc6d86ee52edbd330cd4ca2bc2e61 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              size   316080658
</span>     revision  0
 
 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,8 +71,8 @@ depends_lib-append \
</span> # fix the install prefix for MP use only
 patchfiles patch-CMakeLists.txt.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary fix for the gpsd API change for "epe"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix-gps-epe.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# temporary fix for the gpsd API changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-gpsd-api.diff
</span> 
 # do VPATH (out of source tree) build
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/stellarium/files/patch-fix-gps-epe.diff b/science/stellarium/files/patch-fix-gps-epe.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 55cfdc0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/stellarium/files/patch-fix-gps-epe.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/core/StelLocationMgr.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/core/StelLocationMgr.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,7 +163,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           qDebug() << " - xdop:" << dop.xdop << "ydop:" << dop.ydop;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           qDebug() << " - pdop:" << dop.pdop << "hdop:" << dop.hdop;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           qDebug() << " - vdop:" << dop.vdop << "tdop:" << dop.tdop << "gdop:" << dop.gdop;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if GPSD_API_MAJOR_VERSION < 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           qDebug() << "Spherical Position Error (epe):" << newdata->epe;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                          qDebug() << "Spherical Position Error (epe):" << newdata->fix.sep;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   loc.longitude=newdata->fix.longitude;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   loc.latitude=newdata->fix.latitude;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/stellarium/files/patch-fix-gpsd-api.diff b/science/stellarium/files/patch-fix-gpsd-api.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..998722f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/stellarium/files/patch-fix-gpsd-api.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/core/StelLocationMgr.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/core/StelLocationMgr.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -158,12 +158,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           //qDebug() << "newdata->online=" << newdata->online;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           qDebug() << "Solution from " << newdata->satellites_used << "out of " << newdata->satellites_visible << " visible Satellites.";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           dop_t dop=newdata->dop;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if GPSD_API_MAJOR_VERSION < 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           qDebug() << "GPSD data: Long" << newdata->fix.longitude << "Lat" << newdata->fix.latitude << "Alt" << newdata->fix.altitude;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                          qDebug() << "GPSD data: Long" << newdata->fix.longitude << "Lat" << newdata->fix.latitude << "Alt" << newdata->fix.altHAE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           qDebug() << "Dilution of Precision:";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           qDebug() << " - xdop:" << dop.xdop << "ydop:" << dop.ydop;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           qDebug() << " - pdop:" << dop.pdop << "hdop:" << dop.hdop;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           qDebug() << " - vdop:" << dop.vdop << "tdop:" << dop.tdop << "gdop:" << dop.gdop;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if GPSD_API_MAJOR_VERSION < 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           qDebug() << "Spherical Position Error (epe):" << newdata->epe;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                          qDebug() << "Spherical Position Error (epe):" << newdata->fix.sep;
</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;'>+                   loc.longitude=newdata->fix.longitude;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   loc.latitude=newdata->fix.latitude;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,7 +183,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if GPSD_API_MAJOR_VERSION < 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           loc.altitude=newdata->fix.altitude;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                          loc.altitude=newdata->fix.altHAE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           if (verbose)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                   qDebug() << "GPSDfix " << fixmode << ": Location" << QString("lat %1, long %2, alt %3").arg(loc.latitude).arg(loc.longitude).arg(loc.altitude);
</span></pre><pre style='margin:0'>

</pre>