| 1 |
xarthisius 10/06/24 17:20:49 |
| 2 |
|
| 3 |
Added: celestia-1.6.0-parallel_install.patch |
| 4 |
celestia-1.6.0-gcc45.patch |
| 5 |
Log: |
| 6 |
Fix parallel install, fix build with GCC-4.5 wrt bug 317507. Thanks to Philipp <sefi@×××××××.de> for reporting and patch. |
| 7 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-astronomy/celestia/files/celestia-1.6.0-parallel_install.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/celestia/files/celestia-1.6.0-parallel_install.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/celestia/files/celestia-1.6.0-parallel_install.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: celestia-1.6.0-parallel_install.patch |
| 16 |
=================================================================== |
| 17 |
--- data/Makefile.am |
| 18 |
+++ data/Makefile.am |
| 19 |
@@ -11,12 +11,11 @@ |
| 20 |
|
| 21 |
pkgdata_DATA = \ |
| 22 |
$(wildcard *.ssc) \ |
| 23 |
- $(wildcard *.dat) \ |
| 24 |
$(wildcard *.xyz) \ |
| 25 |
$(wildcard *.xyzv) \ |
| 26 |
$(wildcard *.dsc) \ |
| 27 |
$(wildcard *.stc) \ |
| 28 |
- stars.dat |
| 29 |
+ asterisms.dat boundaries.dat hdxindex.dat saoxindex.dat starnames.dat stars.dat |
| 30 |
|
| 31 |
EXTRA_DIST = \ |
| 32 |
$(pkgdata_DATA) \ |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.1 sci-astronomy/celestia/files/celestia-1.6.0-gcc45.patch |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/celestia/files/celestia-1.6.0-gcc45.patch?rev=1.1&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/celestia/files/celestia-1.6.0-gcc45.patch?rev=1.1&content-type=text/plain |
| 40 |
|
| 41 |
Index: celestia-1.6.0-gcc45.patch |
| 42 |
=================================================================== |
| 43 |
Fixing build with GCC-4.5 |
| 44 |
|
| 45 |
http://bugs.gentoo.org/show_bug.cgi?id=317507 |
| 46 |
|
| 47 |
Patch written by Philipp <sefi@×××××××.de> |
| 48 |
--- src/celengine/overlay.h |
| 49 |
+++ src/celengine/overlay.h |
| 50 |
@@ -12,6 +12,7 @@ |
| 51 |
|
| 52 |
#include <string> |
| 53 |
#include <iostream> |
| 54 |
+#include <cstdio> |
| 55 |
#include <celtxf/texturefont.h> |
| 56 |
|
| 57 |
|
| 58 |
--- src/celmath/mathlib.h |
| 59 |
+++ src/celmath/mathlib.h |
| 60 |
@@ -44,11 +44,6 @@ |
| 61 |
template<class T> T radToDeg(T r) |
| 62 |
return r * 180 / static_cast<T>(PI); |
| 63 |
} |
| 64 |
|
| 65 |
-template<class T> T abs(T x) |
| 66 |
-{ |
| 67 |
- return (x < 0) ? -x : x; |
| 68 |
-} |
| 69 |
- |
| 70 |
template<class T> T square(T x) |
| 71 |
{ |
| 72 |
return x * x; |
| 73 |
--- src/celengine/star.cpp |
| 74 |
+++ src/celengine/star.cpp |
| 75 |
@@ -10,6 +10,7 @@ |
| 76 |
#include <celmath/mathlib.h> |
| 77 |
#include <cstring> |
| 78 |
#include <cassert> |
| 79 |
+#include <cstdio> |
| 80 |
#include "celestia.h" |
| 81 |
#include "astro.h" |
| 82 |
#include "orbit.h" |
| 83 |
--- src/celestia/celx_object.cpp |
| 84 |
+++ src/celestia/celx_object.cpp |
| 85 |
@@ -773,7 +773,7 @@ static int object_mark(lua_State* l) |
| 86 |
markAlpha = 1.0f; |
| 87 |
|
| 88 |
Color markColorAlpha(0.0f, 1.0f, 0.0f, 0.9f); |
| 89 |
- markColorAlpha = Color::Color(markColor, markAlpha); |
| 90 |
+ markColorAlpha = Color(markColor, markAlpha); |
| 91 |
|
| 92 |
const char* markLabel = celx.safeGetString(6, WrongType, "Fifth argument to object:mark must be a string"); |
| 93 |
if (markLabel == NULL) |
Archives