pyrox.dev
Merge pull request #28751 from disassembler/xplanet
xplanet: gcc6 patch
authored by Michael Raskin and committed by GitHub 596daff2 0bb2d311
+4
-1
pkgs/applications/science/astronomy/xplanet/default.nix
+4
-1
pkgs/applications/science/astronomy/xplanet/default.nix
···
11
11
12
12
buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ];
13
13
14
-
patches = [ ./giflib.patch ];
14
+
patches = [
15
+
./giflib.patch
16
+
./gcc6.patch
17
+
];
15
18
16
19
meta = {
17
20
description = "Renders an image of the earth or other planets into the X root window";
+128
pkgs/applications/science/astronomy/xplanet/gcc6.patch
+128
pkgs/applications/science/astronomy/xplanet/gcc6.patch
···
1
+
diff --git c/src/libannotate/addArcs.cpp i/src/libannotate/addArcs.cpp
2
+
index 2ee06c0..0ff5478 100644
3
+
--- c/src/libannotate/addArcs.cpp
4
+
+++ i/src/libannotate/addArcs.cpp
5
+
@@ -258,7 +258,7 @@ addArcs(PlanetProperties *planetProperties, Planet *planet,
6
+
{
7
+
ifstream inFile(arcFile.c_str());
8
+
char *line = new char[MAX_LINE_LENGTH];
9
+
- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
10
+
+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
11
+
readArcFile(line, planet, view, projection,
12
+
planetProperties, annotationMap);
13
+
14
+
@@ -292,7 +292,7 @@ addArcs(View *view, multimap<double, Annotation *> &annotationMap)
15
+
{
16
+
ifstream inFile(arcFile.c_str());
17
+
char *line = new char[256];
18
+
- while (inFile.getline (line, 256, '\n') != NULL)
19
+
+ while (inFile.getline (line, 256, '\n'))
20
+
readArcFile(line, NULL, view, NULL, NULL, annotationMap);
21
+
22
+
inFile.close();
23
+
diff --git c/src/libannotate/addMarkers.cpp i/src/libannotate/addMarkers.cpp
24
+
index 6a8a835..b35d820 100644
25
+
--- c/src/libannotate/addMarkers.cpp
26
+
+++ i/src/libannotate/addMarkers.cpp
27
+
@@ -423,7 +423,7 @@ addMarkers(PlanetProperties *planetProperties, Planet *planet,
28
+
{
29
+
ifstream inFile(markerFile.c_str());
30
+
char *line = new char[MAX_LINE_LENGTH];
31
+
- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
32
+
+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
33
+
{
34
+
unsigned char color[3];
35
+
memcpy(color, planetProperties->MarkerColor(), 3);
36
+
@@ -469,7 +469,7 @@ addMarkers(View *view, const int width, const int height,
37
+
{
38
+
ifstream inFile(markerFile.c_str());
39
+
char *line = new char[MAX_LINE_LENGTH];
40
+
- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
41
+
+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
42
+
{
43
+
unsigned char color[3];
44
+
memcpy(color, options->Color(), 3);
45
+
diff --git c/src/libannotate/addSatellites.cpp i/src/libannotate/addSatellites.cpp
46
+
index 2634339..c9ff0b0 100644
47
+
--- c/src/libannotate/addSatellites.cpp
48
+
+++ i/src/libannotate/addSatellites.cpp
49
+
@@ -488,10 +488,10 @@ loadSatelliteVector(PlanetProperties *planetProperties)
50
+
{
51
+
ifstream inFile(tleFile.c_str());
52
+
char lines[3][80];
53
+
- while (inFile.getline(lines[0], 80) != NULL)
54
+
+ while (inFile.getline(lines[0], 80))
55
+
{
56
+
- if ((inFile.getline(lines[1], 80) == NULL)
57
+
- || (inFile.getline(lines[2], 80) == NULL))
58
+
+ if ((inFile.getline(lines[1], 80))
59
+
+ || (inFile.getline(lines[2], 80)))
60
+
{
61
+
ostringstream errStr;
62
+
errStr << "Malformed TLE file (" << tleFile << ")?\n";
63
+
@@ -542,7 +542,7 @@ addSatellites(PlanetProperties *planetProperties, Planet *planet,
64
+
{
65
+
ifstream inFile(satFile.c_str());
66
+
char *line = new char[MAX_LINE_LENGTH];
67
+
- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
68
+
+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
69
+
readSatelliteFile(line, planet, view, projection,
70
+
planetProperties, annotationMap);
71
+
72
+
diff --git c/src/libmultiple/RayleighScattering.cpp i/src/libmultiple/RayleighScattering.cpp
73
+
index d885173..7c25c1c 100644
74
+
--- c/src/libmultiple/RayleighScattering.cpp
75
+
+++ i/src/libmultiple/RayleighScattering.cpp
76
+
@@ -369,7 +369,7 @@ RayleighScattering::readConfigFile(string configFile)
77
+
78
+
diskTemplate_.clear();
79
+
limbTemplate_.clear();
80
+
- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
81
+
+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
82
+
{
83
+
int i = 0;
84
+
while (isDelimiter(line[i]))
85
+
@@ -439,7 +439,7 @@ RayleighScattering::readBlock(ifstream &inFile,
86
+
values.clear();
87
+
88
+
char line[MAX_LINE_LENGTH];
89
+
- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
90
+
+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
91
+
{
92
+
int i = 0;
93
+
while (isDelimiter(line[i]))
94
+
@@ -470,7 +470,7 @@ RayleighScattering::readValue(ifstream &inFile,
95
+
double &value)
96
+
{
97
+
char line[MAX_LINE_LENGTH];
98
+
- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
99
+
+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
100
+
{
101
+
int i = 0;
102
+
while (isDelimiter(line[i]))
103
+
diff --git c/src/libmultiple/drawStars.cpp i/src/libmultiple/drawStars.cpp
104
+
index ff07c49..22e41a0 100644
105
+
--- c/src/libmultiple/drawStars.cpp
106
+
+++ i/src/libmultiple/drawStars.cpp
107
+
@@ -41,7 +41,7 @@ drawStars(DisplayBase *display, View *view)
108
+
ifstream inFile(starMap.c_str());
109
+
110
+
char line[MAX_LINE_LENGTH];
111
+
- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
112
+
+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
113
+
{
114
+
if (line[0] == '#') continue;
115
+
116
+
diff --git c/src/readConfig.cpp i/src/readConfig.cpp
117
+
index cc1964f..2946690 100644
118
+
--- c/src/readConfig.cpp
119
+
+++ i/src/readConfig.cpp
120
+
@@ -550,7 +550,7 @@ readConfigFile(string configFile, PlanetProperties *planetProperties[])
121
+
122
+
ifstream inFile(configFile.c_str());
123
+
char *line = new char[256];
124
+
- while (inFile.getline(line, 256, '\n') != NULL)
125
+
+ while (inFile.getline(line, 256, '\n'))
126
+
readConfig(line, planetProperties);
127
+
128
+
// This condition will only be true if [default] is the only