summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@slackbuilds.org>2012-09-12 20:52:07 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-09-12 14:19:24 -0500
commit63de6753a286c42fbb77b4ed7926957551ca3758 (patch)
tree281a3eb23c49a810527d8a8ecb527b287ec3d192
parent32bf78acd6829dad436a688e58c0530d9459ba97 (diff)
downloadslackbuilds-63de6753a286c42fbb77b4ed7926957551ca3758.tar.gz
academic/celestia: Added patch for gcc 4.7.
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
-rw-r--r--academic/celestia/celestia-1.6.1-gcc47.patch22
-rw-r--r--academic/celestia/celestia.SlackBuild5
2 files changed, 26 insertions, 1 deletions
diff --git a/academic/celestia/celestia-1.6.1-gcc47.patch b/academic/celestia/celestia-1.6.1-gcc47.patch
new file mode 100644
index 0000000000..385f39a205
--- /dev/null
+++ b/academic/celestia/celestia-1.6.1-gcc47.patch
@@ -0,0 +1,22 @@
+diff -up celestia-1.6.1/src/celengine/frametree.h.gcc47 celestia-1.6.1/src/celengine/frametree.h
+--- celestia-1.6.1/src/celengine/frametree.h.gcc47 2012-03-22 12:56:56.096087430 -0400
++++ celestia-1.6.1/src/celengine/frametree.h 2012-03-22 12:57:04.333022427 -0400
+@@ -13,6 +13,7 @@
+ #ifndef _CELENGINE_FRAMETREE_H_
+ #define _CELENGINE_FRAMETREE_H_
+
++#include <unistd.h>
+ #include <vector>
+
+ class Star;
+diff -up celestia-1.6.1/src/celengine/planetgrid.cpp.gcc47 celestia-1.6.1/src/celengine/planetgrid.cpp
+--- celestia-1.6.1/src/celengine/planetgrid.cpp.gcc47 2012-03-22 12:53:01.496950513 -0400
++++ celestia-1.6.1/src/celengine/planetgrid.cpp 2012-03-22 12:53:08.812891865 -0400
+@@ -12,6 +12,7 @@
+
+ #include <cstdio>
+ #include <cmath>
++#include <celmath/mathlib.h>
+ #include <celmath/intersect.h>
+ #include "planetgrid.h"
+ #include "body.h"
diff --git a/academic/celestia/celestia.SlackBuild b/academic/celestia/celestia.SlackBuild
index 4c804df18b..ab14f626f1 100644
--- a/academic/celestia/celestia.SlackBuild
+++ b/academic/celestia/celestia.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=celestia
VERSION=1.6.1
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -72,6 +72,9 @@ find . \
# Note that the kde frontend will only build with kde3
FRONTEND=${FRONTEND:-gtk}
+# Fix incomatibility with gcc 4.7
+patch -p1 -i $CWD/celestia-1.6.1-gcc47.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \