[132008] trunk/dports/science/stellarium
raimue at macports.org
raimue at macports.org
Fri Jan 23 01:04:17 PST 2015
Revision: 132008
https://trac.macports.org/changeset/132008
Author: raimue at macports.org
Date: 2015-01-23 01:04:17 -0800 (Fri, 23 Jan 2015)
Log Message:
-----------
science/stellarium:
Update to version 0.12.5
Modified Paths:
--------------
trunk/dports/science/stellarium/Portfile
trunk/dports/science/stellarium/files/patch-libc++.diff
Modified: trunk/dports/science/stellarium/Portfile
===================================================================
--- trunk/dports/science/stellarium/Portfile 2015-01-23 08:54:27 UTC (rev 132007)
+++ trunk/dports/science/stellarium/Portfile 2015-01-23 09:04:17 UTC (rev 132008)
@@ -5,7 +5,7 @@
PortGroup qt4 1.0
name stellarium
-version 0.12.4
+version 0.12.5
categories science
platforms darwin
license GPL-2+
@@ -21,8 +21,8 @@
homepage http://stellarium.org/
master_sites sourceforge
-checksums rmd160 4e212f8e0d613733ef98a506556c25dbab4d3b24 \
- sha256 0fae1b6e2231ccfaba8fd00abf816a88bd89b5dc61387ac84edf479b363c6684
+checksums rmd160 e925e75f0fbaa65f9f2ce04d200b50f73c01c5a5 \
+ sha256 15fbc0f12f25e4dbf7eb360c422987ca312201e3b41e6eadba028f1af9174559
depends_build-append port:cmake
depends_lib-append \
Modified: trunk/dports/science/stellarium/files/patch-libc++.diff
===================================================================
--- trunk/dports/science/stellarium/files/patch-libc++.diff 2015-01-23 08:54:27 UTC (rev 132007)
+++ trunk/dports/science/stellarium/files/patch-libc++.diff 2015-01-23 09:04:17 UTC (rev 132008)
@@ -1,85 +1,6 @@
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
@@ -87,8 +8,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));
+ vertices = static_cast<char*>(::malloc(vertexCapacity * vertexStride));
}
StelQGLInterleavedArrayVertexBufferBackend::~StelQGLInterleavedArrayVertexBufferBackend()
@@ -97,33 +17,7 @@
+ ::free(vertices);
if(NULL != projectedPositions)
{
-- std::free(projectedPositions);
-+ ::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: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150123/c11c9744/attachment.html>
More information about the macports-changes
mailing list