Ignore:
Timestamp:
Jan 23, 2015, 9:04:17 AM (5 years ago)
Author:
raimue@…
Message:

science/stellarium:
Update to version 0.12.5, closes #46632

Location:
trunk/dports/science/stellarium
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/science/stellarium/Portfile

    r112849 r132008  
    66
    77name            stellarium
    8 version         0.12.4
     8version         0.12.5
    99categories      science
    1010platforms       darwin
     
    2222
    2323master_sites    sourceforge
    24 checksums       rmd160  4e212f8e0d613733ef98a506556c25dbab4d3b24 \
    25                 sha256  0fae1b6e2231ccfaba8fd00abf816a88bd89b5dc61387ac84edf479b363c6684
     24checksums       rmd160  e925e75f0fbaa65f9f2ce04d200b50f73c01c5a5 \
     25                sha256  15fbc0f12f25e4dbf7eb360c422987ca312201e3b41e6eadba028f1af9174559
    2626
    2727depends_build-append port:cmake
  • trunk/dports/science/stellarium/files/patch-libc++.diff

    r112931 r132008  
    11Upstream: https://bazaar.launchpad.net/~stellarium/stellarium/0.12/revision/5799
    22Notes: locally modified, replaced another instance of std::free()
    3 
    4 === modified file 'src/StelMainGraphicsView.cpp'
    5 --- src/StelMainGraphicsView.cpp        2013-08-23 17:31:17 +0000
    6 +++ src/StelMainGraphicsView.cpp        2013-10-20 15:33:37 +0000
    7 @@ -43,6 +43,8 @@
    8  #include <QTimer>
    9  #include <QDir>
    10  
    11 +#include <locale>
    12 +
    13  #ifndef DISABLE_SCRIPTING
    14   #include "StelScriptMgr.hpp"
    15   #include "StelMainScriptAPIProxy.hpp"
    16 
    17 === modified file 'src/core/StelUtils.cpp'
    18 --- src/core/StelUtils.cpp      2013-07-06 09:58:02 +0000
    19 +++ src/core/StelUtils.cpp      2013-10-20 09:51:35 +0000
    20 @@ -1065,8 +1065,8 @@
    21  QString hoursToHmsStr(const double hours)
    22  {
    23         int h = (int)hours;
    24 -       int m = (int)((std::abs(hours)-std::abs(h))*60);
    25 -       float s = (((std::abs(hours)-std::abs(h))*60)-m)*60;
    26 +       int m = (int)((std::abs(hours)-std::abs(double(h)))*60);
    27 +       float s = (((std::abs(hours)-std::abs(double(h)))*60)-m)*60;
    28  
    29         return QString("%1h%2m%3s").arg(h).arg(m).arg(QString::number(s, 'f', 1));
    30  }
    31 
    32 === modified file 'src/core/renderer/StelQGLArrayVertexBufferBackend.cpp'
    33 --- src/core/renderer/StelQGLArrayVertexBufferBackend.cpp       2012-09-03 23:49:10 +0000
    34 +++ src/core/renderer/StelQGLArrayVertexBufferBackend.cpp       2013-10-20 09:51:35 +0000
    35 @@ -42,7 +42,7 @@
    36                 const StelVertexAttribute& attribute(this->attributes.attributes[attrib]);
    37  
    38                 attributeBuffers[attribute.interpretation] =
    39 -                       std::malloc(vertexCapacity * attributeSize(attribute.type));
    40 +                       ::malloc(vertexCapacity * attributeSize(attribute.type));
    41         }
    42  }
    43  
    44 @@ -50,11 +50,11 @@
    45  {
    46         for(int buffer = 0; buffer < AttributeInterpretation_MAX; ++buffer)
    47         {
    48 -               if(NULL != attributeBuffers[buffer]){std::free(attributeBuffers[buffer]);}
    49 +               if(NULL != attributeBuffers[buffer]){::free(attributeBuffers[buffer]);}
    50         }
    51         if(NULL != projectedPositions)
    52         {
    53 -               std::free(projectedPositions);
    54 +               ::free(projectedPositions);
    55         }
    56  }
    57  
    58 @@ -71,7 +71,7 @@
    59                 {
    60                         const StelVertexAttribute& attribute(attributes.attributes[attrib]);
    61                         attributeBuffers[attribute.interpretation] =
    62 -                               std::realloc(attributeBuffers[attribute.interpretation],
    63 +                               ::realloc(attributeBuffers[attribute.interpretation],
    64                                              vertexCapacity * attributeSize(attribute.type));
    65                 }
    66         }
    67 @@ -167,12 +167,12 @@
    68         if(Q_UNLIKELY(NULL == projectedPositions))
    69         {
    70                 projectedPositions =
    71 -                       static_cast<Vec3f*>(std::malloc(minProjectedSize * sizeof(Vec3f)));
    72 +                       static_cast<Vec3f*>(::malloc(minProjectedSize * sizeof(Vec3f)));
    73         }
    74         else if(projectedPositionsCapacity < minProjectedSize)
    75         {
    76                 projectedPositions =
    77 -                       static_cast<Vec3f*>(std::realloc(projectedPositions, minProjectedSize * sizeof(Vec3f)));
    78 +                       static_cast<Vec3f*>(::realloc(projectedPositions, minProjectedSize * sizeof(Vec3f)));
    79                 projectedPositionsCapacity = minProjectedSize;
    80         }
    81  
    823
    834=== modified file 'src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp'
     
    889        // Align to VERTEX_ALIGN
    8910        vertexStride = (vertexBytes + VERTEX_ALIGN - 1) & ~(VERTEX_ALIGN - 1);
    90 -       vertices = static_cast<char*>(std::malloc(vertexCapacity * vertexStride));
    91 +       vertices = static_cast<char*>(::malloc(vertexCapacity * vertexStride));
     11        vertices = static_cast<char*>(::malloc(vertexCapacity * vertexStride));
    9212 }
    9313 
     
    9818        if(NULL != projectedPositions)
    9919        {
    100 -               std::free(projectedPositions);
    101 +               ::free(projectedPositions);
     20                ::free(projectedPositions);
    10221        }
    10322 }
    10423 
    105 @@ -63,7 +63,7 @@
    106         if(Q_UNLIKELY(vertexCount == vertexCapacity))
    107         {
    108                 vertexCapacity *= 2;
    109 -               vertices = static_cast<char*>(std::realloc(vertices, vertexCapacity * vertexStride));
    110 +               vertices = static_cast<char*>(::realloc(vertices, vertexCapacity * vertexStride));
    111         }
    112  
    113         std::memcpy(vertices + vertexCount * vertexStride, vertexInPtr, vertexBytes);
    114 @@ -122,12 +122,12 @@
    115         if(Q_UNLIKELY(NULL == projectedPositions))
    116         {
    117                 projectedPositions =
    118 -                       static_cast<Vec3f*>(std::malloc(minProjectedSize * sizeof(Vec3f)));
    119 +                       static_cast<Vec3f*>(::malloc(minProjectedSize * sizeof(Vec3f)));
    120         }
    121         else if(projectedPositionsCapacity < minProjectedSize)
    122         {
    123                 projectedPositions =
    124 -                       static_cast<Vec3f*>(std::realloc(projectedPositions, minProjectedSize * sizeof(Vec3f)));
    125 +                       static_cast<Vec3f*>(::realloc(projectedPositions, minProjectedSize * sizeof(Vec3f)));
    126                 projectedPositionsCapacity = minProjectedSize;
    127         }
    128  
    129 
Note: See TracChangeset for help on using the changeset viewer.