<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7d660485bc7cc9a4ba99fda055c0543c6524308d">https://github.com/macports/macports-ports/commit/7d660485bc7cc9a4ba99fda055c0543c6524308d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7d660485bc7cc9a4ba99fda055c0543c6524308d
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sat Nov 5 21:04:59 2016 -0400
<span style='display:block; white-space:pre;color:#404040;'> stellarium: update to 0.15.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/49425
</span>---
science/stellarium/Portfile | 80 ++++++++++------------
science/stellarium/files/patch-CMakeLists.txt.diff | 11 +++
science/stellarium/files/patch-libc++.diff | 23 -------
3 files changed, 46 insertions(+), 68 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 8f1373f..9761247 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,18 +1,16 @@
</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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# $Id: Portfile 140998 2015-10-07 17:40:23Z michaelld@macports.org $
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 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 qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 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>
name stellarium
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.12.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.15.0
</span> categories science
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers raimue \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- michaelld
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers raimue michaelld
</span>
description Stellarium is a free open source planetarium for your computer.
long_description \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,43 +21,33 @@ long_description \
</span> homepage http://stellarium.org/
master_sites sourceforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e925e75f0fbaa65f9f2ce04d200b50f73c01c5a5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 15fbc0f12f25e4dbf7eb360c422987ca312201e3b41e6eadba028f1af9174559
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ec804ba6d66c385bfaba123c1e616630daa05c86 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 74d0e3a69fcbaf1c6278f601a44497fd3e9f2de7dfa11a60197d3afb68288746
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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>
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:phonon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-libc++.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:SET(CMAKE_INSTALL_PREFIX \"\$\{PROJECT_BINARY_DIR\}/:SET(CMAKE_INSTALL_PREFIX \"${applications_dir}/:" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Determine which archs to build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set archs ${configure.universal_archs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set archs ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:SET(CMAKE_OSX_ARCHITECTURES \".*\"):SET(CMAKE_OSX_ARCHITECTURES \"${archs}\"):" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</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:#e0ffe0;'>+ port:qt5-qtscript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5-qtserialport \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5-qtmultimedia \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5-qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>-configure.cmd cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# specify MacPorts' dependencies to cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args -DFreeType2_INCLUDE_DIR:PATH=${prefix}/include/freetype2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DFreeType2_LIBRARIES:FILEPATH=${prefix}/lib/libfreetype.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DZLIB_INCLUDE_DIR:PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DZLIB_LIBRARY:FILEPATH=${prefix}/lib/libz.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DICONV_INCLUDE_DIR:PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DICONV_LIBRARIES:FILEPATH=${prefix}/lib/libiconv.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOPENSSL_CRYPTO_LIBRARIES:FILEPATH=${prefix}/lib/libcrypto.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOPENSSL_INCLUDE_DIR:PATH=${prefix}/include/openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOPENSSL_SSL_LIBRARIES:FILEPATH=${prefix}/lib/libssl.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${qt_cmake_defines}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# special args for our needs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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>
# This post-destroot phase is similar to the 'make macosx_bundle' target,
# but it does not copy libraries into the bundle and does not require perl as
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,10 +67,12 @@ post-destroot {
</span>
# copy other useful file(s)
copy ${worksrcpath}/util/qt.conf ${appdir}/Resources/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Supports universal builds through cmake, archs are set in post-patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</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>
livecheck.url http://sourceforge.net/projects/stellarium/files/
livecheck.regex "Stellarium-sources/.*/stellarium-(.*)[quotemeta ${extract.suffix}]"
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..91eef61
</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-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -323,7 +323,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########### Set some global variables ###########
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(UNIX AND NOT WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/Stellarium.app/Contents")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(CMAKE_INSTALL_PREFIX "${MP_APPLICATIONS_DIR}/Stellarium.app/Contents")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share/stellarium")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS(-DINSTALL_LOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/stellarium/files/patch-libc++.diff b/science/stellarium/files/patch-libc++.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8fc31d6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/stellarium/files/patch-libc++.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: https://bazaar.launchpad.net/~stellarium/stellarium/0.12/revision/5799
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Notes: locally modified, replaced another instance of std::free()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-=== modified file 'src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp 2013-04-28 18:28:11 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp 2013-10-20 09:51:35 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,15 +42,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Align to VERTEX_ALIGN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vertexStride = (vertexBytes + VERTEX_ALIGN - 1) & ~(VERTEX_ALIGN - 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vertices = static_cast<char*>(::malloc(vertexCapacity * vertexStride));
</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;'>- StelQGLInterleavedArrayVertexBufferBackend::~StelQGLInterleavedArrayVertexBufferBackend()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::free(vertices);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ::free(vertices);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NULL != projectedPositions)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ::free(projectedPositions);
</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></pre><pre style='margin:0'>
</pre>