wok-next diff celestia/stuff/celestia-1.6.0-gcc45.patch @ rev 17385
ncurses: do not depends on libtinfo (again)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Nov 27 10:52:38 2014 +0100 (2014-11-27) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/celestia/stuff/celestia-1.6.0-gcc45.patch Thu Nov 27 10:52:38 2014 +0100 1.3 @@ -0,0 +1,45 @@ 1.4 +--- src/celengine/overlay.h 2010-04-16 17:43:35.000000000 +0200 1.5 ++++ src/celengine/overlay.h 2010-04-16 17:43:55.000000000 +0200 1.6 +@@ -12,6 +12,7 @@ 1.7 + 1.8 + #include <string> 1.9 + #include <iostream> 1.10 ++#include <cstdio> 1.11 + #include <celtxf/texturefont.h> 1.12 + 1.13 + 1.14 +--- src/celmath/mathlib.h 2010-04-16 18:16:09.000000000 +0200 1.15 ++++ src/celmath/mathlib.h 2010-04-16 18:16:18.000000000 +0200 1.16 +@@ -44,11 +44,6 @@ template<class T> T radToDeg(T r) 1.17 + return r * 180 / static_cast<T>(PI); 1.18 + } 1.19 + 1.20 +-template<class T> T abs(T x) 1.21 +-{ 1.22 +- return (x < 0) ? -x : x; 1.23 +-} 1.24 +- 1.25 + template<class T> T square(T x) 1.26 + { 1.27 + return x * x; 1.28 +--- src/celengine/star.cpp 2010-04-16 18:17:42.000000000 +0200 1.29 ++++ src/celengine/star.cpp 2010-04-16 18:17:57.000000000 +0200 1.30 +@@ -10,6 +10,7 @@ 1.31 + #include <celmath/mathlib.h> 1.32 + #include <cstring> 1.33 + #include <cassert> 1.34 ++#include <cstdio> 1.35 + #include "celestia.h" 1.36 + #include "astro.h" 1.37 + #include "orbit.h" 1.38 +--- src/celestia/celx_object.cpp 2010-04-16 18:19:52.000000000 +0200 1.39 ++++ src/celestia/celx_object.cpp 2010-04-16 18:22:37.000000000 +0200 1.40 +@@ -773,7 +773,7 @@ static int object_mark(lua_State* l) 1.41 + markAlpha = 1.0f; 1.42 + 1.43 + Color markColorAlpha(0.0f, 1.0f, 0.0f, 0.9f); 1.44 +- markColorAlpha = Color::Color(markColor, markAlpha); 1.45 ++ markColorAlpha = Color(markColor, markAlpha); 1.46 + 1.47 + const char* markLabel = celx.safeGetString(6, WrongType, "Fifth argument to object:mark must be a string"); 1.48 + if (markLabel == NULL)