<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/9acb861f1cd38abde594b0dd13cad68cf6262e07">https://github.com/macports/macports-ports/commit/9acb861f1cd38abde594b0dd13cad68cf6262e07</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 9acb861 stellarium: update release to 0.19.2 and devel to 20190929-27d93e25
</span>9acb861 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9acb861f1cd38abde594b0dd13cad68cf6262e07
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sun Sep 29 17:15:08 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> stellarium: update release to 0.19.2 and devel to 20190929-27d93e25
</span>---
science/stellarium/Portfile | 33 ++++++----------------
science/stellarium/files/patch-CMakeLists.txt.diff | 6 ++--
.../files/patch-fix-gpsd-api.release.diff | 17 +++--------
3 files changed, 16 insertions(+), 40 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 589e02f..f547109 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;'>@@ -24,10 +24,10 @@ if {${name} eq ${subport}} {
</span> # release
conflicts stellarium-devel stellarium-qt4
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup Stellarium stellarium 0.19.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8ed78a544b9236f97d4322874860eedd5b11d436 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9ebdca45967d6bbfab8bebea3f91e243cbc89721471a18e4ad54dcf1997a2db0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 314661853
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup Stellarium stellarium 0.19.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 bfc9fbe67b8f6f574175f29154b0224794bea6fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 06668190d4df5dad351a92ac3466dc3723946bb9bcbc5f908a30d1022bbc1570 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 318695000
</span> revision 0
# temporary fix for the gpsd API changes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,11 +41,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 c4e85006c75cb3f551a816d8e3c622044dc5cb6d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190916-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 23a96c5c40b840f7ec9cfeb302d657ac5cd2f513 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e5e7eb7245d192387db80b7e8043fc02539dcd8afe9afa56a17e6f2ae2253e8f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 318039277
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup Stellarium stellarium 27d93e25a63db6109730d6b0aade839436bb0891
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190929-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 a51316e3dc2eb74238ff0c5ecec2ff65db06f97e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 500ef06fcc7e07b3fdee4de1e07941e3e7f2e0ce6ddc241263e17b469d67906b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 318692831
</span> revision 0
# temporary fix for the gpsd API changes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,21 +101,6 @@ post-destroot {
</span> # move App parts around internally
move ${appdir}/share ${appdir}/Resources
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # devel does not require this as of 20190719
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "stellarium"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # move App parts around internally
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${appdir}/bin ${appdir}/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move {*}[glob ${appdir}/Resources/stellarium/*] ${appdir}/Resources/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${appdir}/Resources/stellarium
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # copy .app-specific files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/data/Info.plist ${appdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/data/PkgInfo ${appdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/data/Icon.icns ${appdir}/Resources/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # copy other useful file(s)
copy ${worksrcpath}/util/qt.conf ${appdir}/Resources/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/stellarium/files/patch-CMakeLists.txt.diff b/science/stellarium/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 80cbade..2cc51c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/stellarium/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/stellarium/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -527,7 +527,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -543,7 +543,7 @@
</span> ########### Set some global variables ###########
IF(UNIX AND NOT WIN32)
IF(APPLE)
- SET(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/Stellarium.app/Contents")
+ SET(CMAKE_INSTALL_PREFIX "${MP_APPLICATIONS_DIR}/Stellarium.app/Contents")
ELSE()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share/${PACKAGE}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_DEFINITIONS(-DINSTALL_LOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/${SDATALOC}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Used in generating the documentation (doc/stellarium.pod.cmake):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/stellarium/files/patch-fix-gpsd-api.release.diff b/science/stellarium/files/patch-fix-gpsd-api.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 998722f..9ca8462 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/stellarium/files/patch-fix-gpsd-api.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/stellarium/files/patch-fix-gpsd-api.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/core/StelLocationMgr.cpp.orig
+++ src/core/StelLocationMgr.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -158,12 +158,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -158,7 +158,11 @@
</span> //qDebug() << "newdata->online=" << newdata->online;
qDebug() << "Solution from " << newdata->satellites_used << "out of " << newdata->satellites_visible << " visible Satellites.";
dop_t dop=newdata->dop;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,23 +12,14 @@
</span> qDebug() << "Dilution of Precision:";
qDebug() << " - xdop:" << dop.xdop << "ydop:" << dop.ydop;
qDebug() << " - pdop:" << dop.pdop << "hdop:" << dop.hdop;
<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;background:#ffe0e0;'>-@@ -175,7 +183,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,7 +187,11 @@
</span> }
else
{
+#if GPSD_API_MAJOR_VERSION < 9
<span style='display:block; white-space:pre;background:#ffe0e0;'>- loc.altitude=newdata->fix.altitude;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ loc.altitude=static_cast<int>(newdata->fix.altitude);
</span> +#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ loc.altitude=newdata->fix.altHAE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ loc.altitude=static_cast<int>(newdata->fix.altHAE);
</span> +#endif
if (verbose)
{
</pre><pre style='margin:0'>
</pre>