<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[132008] trunk/dports/science/stellarium</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/132008">132008</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2015-01-23 01:04:17 -0800 (Fri, 23 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>science/stellarium:
Update to version 0.12.5</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencestellariumPortfile">trunk/dports/science/stellarium/Portfile</a></li>
<li><a href="#trunkdportssciencestellariumfilespatchlibcdiff">trunk/dports/science/stellarium/files/patch-libc++.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencestellariumPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/stellarium/Portfile (132007 => 132008)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx">
</span><span class="cx"> name stellarium
</span><del>-version 0.12.4
</del><ins>+version 0.12.5
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><span class="cx"> license GPL-2+
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx"> homepage http://stellarium.org/
</span><span class="cx">
</span><span class="cx"> master_sites sourceforge
</span><del>-checksums rmd160 4e212f8e0d613733ef98a506556c25dbab4d3b24 \
- sha256 0fae1b6e2231ccfaba8fd00abf816a88bd89b5dc61387ac84edf479b363c6684
</del><ins>+checksums rmd160 e925e75f0fbaa65f9f2ce04d200b50f73c01c5a5 \
+ sha256 15fbc0f12f25e4dbf7eb360c422987ca312201e3b41e6eadba028f1af9174559
</ins><span class="cx">
</span><span class="cx"> depends_build-append port:cmake
</span><span class="cx"> depends_lib-append \
</span></span></pre></div>
<a id="trunkdportssciencestellariumfilespatchlibcdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/stellarium/files/patch-libc++.diff (132007 => 132008)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,85 +1,6 @@
</span><span class="cx"> Upstream: https://bazaar.launchpad.net/~stellarium/stellarium/0.12/revision/5799
</span><span class="cx"> Notes: locally modified, replaced another instance of std::free()
</span><span class="cx">
</span><del>-=== 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;
- }
-
-
</del><span class="cx"> === modified file 'src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp'
</span><span class="cx"> --- src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp 2013-04-28 18:28:11 +0000
</span><span class="cx"> +++ src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp 2013-10-20 09:51:35 +0000
</span><span class="lines">@@ -87,8 +8,7 @@
</span><span class="cx"> }
</span><span class="cx"> // Align to VERTEX_ALIGN
</span><span class="cx"> vertexStride = (vertexBytes + VERTEX_ALIGN - 1) & ~(VERTEX_ALIGN - 1);
</span><del>-- vertices = static_cast<char*>(std::malloc(vertexCapacity * vertexStride));
-+ vertices = static_cast<char*>(::malloc(vertexCapacity * vertexStride));
</del><ins>+ vertices = static_cast<char*>(::malloc(vertexCapacity * vertexStride));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StelQGLInterleavedArrayVertexBufferBackend::~StelQGLInterleavedArrayVertexBufferBackend()
</span><span class="lines">@@ -97,33 +17,7 @@
</span><span class="cx"> + ::free(vertices);
</span><span class="cx"> if(NULL != projectedPositions)
</span><span class="cx"> {
</span><del>-- std::free(projectedPositions);
-+ ::free(projectedPositions);
</del><ins>+ ::free(projectedPositions);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@@ -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;
- }
-
-
</del></span></pre>
</div>
</div>
</body>
</html>