1 |
drac 08/05/03 19:02:06 |
2 |
|
3 |
Added: xplanet-1.2.0-gcc43.patch |
4 |
Log: |
5 |
Fix building with GCC 4.3 wrt #214047, thanks to Michal Kiedrowicz. |
6 |
(Portage version: 2.1.5_rc6) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 x11-misc/xplanet/files/xplanet-1.2.0-gcc43.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xplanet/files/xplanet-1.2.0-gcc43.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xplanet/files/xplanet-1.2.0-gcc43.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: xplanet-1.2.0-gcc43.patch |
15 |
=================================================================== |
16 |
diff -ur xplanet-1.2.0.orig/src/buildPlanetMap.cpp xplanet-1.2.0/src/buildPlanetMap.cpp |
17 |
--- xplanet-1.2.0.orig/src/buildPlanetMap.cpp 2004-04-20 23:47:21.000000000 +0200 |
18 |
+++ xplanet-1.2.0/src/buildPlanetMap.cpp 2008-03-20 15:48:24.000000000 +0100 |
19 |
@@ -1,5 +1,6 @@ |
20 |
#include <cmath> |
21 |
#include <cstdio> |
22 |
+#include <cstdlib> |
23 |
#include <map> |
24 |
using namespace std; |
25 |
|
26 |
diff -ur xplanet-1.2.0.orig/src/libannotate/addArcs.cpp xplanet-1.2.0/src/libannotate/addArcs.cpp |
27 |
--- xplanet-1.2.0.orig/src/libannotate/addArcs.cpp 2005-03-15 19:27:13.000000000 +0100 |
28 |
+++ xplanet-1.2.0/src/libannotate/addArcs.cpp 2008-03-20 15:44:58.000000000 +0100 |
29 |
@@ -3,7 +3,7 @@ |
30 |
#include <fstream> |
31 |
#include <sstream> |
32 |
#include <map> |
33 |
-#include <string> |
34 |
+#include <cstring> |
35 |
#include <vector> |
36 |
using namespace std; |
37 |
|
38 |
diff -ur xplanet-1.2.0.orig/src/libannotate/addMarkers.cpp xplanet-1.2.0/src/libannotate/addMarkers.cpp |
39 |
--- xplanet-1.2.0.orig/src/libannotate/addMarkers.cpp 2004-08-29 22:41:58.000000000 +0200 |
40 |
+++ xplanet-1.2.0/src/libannotate/addMarkers.cpp 2008-03-20 15:45:11.000000000 +0100 |
41 |
@@ -5,7 +5,7 @@ |
42 |
#include <fstream> |
43 |
#include <map> |
44 |
#include <sstream> |
45 |
-#include <string> |
46 |
+#include <cstring> |
47 |
#include <vector> |
48 |
using namespace std; |
49 |
|
50 |
diff -ur xplanet-1.2.0.orig/src/libannotate/addSatellites.cpp xplanet-1.2.0/src/libannotate/addSatellites.cpp |
51 |
--- xplanet-1.2.0.orig/src/libannotate/addSatellites.cpp 2004-07-23 02:46:20.000000000 +0200 |
52 |
+++ xplanet-1.2.0/src/libannotate/addSatellites.cpp 2008-03-20 15:45:23.000000000 +0100 |
53 |
@@ -4,7 +4,7 @@ |
54 |
#include <fstream> |
55 |
#include <map> |
56 |
#include <sstream> |
57 |
-#include <string> |
58 |
+#include <cstring> |
59 |
#include <vector> |
60 |
using namespace std; |
61 |
|
62 |
diff -ur xplanet-1.2.0.orig/src/libannotate/Icon.cpp xplanet-1.2.0/src/libannotate/Icon.cpp |
63 |
--- xplanet-1.2.0.orig/src/libannotate/Icon.cpp 2004-02-16 19:36:42.000000000 +0100 |
64 |
+++ xplanet-1.2.0/src/libannotate/Icon.cpp 2008-03-20 15:45:58.000000000 +0100 |
65 |
@@ -1,4 +1,5 @@ |
66 |
#include <sstream> |
67 |
+#include <cstring> |
68 |
using namespace std; |
69 |
|
70 |
#include "findFile.h" |
71 |
diff -ur xplanet-1.2.0.orig/src/libplanet/Planet.cpp xplanet-1.2.0/src/libplanet/Planet.cpp |
72 |
--- xplanet-1.2.0.orig/src/libplanet/Planet.cpp 2005-06-14 20:04:05.000000000 +0200 |
73 |
+++ xplanet-1.2.0/src/libplanet/Planet.cpp 2008-03-20 15:46:53.000000000 +0100 |
74 |
@@ -2,7 +2,7 @@ |
75 |
#include <cstdio> |
76 |
#include <cctype> |
77 |
#include <sstream> |
78 |
-#include <string> |
79 |
+#include <cstring> |
80 |
using namespace std; |
81 |
|
82 |
#include "findFile.h" |
83 |
diff -ur xplanet-1.2.0.orig/src/libprojection/getProjection.cpp xplanet-1.2.0/src/libprojection/getProjection.cpp |
84 |
--- xplanet-1.2.0.orig/src/libprojection/getProjection.cpp 2005-06-13 17:13:11.000000000 +0200 |
85 |
+++ xplanet-1.2.0/src/libprojection/getProjection.cpp 2008-03-20 15:47:34.000000000 +0100 |
86 |
@@ -1,5 +1,6 @@ |
87 |
#include <cctype> |
88 |
#include <cstring> |
89 |
+#include <cstdlib> |
90 |
#include <sstream> |
91 |
#include <vector> |
92 |
using namespace std; |
93 |
diff -ur xplanet-1.2.0.orig/src/Map.cpp xplanet-1.2.0/src/Map.cpp |
94 |
--- xplanet-1.2.0.orig/src/Map.cpp 2005-06-15 01:40:46.000000000 +0200 |
95 |
+++ xplanet-1.2.0/src/Map.cpp 2008-03-20 15:48:01.000000000 +0100 |
96 |
@@ -1,5 +1,6 @@ |
97 |
#include <map> |
98 |
#include <sstream> |
99 |
+#include <cstdlib> |
100 |
#include <string> |
101 |
using namespace std; |
102 |
|
103 |
diff -ur xplanet-1.2.0.orig/src/parseColor.cpp xplanet-1.2.0/src/parseColor.cpp |
104 |
--- xplanet-1.2.0.orig/src/parseColor.cpp 2004-11-23 18:49:48.000000000 +0100 |
105 |
+++ xplanet-1.2.0/src/parseColor.cpp 2008-03-20 15:49:23.000000000 +0100 |
106 |
@@ -2,7 +2,8 @@ |
107 |
#include <fstream> |
108 |
#include <map> |
109 |
#include <sstream> |
110 |
-#include <string> |
111 |
+#include <cstring> |
112 |
+#include <cstdlib> |
113 |
using namespace std; |
114 |
|
115 |
#include "findFile.h" |
116 |
diff -ur xplanet-1.2.0.orig/src/PlanetProperties.h xplanet-1.2.0/src/PlanetProperties.h |
117 |
--- xplanet-1.2.0.orig/src/PlanetProperties.h 2005-04-02 02:43:06.000000000 +0200 |
118 |
+++ xplanet-1.2.0/src/PlanetProperties.h 2008-03-20 15:46:16.000000000 +0100 |
119 |
@@ -1,7 +1,7 @@ |
120 |
#ifndef PLANETPROPERTIES_H |
121 |
#define PLANETPROPERTIES_H |
122 |
|
123 |
-#include <string> |
124 |
+#include <cstring> |
125 |
#include <vector> |
126 |
|
127 |
#include "body.h" |
128 |
diff -ur xplanet-1.2.0.orig/src/xplanet.cpp xplanet-1.2.0/src/xplanet.cpp |
129 |
--- xplanet-1.2.0.orig/src/xplanet.cpp 2004-09-09 17:46:05.000000000 +0200 |
130 |
+++ xplanet-1.2.0/src/xplanet.cpp 2008-03-20 15:50:21.000000000 +0100 |
131 |
@@ -1,5 +1,6 @@ |
132 |
#include <clocale> |
133 |
#include <cstdio> |
134 |
+#include <cstdlib> |
135 |
#include <iostream> |
136 |
#include <map> |
137 |
#include <sstream> |
138 |
diff -ur xplanet-1.2.0.orig/src/xpUtil.cpp xplanet-1.2.0/src/xpUtil.cpp |
139 |
--- xplanet-1.2.0.orig/src/xpUtil.cpp 2005-04-02 02:22:51.000000000 +0200 |
140 |
+++ xplanet-1.2.0/src/xpUtil.cpp 2008-03-20 15:50:06.000000000 +0100 |
141 |
@@ -5,7 +5,8 @@ |
142 |
#include <ctime> |
143 |
#include <iostream> |
144 |
#include <sstream> |
145 |
-#include <string> |
146 |
+#include <cstring> |
147 |
+#include <cstdlib> |
148 |
using namespace std; |
149 |
|
150 |
#include <unistd.h> |
151 |
|
152 |
|
153 |
|
154 |
-- |
155 |
gentoo-commits@l.g.o mailing list |