<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/9dd577a469e64a6c91e6f3199fd71af96738831c">https://github.com/macports/macports-ports/commit/9dd577a469e64a6c91e6f3199fd71af96738831c</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 9dd577a stellarium: update release to 0.20.0
</span>9dd577a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9dd577a469e64a6c91e6f3199fd71af96738831c
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Mar 30 15:17:35 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> stellarium: update release to 0.20.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Deprecate devel version.
</span>---
science/stellarium/Portfile | 132 ++++++++++-----------
science/stellarium/files/patch-CMakeLists.txt.diff | 2 +-
.../files/patch-fix-gpsd-api.release.diff | 38 ------
3 files changed, 62 insertions(+), 110 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 ef544e8..7ac1de9 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;'>@@ -1,9 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt5 1.0
</span>
name stellarium
categories science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,93 +13,86 @@ long_description ${description} \
</span> It shows a realistic sky in 3D, just like what you see with the naked eye, \
binoculars or a telescope. It is being used in planetarium projectors. Just \
set your coordinates and go.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport stellarium-devel {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://stellarium.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport stellarium-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # deprecate the devel port, if installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # can be removed after 20210401
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by stellarium
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20200211-3d0abddc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {${name} eq ${subport}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts stellarium-devel stellarium-qt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup Stellarium stellarium 0.19.3 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 085167d28f5480aae388d191ce99e15dd435ac4f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2857edf2b9d059e9671880d3a70e9ca8b3bcaa6015717cb0782bc899eaa79188 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 326568101
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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.release.diff
</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;'>- # devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${long_description}: \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This port is kept up with the Stellarium GIT master branch, which is typically updated daily to weekly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts stellarium-qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup Stellarium stellarium 0.20.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b19fa7537c2819fa8c951e053f04179b739e3cd3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1ac6fd92b29ff2a1349180d48eb15069874305e1304c4be012508f940533b810 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 342066901
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts stellarium stellarium-qt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup Stellarium stellarium 3d0abddcbacec3d62ae53621fee77d3d87434062
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20200211-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 2d984c63e68c32188f642dd423272e425e7de79b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3c4fc5901112b6ddad4ec719400a4236a157f6333460d97c74f06619f9bec218 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 340030028
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # builds as 64-bit only, according to its top-level CMakeLists.txt file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal_variant no
</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;'>-homepage https://stellarium.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# builds as 64-bit only, according to its top-level CMakeLists.txt file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtlocation qtmultimedia qtscript qtserialport qttools
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.depends_component qtlocation qtmultimedia qtscript qtserialport qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libgps.dylib:gpsd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libgps.dylib:gpsd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for libqcocoa.dylib (if not above)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# for libqcocoa.dylib (if not above)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fontconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:freetype
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix the install prefix for MP use only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-CMakeLists.txt.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix the install prefix for MP use only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do VPATH (out of source tree) build
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# do VPATH (out of source tree) build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.out_of_source yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# prevent opportunistic use of ccache
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![tbool configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCCACHE_PROGRAM=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # prevent opportunistic use of ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![tbool configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCCACHE_PROGRAM=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# special args for our needs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special args for our needs
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMP_APPLICATIONS_DIR=${applications_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMP_APPLICATIONS_DIR=${applications_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This post-destroot phase is similar to the 'make macosx_bundle' target,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# but it does not copy libraries into the bundle and does not require perl as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# another dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set appdir ${destroot}${applications_dir}/Stellarium.app/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This post-destroot phase is similar to the 'make macosx_bundle' target,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # but it does not copy libraries into the bundle and does not require perl as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # another dependency
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set appdir ${destroot}${applications_dir}/Stellarium.app/Contents
</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}/share ${appdir}/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # move App parts around internally
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${appdir}/share ${appdir}/Resources
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # copy other useful file(s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/util/qt.conf ${appdir}/Resources/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # copy other useful file(s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/util/qt.conf ${appdir}/Resources/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # copy the required qcocoa plugin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${appdir}/plugins/platforms
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${qt_plugins_dir}/platforms/libqcocoa.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${appdir}/plugins/platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # copy the required qcocoa plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${appdir}/plugins/platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${qt_plugins_dir}/platforms/libqcocoa.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${appdir}/plugins/platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<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 4a92b7b..7c91353 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,6 +1,6 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -594,7 +594,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -595,7 +595,7 @@
</span> ########### Set some global variables ###########
IF(UNIX AND NOT WIN32)
IF(APPLE)
<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>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.release.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>