1 |
commit: 4a6c36cea73fe40cf56d73505c347d56d1663d33 |
2 |
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Feb 25 08:52:06 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 28 19:10:32 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a6c36ce |
7 |
|
8 |
x11-misc/xplanet: Fix build with gcc6, bug #594804 |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/594804 |
11 |
|
12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
13 |
Closes: https://github.com/gentoo/gentoo/pull/4085 |
14 |
|
15 |
.../xplanet-1.3.1-remove-null-comparison.patch | 157 +++++++++++++++++++++ |
16 |
x11-misc/xplanet/xplanet-1.3.1-r1.ebuild | 83 +++++++++++ |
17 |
2 files changed, 240 insertions(+) |
18 |
|
19 |
diff --git a/x11-misc/xplanet/files/xplanet-1.3.1-remove-null-comparison.patch b/x11-misc/xplanet/files/xplanet-1.3.1-remove-null-comparison.patch |
20 |
new file mode 100644 |
21 |
index 0000000000..3ead8872e0 |
22 |
--- /dev/null |
23 |
+++ b/x11-misc/xplanet/files/xplanet-1.3.1-remove-null-comparison.patch |
24 |
@@ -0,0 +1,157 @@ |
25 |
+Index: src/libannotate/addArcs.cpp |
26 |
+=================================================================== |
27 |
+diff --git a/src/libannotate/addArcs.cpp b/src/libannotate/addArcs.cpp |
28 |
+--- a/src/libannotate/addArcs.cpp (revision 206) |
29 |
++++ b/src/libannotate/addArcs.cpp (revision 207) |
30 |
+@@ -258,7 +258,7 @@ |
31 |
+ { |
32 |
+ ifstream inFile(arcFile.c_str()); |
33 |
+ char *line = new char[MAX_LINE_LENGTH]; |
34 |
+- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL) |
35 |
++ while (inFile.getline (line, MAX_LINE_LENGTH, '\n')) |
36 |
+ readArcFile(line, planet, view, projection, |
37 |
+ planetProperties, annotationMap); |
38 |
+ |
39 |
+@@ -292,7 +292,7 @@ |
40 |
+ { |
41 |
+ ifstream inFile(arcFile.c_str()); |
42 |
+ char *line = new char[256]; |
43 |
+- while (inFile.getline (line, 256, '\n') != NULL) |
44 |
++ while (inFile.getline (line, 256, '\n')) |
45 |
+ readArcFile(line, NULL, view, NULL, NULL, annotationMap); |
46 |
+ |
47 |
+ inFile.close(); |
48 |
+Index: src/libannotate/addMarkers.cpp |
49 |
+=================================================================== |
50 |
+diff --git a/src/libannotate/addMarkers.cpp b/src/libannotate/addMarkers.cpp |
51 |
+--- a/src/libannotate/addMarkers.cpp (revision 206) |
52 |
++++ b/src/libannotate/addMarkers.cpp (revision 207) |
53 |
+@@ -429,7 +429,7 @@ |
54 |
+ { |
55 |
+ ifstream inFile(markerFile.c_str()); |
56 |
+ char *line = new char[MAX_LINE_LENGTH]; |
57 |
+- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL) |
58 |
++ while (inFile.getline (line, MAX_LINE_LENGTH, '\n')) |
59 |
+ { |
60 |
+ unsigned char color[3]; |
61 |
+ memcpy(color, planetProperties->MarkerColor(), 3); |
62 |
+@@ -475,7 +475,7 @@ |
63 |
+ { |
64 |
+ ifstream inFile(markerFile.c_str()); |
65 |
+ char *line = new char[MAX_LINE_LENGTH]; |
66 |
+- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL) |
67 |
++ while (inFile.getline (line, MAX_LINE_LENGTH, '\n')) |
68 |
+ { |
69 |
+ unsigned char color[3]; |
70 |
+ memcpy(color, options->Color(), 3); |
71 |
+Index: src/libannotate/addSatellites.cpp |
72 |
+=================================================================== |
73 |
+diff --git a/src/libannotate/addSatellites.cpp b/src/libannotate/addSatellites.cpp |
74 |
+--- a/src/libannotate/addSatellites.cpp (revision 206) |
75 |
++++ b/src/libannotate/addSatellites.cpp (revision 207) |
76 |
+@@ -488,10 +488,10 @@ |
77 |
+ { |
78 |
+ ifstream inFile(tleFile.c_str()); |
79 |
+ char lines[3][80]; |
80 |
+- while (inFile.getline(lines[0], 80) != NULL) |
81 |
++ while (inFile.getline(lines[0], 80)) |
82 |
+ { |
83 |
+- if ((inFile.getline(lines[1], 80) == NULL) |
84 |
+- || (inFile.getline(lines[2], 80) == NULL)) |
85 |
++ if ((!inFile.getline(lines[1], 80)) |
86 |
++ || (!inFile.getline(lines[2], 80))) |
87 |
+ { |
88 |
+ ostringstream errStr; |
89 |
+ errStr << "Malformed TLE file (" << tleFile << ")?\n"; |
90 |
+@@ -542,7 +542,7 @@ |
91 |
+ { |
92 |
+ ifstream inFile(satFile.c_str()); |
93 |
+ char *line = new char[MAX_LINE_LENGTH]; |
94 |
+- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL) |
95 |
++ while (inFile.getline (line, MAX_LINE_LENGTH, '\n')) |
96 |
+ readSatelliteFile(line, planet, view, projection, |
97 |
+ planetProperties, annotationMap); |
98 |
+ |
99 |
+Index: src/libannotate/addSpiceObjects.cpp |
100 |
+=================================================================== |
101 |
+diff --git a/src/libannotate/addSpiceObjects.cpp b/src/libannotate/addSpiceObjects.cpp |
102 |
+--- a/src/libannotate/addSpiceObjects.cpp (revision 206) |
103 |
++++ b/src/libannotate/addSpiceObjects.cpp (revision 207) |
104 |
+@@ -524,7 +524,7 @@ |
105 |
+ { |
106 |
+ ifstream inFile(kernelFile.c_str()); |
107 |
+ char *line = new char[MAX_LINE_LENGTH]; |
108 |
+- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) |
109 |
++ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) |
110 |
+ { |
111 |
+ int ii = 0; |
112 |
+ while (isDelimiter(line[ii])) |
113 |
+@@ -576,7 +576,7 @@ |
114 |
+ { |
115 |
+ ifstream inFile(spiceFile.c_str()); |
116 |
+ char *line = new char[MAX_LINE_LENGTH]; |
117 |
+- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) |
118 |
++ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) |
119 |
+ readSpiceFile(line, planetsFromSunMap, view, projection, |
120 |
+ annotationMap); |
121 |
+ inFile.close(); |
122 |
+Index: src/libmultiple/RayleighScattering.cpp |
123 |
+=================================================================== |
124 |
+diff --git a/src/libmultiple/RayleighScattering.cpp b/src/libmultiple/RayleighScattering.cpp |
125 |
+--- a/src/libmultiple/RayleighScattering.cpp (revision 206) |
126 |
++++ b/src/libmultiple/RayleighScattering.cpp (revision 207) |
127 |
+@@ -369,7 +369,7 @@ |
128 |
+ |
129 |
+ diskTemplate_.clear(); |
130 |
+ limbTemplate_.clear(); |
131 |
+- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) |
132 |
++ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) |
133 |
+ { |
134 |
+ int i = 0; |
135 |
+ while (isDelimiter(line[i])) |
136 |
+@@ -439,7 +439,7 @@ |
137 |
+ values.clear(); |
138 |
+ |
139 |
+ char line[MAX_LINE_LENGTH]; |
140 |
+- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) |
141 |
++ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) |
142 |
+ { |
143 |
+ int i = 0; |
144 |
+ while (isDelimiter(line[i])) |
145 |
+@@ -470,7 +470,7 @@ |
146 |
+ double &value) |
147 |
+ { |
148 |
+ char line[MAX_LINE_LENGTH]; |
149 |
+- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) |
150 |
++ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) |
151 |
+ { |
152 |
+ int i = 0; |
153 |
+ while (isDelimiter(line[i])) |
154 |
+Index: src/libmultiple/drawStars.cpp |
155 |
+=================================================================== |
156 |
+diff --git a/src/libmultiple/drawStars.cpp b/src/libmultiple/drawStars.cpp |
157 |
+--- a/src/libmultiple/drawStars.cpp (revision 206) |
158 |
++++ b/src/libmultiple/drawStars.cpp (revision 207) |
159 |
+@@ -41,7 +41,7 @@ |
160 |
+ ifstream inFile(starMap.c_str()); |
161 |
+ |
162 |
+ char line[MAX_LINE_LENGTH]; |
163 |
+- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL) |
164 |
++ while (inFile.getline(line, MAX_LINE_LENGTH, '\n')) |
165 |
+ { |
166 |
+ if (line[0] == '#') continue; |
167 |
+ |
168 |
+Index: src/readConfig.cpp |
169 |
+=================================================================== |
170 |
+diff --git a/src/readConfig.cpp b/src/readConfig.cpp |
171 |
+--- a/src/readConfig.cpp (revision 206) |
172 |
++++ b/src/readConfig.cpp (revision 207) |
173 |
+@@ -550,7 +550,7 @@ |
174 |
+ |
175 |
+ ifstream inFile(configFile.c_str()); |
176 |
+ char *line = new char[256]; |
177 |
+- while (inFile.getline(line, 256, '\n') != NULL) |
178 |
++ while (inFile.getline(line, 256, '\n')) |
179 |
+ readConfig(line, planetProperties); |
180 |
+ |
181 |
+ // This condition will only be true if [default] is the only |
182 |
|
183 |
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild |
184 |
new file mode 100644 |
185 |
index 0000000000..a9bea88991 |
186 |
--- /dev/null |
187 |
+++ b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild |
188 |
@@ -0,0 +1,83 @@ |
189 |
+# Copyright 1999-2017 Gentoo Foundation |
190 |
+# Distributed under the terms of the GNU General Public License v2 |
191 |
+# $Id$ |
192 |
+ |
193 |
+EAPI=6 |
194 |
+inherit flag-o-matic |
195 |
+ |
196 |
+DESCRIPTION="Render images of the earth into the X root window" |
197 |
+HOMEPAGE="http://xplanet.sourceforge.net/" |
198 |
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
199 |
+ |
200 |
+LICENSE="GPL-2" |
201 |
+SLOT="0" |
202 |
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
203 |
+IUSE="gif jpeg png tiff truetype X" |
204 |
+ |
205 |
+RDEPEND=" |
206 |
+ gif? ( media-libs/giflib:= ) |
207 |
+ jpeg? ( virtual/jpeg:0 ) |
208 |
+ png? ( |
209 |
+ media-libs/libpng:0= |
210 |
+ media-libs/netpbm |
211 |
+ ) |
212 |
+ tiff? ( media-libs/tiff:0 ) |
213 |
+ truetype? ( |
214 |
+ media-libs/freetype:2 |
215 |
+ x11-libs/pango |
216 |
+ ) |
217 |
+ X? ( |
218 |
+ x11-libs/libX11 |
219 |
+ x11-libs/libXScrnSaver |
220 |
+ x11-libs/libXext |
221 |
+ x11-libs/libXt |
222 |
+ ) |
223 |
+" |
224 |
+DEPEND=" |
225 |
+ ${RDEPEND} |
226 |
+ truetype? ( virtual/pkgconfig ) |
227 |
+ X? ( |
228 |
+ x11-proto/scrnsaverproto |
229 |
+ x11-proto/xproto |
230 |
+ ) |
231 |
+" |
232 |
+ |
233 |
+PATCHES=( |
234 |
+ "${FILESDIR}"/${P}-giflib.patch |
235 |
+ "${FILESDIR}"/${P}-remove-null-comparison.patch |
236 |
+) |
237 |
+ |
238 |
+src_configure() { |
239 |
+ # econf says 'checking pnm.h presence... no' |
240 |
+ use png && append-cppflags -I"${EPREFIX}"/usr/include/netpbm |
241 |
+ |
242 |
+ local myconf=() |
243 |
+ |
244 |
+ use X \ |
245 |
+ && myconf+=( --with-x --with-xscreensaver ) \ |
246 |
+ || myconf+=( --with-x=no --with-xscreensaver=no ) |
247 |
+ |
248 |
+ use gif \ |
249 |
+ && myconf+=( --with-gif ) \ |
250 |
+ || myconf+=( --with-gif=no ) |
251 |
+ |
252 |
+ use jpeg \ |
253 |
+ && myconf+=( --with-jpeg ) \ |
254 |
+ || myconf+=( --with-jpeg=no ) |
255 |
+ |
256 |
+ use tiff \ |
257 |
+ && myconf+=( --with-tiff ) \ |
258 |
+ || myconf+=( --with-tiff=no ) |
259 |
+ |
260 |
+ use png \ |
261 |
+ && myconf+=( --with-png --with-pnm ) \ |
262 |
+ || myconf+=( --with-png=no --with-pnm=no ) |
263 |
+ |
264 |
+ use truetype \ |
265 |
+ && myconf+=( --with-freetype --with-pango ) \ |
266 |
+ || myconf+=( --with-freetype=no --with-pango=no ) |
267 |
+ |
268 |
+ econf \ |
269 |
+ --with-cspice=no \ |
270 |
+ "${myconf[@]}" |
271 |
+} |