[112849] trunk/dports/science/stellarium
raimue at macports.org
raimue at macports.org
Sat Nov 2 12:07:13 PDT 2013
Revision: 112849
https://trac.macports.org/changeset/112849
Author: raimue at macports.org
Date: 2013-11-02 12:07:13 -0700 (Sat, 02 Nov 2013)
Log Message:
-----------
science/stellarium:
Update to version 0.12.4 and fix build on OS X 10.9 Mavericks with a patch
Modified Paths:
--------------
trunk/dports/science/stellarium/Portfile
Added Paths:
-----------
trunk/dports/science/stellarium/files/
trunk/dports/science/stellarium/files/patch-libc++.diff
Modified: trunk/dports/science/stellarium/Portfile
===================================================================
--- trunk/dports/science/stellarium/Portfile 2013-11-02 19:04:57 UTC (rev 112848)
+++ trunk/dports/science/stellarium/Portfile 2013-11-02 19:07:13 UTC (rev 112849)
@@ -5,7 +5,7 @@
PortGroup qt4 1.0
name stellarium
-version 0.12.2
+version 0.12.4
categories science
platforms darwin
license GPL-2+
@@ -21,10 +21,8 @@
homepage http://stellarium.org/
master_sites sourceforge
-checksums sha1 35752a24bdeb461b9c16e8533b13689b05a87105 \
- md5 63572e71e15ffad4001d6c93bbc34180 \
- rmd160 6c8b622c026fba234d4b834faa896fbd82486c48 \
- sha256 fb9ffec01c58832fc788dac9839a7497d3be700e44b21a17ba02d790a3aadceb
+checksums rmd160 4e212f8e0d613733ef98a506556c25dbab4d3b24 \
+ sha256 0fae1b6e2231ccfaba8fd00abf816a88bd89b5dc61387ac84edf479b363c6684
depends_build-append port:cmake
depends_lib-append \
@@ -33,6 +31,8 @@
port:openssl \
port:phonon
+patchfiles patch-libc++.diff
+
post-patch {
reinplace "s:SET(CMAKE_INSTALL_PREFIX \"\$\{PROJECT_BINARY_DIR\}/:SET(CMAKE_INSTALL_PREFIX \"${applications_dir}/:" ${worksrcpath}/CMakeLists.txt
Added: trunk/dports/science/stellarium/files/patch-libc++.diff
===================================================================
--- trunk/dports/science/stellarium/files/patch-libc++.diff (rev 0)
+++ trunk/dports/science/stellarium/files/patch-libc++.diff 2013-11-02 19:07:13 UTC (rev 112849)
@@ -0,0 +1,129 @@
+Upstream: https://bazaar.launchpad.net/~stellarium/stellarium/0.12/revision/5799
+Notes: locally modified, replaced another instance of std::free()
+
+=== modified file 'src/StelMainGraphicsView.cpp'
+--- src/StelMainGraphicsView.cpp 2013-08-23 17:31:17 +0000
++++ src/StelMainGraphicsView.cpp 2013-10-20 15:33:37 +0000
+@@ -43,6 +43,8 @@
+ #include <QTimer>
+ #include <QDir>
+
++#include <locale>
++
+ #ifndef DISABLE_SCRIPTING
+ #include "StelScriptMgr.hpp"
+ #include "StelMainScriptAPIProxy.hpp"
+
+=== modified file 'src/core/StelUtils.cpp'
+--- src/core/StelUtils.cpp 2013-07-06 09:58:02 +0000
++++ src/core/StelUtils.cpp 2013-10-20 09:51:35 +0000
+@@ -1065,8 +1065,8 @@
+ QString hoursToHmsStr(const double hours)
+ {
+ int h = (int)hours;
+- int m = (int)((std::abs(hours)-std::abs(h))*60);
+- float s = (((std::abs(hours)-std::abs(h))*60)-m)*60;
++ int m = (int)((std::abs(hours)-std::abs(double(h)))*60);
++ float s = (((std::abs(hours)-std::abs(double(h)))*60)-m)*60;
+
+ return QString("%1h%2m%3s").arg(h).arg(m).arg(QString::number(s, 'f', 1));
+ }
+
+=== modified file 'src/core/renderer/StelQGLArrayVertexBufferBackend.cpp'
+--- src/core/renderer/StelQGLArrayVertexBufferBackend.cpp 2012-09-03 23:49:10 +0000
++++ src/core/renderer/StelQGLArrayVertexBufferBackend.cpp 2013-10-20 09:51:35 +0000
+@@ -42,7 +42,7 @@
+ const StelVertexAttribute& attribute(this->attributes.attributes[attrib]);
+
+ attributeBuffers[attribute.interpretation] =
+- std::malloc(vertexCapacity * attributeSize(attribute.type));
++ ::malloc(vertexCapacity * attributeSize(attribute.type));
+ }
+ }
+
+@@ -50,11 +50,11 @@
+ {
+ for(int buffer = 0; buffer < AttributeInterpretation_MAX; ++buffer)
+ {
+- if(NULL != attributeBuffers[buffer]){std::free(attributeBuffers[buffer]);}
++ if(NULL != attributeBuffers[buffer]){::free(attributeBuffers[buffer]);}
+ }
+ if(NULL != projectedPositions)
+ {
+- std::free(projectedPositions);
++ ::free(projectedPositions);
+ }
+ }
+
+@@ -71,7 +71,7 @@
+ {
+ const StelVertexAttribute& attribute(attributes.attributes[attrib]);
+ attributeBuffers[attribute.interpretation] =
+- std::realloc(attributeBuffers[attribute.interpretation],
++ ::realloc(attributeBuffers[attribute.interpretation],
+ vertexCapacity * attributeSize(attribute.type));
+ }
+ }
+@@ -167,12 +167,12 @@
+ if(Q_UNLIKELY(NULL == projectedPositions))
+ {
+ projectedPositions =
+- static_cast<Vec3f*>(std::malloc(minProjectedSize * sizeof(Vec3f)));
++ static_cast<Vec3f*>(::malloc(minProjectedSize * sizeof(Vec3f)));
+ }
+ else if(projectedPositionsCapacity < minProjectedSize)
+ {
+ projectedPositions =
+- static_cast<Vec3f*>(std::realloc(projectedPositions, minProjectedSize * sizeof(Vec3f)));
++ static_cast<Vec3f*>(::realloc(projectedPositions, minProjectedSize * sizeof(Vec3f)));
+ projectedPositionsCapacity = minProjectedSize;
+ }
+
+
+=== modified file 'src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp'
+--- src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp 2013-04-28 18:28:11 +0000
++++ src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp 2013-10-20 09:51:35 +0000
+@@ -42,7 +42,7 @@
+ }
+ // Align to VERTEX_ALIGN
+ vertexStride = (vertexBytes + VERTEX_ALIGN - 1) & ~(VERTEX_ALIGN - 1);
+- vertices = static_cast<char*>(std::malloc(vertexCapacity * vertexStride));
++ vertices = static_cast<char*>(::malloc(vertexCapacity * vertexStride));
+ }
+
+ StelQGLInterleavedArrayVertexBufferBackend::~StelQGLInterleavedArrayVertexBufferBackend()
+@@ -50,7 +50,7 @@
+- std::free(vertices);
++ ::free(vertices);
+ if(NULL != projectedPositions)
+ {
+- std::free(projectedPositions);
++ ::free(projectedPositions);
+ }
+ }
+
+@@ -63,7 +63,7 @@
+ if(Q_UNLIKELY(vertexCount == vertexCapacity))
+ {
+ vertexCapacity *= 2;
+- vertices = static_cast<char*>(std::realloc(vertices, vertexCapacity * vertexStride));
++ vertices = static_cast<char*>(::realloc(vertices, vertexCapacity * vertexStride));
+ }
+
+ std::memcpy(vertices + vertexCount * vertexStride, vertexInPtr, vertexBytes);
+@@ -122,12 +122,12 @@
+ if(Q_UNLIKELY(NULL == projectedPositions))
+ {
+ projectedPositions =
+- static_cast<Vec3f*>(std::malloc(minProjectedSize * sizeof(Vec3f)));
++ static_cast<Vec3f*>(::malloc(minProjectedSize * sizeof(Vec3f)));
+ }
+ else if(projectedPositionsCapacity < minProjectedSize)
+ {
+ projectedPositions =
+- static_cast<Vec3f*>(std::realloc(projectedPositions, minProjectedSize * sizeof(Vec3f)));
++ static_cast<Vec3f*>(::realloc(projectedPositions, minProjectedSize * sizeof(Vec3f)));
+ projectedPositionsCapacity = minProjectedSize;
+ }
+
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131102/6e400e61/attachment.html>
More information about the macports-changes
mailing list