<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/797d9247e784cab0f887467259093afd3c3a1805">https://github.com/macports/macports-ports/commit/797d9247e784cab0f887467259093afd3c3a1805</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 797d924 stellarium-devel: update to 20200112-0edf7f48
</span>797d924 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 797d9247e784cab0f887467259093afd3c3a1805
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sun Jan 12 16:26:11 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> stellarium-devel: update to 20200112-0edf7f48
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove integrated patch.
</span>---
science/stellarium/Portfile | 13 +++-----
.../stellarium/files/patch-fix-gpsd-api.devel.diff | 38 ----------------------
2 files changed, 5 insertions(+), 46 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 3faefdb..fe2f8de 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;'>@@ -41,16 +41,13 @@ 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 ed6633dd0168fe7fb8b446aa702cf543a432e459
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20200108-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d1e0c065c8f9f6018f94a1b82e2f097fd7c829cd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b65704b8e3207f91b0d4b39ae5b9e6d8575c9501ff869fd680e8bcad8920979b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 326831499
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup Stellarium stellarium 0edf7f48523c9b7750195f311c37ba78e8355181
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20200112-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c75036e1962f90b94e6dec5fd9beb454b0fd7abd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5ff4759077e7d754385af84335e2c1a87349b9f95a8db59980994622f3ce163b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 339975117
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary fix for the gpsd API changes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-fix-gpsd-api.devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
homepage https://stellarium.org/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/stellarium/files/patch-fix-gpsd-api.devel.diff b/science/stellarium/files/patch-fix-gpsd-api.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 82eaee8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/stellarium/files/patch-fix-gpsd-api.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +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;'>-@@ -131,7 +131,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // emit queryError("GPSD query: No Fix.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if GPSD_API_MAJOR_VERSION < 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (newdata->online==0.0) // no device?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (newdata->online.tv_sec == 0 && newdata->online.tv_nsec == 0) // no device?
</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;'>- // This can happen when unplugging the GPS while running Stellarium,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // or running gpsd with no GPS receiver.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -158,7 +162,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //qDebug() << "newdata->online=" << newdata->online;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qDebug() << "Solution from " << newdata->satellites_used << "out of " << newdata->satellites_visible << " visible Satellites.";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dop_t dop=newdata->dop;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if GPSD_API_MAJOR_VERSION < 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qDebug() << "GPSD data: Long" << newdata->fix.longitude << "Lat" << newdata->fix.latitude << "Alt" << newdata->fix.altitude;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qDebug() << "GPSD data: Long" << newdata->fix.longitude << "Lat" << newdata->fix.latitude << "Alt" << newdata->fix.altHAE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qDebug() << "Dilution of Precision:";
</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;'>-@@ -183,7 +191,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if GPSD_API_MAJOR_VERSION < 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- loc.altitude=static_cast<int>(newdata->fix.altitude);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ loc.altitude=static_cast<int>(newdata->fix.altHAE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (verbose)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>