Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 science/celestia/HISTORY                    |    4 ++
 science/celestia/PRE_BUILD                  |    3 +
 science/celestia/celestia-1.6.0-gcc45.patch |   51 
++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)

New commits:
commit 1dffe87a375b8281878685a9af1d51b3edacf848
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/celestia: fixed build with gcc 4.5

diff --git a/science/celestia/HISTORY b/science/celestia/HISTORY
index 70b2454..d602c41 100644
--- a/science/celestia/HISTORY
+++ b/science/celestia/HISTORY
@@ -1,3 +1,7 @@
+2010-11-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, celestia-1.6.0-gcc45.patch: added patch from gentoo
+         to fix build with gcc 4.5
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/science/celestia/PRE_BUILD b/science/celestia/PRE_BUILD
new file mode 100755
index 0000000..1b44b95
--- /dev/null
+++ b/science/celestia/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build      &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p0 < ${SCRIPT_DIRECTORY}/celestia-${VERSION}-gcc45.patch
diff --git a/science/celestia/celestia-1.6.0-gcc45.patch 
b/science/celestia/celestia-1.6.0-gcc45.patch
new file mode 100644
index 0000000..8ee9adb
--- /dev/null
+++ b/science/celestia/celestia-1.6.0-gcc45.patch
@@ -0,0 +1,51 @@
+Fixing build with GCC-4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=317507
+
+Patch written by Philipp <sefi AT s-e-f-i.de>
+--- src/celengine/overlay.h
++++ src/celengine/overlay.h
+@@ -12,6 +12,7 @@
+ 
+ #include <string>
+ #include <iostream>
++#include <cstdio>
+ #include <celtxf/texturefont.h>
+ 
+ 
+--- src/celmath/mathlib.h
++++ src/celmath/mathlib.h
+@@ -44,11 +44,6 @@ 
+ template<class T> T radToDeg(T r)
+     return r * 180 / static_cast<T>(PI);
+ }
+ 
+-template<class T> T abs(T x)
+-{
+-    return (x < 0) ? -x : x;
+-}
+-
+ template<class T> T square(T x)
+ {
+     return x * x;
+--- src/celengine/star.cpp
++++ src/celengine/star.cpp
+@@ -10,6 +10,7 @@
+ #include <celmath/mathlib.h>
+ #include <cstring>
+ #include <cassert>
++#include <cstdio>
+ #include "celestia.h"
+ #include "astro.h"
+ #include "orbit.h"
+--- src/celestia/celx_object.cpp
++++ src/celestia/celx_object.cpp
+@@ -773,7 +773,7 @@ static int object_mark(lua_State* l)
+         markAlpha = 1.0f;
+     
+     Color markColorAlpha(0.0f, 1.0f, 0.0f, 0.9f);
+-    markColorAlpha = Color::Color(markColor, markAlpha);
++    markColorAlpha = Color(markColor, markAlpha);
+     
+     const char* markLabel = celx.safeGetString(6, WrongType, "Fifth 
argument to object:mark must be a string");
+     if (markLabel == NULL)