svn commit: r331021 - in head/astro/stellarium: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Sun Oct 20 14:53:22 UTC 2013
Author: danfe
Date: Sun Oct 20 14:53:20 2013
New Revision: 331021
URL: http://svnweb.freebsd.org/changeset/ports/331021
Log:
Fix the build on recent -CURRENT and stagify while I'm here.
PR: ports/182027
Added:
head/astro/stellarium/files/
head/astro/stellarium/files/patch-src-StelMainGraphicsView.cpp (contents, props changed)
head/astro/stellarium/files/patch-src-core-StelUtils.cpp (contents, props changed)
head/astro/stellarium/files/patch-src-core-renderer-StelQGLArrayVertexBufferBackend.cpp (contents, props changed)
head/astro/stellarium/files/patch-src-core-renderer-StelQGLInterleavedArrayVertexBufferBackend.cpp (contents, props changed)
Modified:
head/astro/stellarium/Makefile
head/astro/stellarium/pkg-plist
Modified: head/astro/stellarium/Makefile
==============================================================================
--- head/astro/stellarium/Makefile Sun Oct 20 14:47:19 2013 (r331020)
+++ head/astro/stellarium/Makefile Sun Oct 20 14:53:20 2013 (r331021)
@@ -19,9 +19,7 @@ USE_QT4= moc_build rcc_build uic_build q
corelib gui network opengl script
INSTALLS_ICONS= yes
-MAN1= ${PORTNAME}.1
PORTDOCS= AUTHORS ChangeLog README
-NO_STAGE= yes
OPTIONS_DEFINE= MORE_STARS MULTIMEDIA DOCS
OPTIONS_DEFAULT= MULTIMEDIA
@@ -59,11 +57,9 @@ post-patch: .SILENT
post-install:
.if ${PORT_OPTIONS:MMORE_STARS}
${INSTALL_DATA} ${DISTDIR}/stars_[45678]_[12]v0_0.cat \
- ${DATADIR}/stars/default
-.endif
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+ ${STAGEDIR}${DATADIR}/stars/default
.endif
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Added: head/astro/stellarium/files/patch-src-StelMainGraphicsView.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/astro/stellarium/files/patch-src-StelMainGraphicsView.cpp Sun Oct 20 14:53:20 2013 (r331021)
@@ -0,0 +1,11 @@
+--- src/StelMainGraphicsView.cpp.orig 2013-09-07 23:50:48.000000000 +0800
++++ src/StelMainGraphicsView.cpp 2013-10-19 19:49:37.000000000 +0800
+@@ -43,6 +43,8 @@
+ #include <QTimer>
+ #include <QDir>
+
++#include <locale>
++
+ #ifndef DISABLE_SCRIPTING
+ #include "StelScriptMgr.hpp"
+ #include "StelMainScriptAPIProxy.hpp"
Added: head/astro/stellarium/files/patch-src-core-StelUtils.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/astro/stellarium/files/patch-src-core-StelUtils.cpp Sun Oct 20 14:53:20 2013 (r331021)
@@ -0,0 +1,13 @@
+--- src/core/StelUtils.cpp.orig 2013-08-04 14:20:27.000000000 +0800
++++ src/core/StelUtils.cpp 2013-10-19 19:37:56.000000000 +0800
+@@ -1065,8 +1065,8 @@ double calculateSiderealPeriod(const dou
+ 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));
+ }
Added: head/astro/stellarium/files/patch-src-core-renderer-StelQGLArrayVertexBufferBackend.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/astro/stellarium/files/patch-src-core-renderer-StelQGLArrayVertexBufferBackend.cpp Sun Oct 20 14:53:20 2013 (r331021)
@@ -0,0 +1,49 @@
+--- src/core/renderer/StelQGLArrayVertexBufferBackend.cpp.orig 2013-04-21 15:22:59.000000000 +0800
++++ src/core/renderer/StelQGLArrayVertexBufferBackend.cpp 2013-10-19 19:47:23.000000000 +0800
+@@ -42,7 +42,7 @@ StelQGLArrayVertexBufferBackend(const Pr
+ 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 @@ StelQGLArrayVertexBufferBackend::~StelQG
+ {
+ 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 @@ void StelQGLArrayVertexBufferBackend::ad
+ {
+ 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 @@ void StelQGLArrayVertexBufferBackend::
+ 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;
+ }
+
Added: head/astro/stellarium/files/patch-src-core-renderer-StelQGLInterleavedArrayVertexBufferBackend.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/astro/stellarium/files/patch-src-core-renderer-StelQGLInterleavedArrayVertexBufferBackend.cpp Sun Oct 20 14:53:20 2013 (r331021)
@@ -0,0 +1,45 @@
+--- src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp.orig 2013-08-04 14:20:27.000000000 +0800
++++ src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp 2013-10-19 19:47:06.000000000 +0800
+@@ -42,15 +42,15 @@ StelQGLInterleavedArrayVertexBufferBacke
+ }
+ // 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()
+ {
+- std::free(vertices);
++ ::free(vertices);
+ if(NULL != projectedPositions)
+ {
+- std::free(projectedPositions);
++ ::free(projectedPositions);
+ }
+ }
+
+@@ -63,7 +63,7 @@ void StelQGLInterleavedArrayVertexBuffer
+ 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 @@ void StelQGLInterleavedArrayVertexBuffer
+ 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: head/astro/stellarium/pkg-plist
==============================================================================
--- head/astro/stellarium/pkg-plist Sun Oct 20 14:47:19 2013 (r331020)
+++ head/astro/stellarium/pkg-plist Sun Oct 20 14:53:20 2013 (r331021)
@@ -1,4 +1,5 @@
bin/stellarium
+man/man1/stellarium.1.gz
%%DATADIR%%/data/DejaVuSans.ttf
%%DATADIR%%/data/DejaVuSansMono.ttf
%%DATADIR%%/data/base_locations.bin.gz
More information about the svn-ports-head
mailing list