Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tristan Heaven (nyhm)" <nyhm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-puzzle/mirrormagic/files: mirrormagic.xpm mirrormagic-2.0.2-64bit.patch
Date: Sat, 03 Apr 2010 18:03:48
Message-Id: E1Ny7hB-0006Jm-Mg@stork.gentoo.org
1 nyhm 10/04/03 18:03:45
2
3 Added: mirrormagic.xpm mirrormagic-2.0.2-64bit.patch
4 Log:
5 Patch from Debian to fix crash on amd64, bug #196500; install menu entry
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 games-puzzle/mirrormagic/files/mirrormagic.xpm
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/mirrormagic/files/mirrormagic.xpm?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/mirrormagic/files/mirrormagic.xpm?rev=1.1&content-type=text/plain
13
14 Index: mirrormagic.xpm
15 ===================================================================
16 /* XPM */
17 static char * mirrormagic_xpm[] = {
18 "32 32 257 2",
19 " c None",
20 ". c #000000",
21 "+ c #999999",
22 "@ c #77AAFF",
23 "# c #4C2208",
24 "$ c #6E4C08",
25 "% c #7F7F7F",
26 "& c #AACCFF",
27 "* c #777777",
28 "= c #BB6622",
29 "- c #0000CC",
30 "; c #994411",
31 "> c #00FF00",
32 ", c #EECC11",
33 "' c #5D5D5D",
34 ") c #447F44",
35 "! c #555555",
36 "~ c #0000AA",
37 "{ c #3B3B3B",
38 "] c #009900",
39 "^ c #990000",
40 "/ c #007F00",
41 "( c #005500",
42 "_ c #CCCCCC",
43 ": c #CC0000",
44 "< c #7F0000",
45 "[ c #19447F",
46 "} c #AAAAAA",
47 "| c #FF0000",
48 "1 c #331900",
49 "2 c #888888",
50 "3 c #000055",
51 "4 c #663300",
52 "5 c #6E6E6E",
53 "6 c #666666",
54 "7 c #DD9911",
55 "8 c #5D3311",
56 "9 c #00337F",
57 "0 c #FFFFFF",
58 "a c #00CC00",
59 "b c #4C4C4C",
60 "c c #FFFF00",
61 "d c #444444",
62 "e c #00AA00",
63 "f c #7F7F00",
64 "g c #DDDDDD",
65 "h c #0066FF",
66 "i c #006600",
67 "j c #004C00",
68 "k c #776608",
69 "l c #3388FF",
70 "m c #BBBBBB",
71 "n c #0000FF",
72 "o c #000000",
73 "p c #000000",
74 "q c #000000",
75 "r c #000000",
76 "s c #000000",
77 "t c #000000",
78 "u c #000000",
79 "v c #000000",
80 "w c #000000",
81 "x c #000000",
82 "y c #000000",
83 "z c #000000",
84 "A c #000000",
85 "B c #000000",
86 "C c #000000",
87 "D c #000000",
88 "E c #000000",
89 "F c #000000",
90 "G c #000000",
91 "H c #000000",
92 "I c #000000",
93 "J c #000000",
94 "K c #000000",
95 "L c #000000",
96 "M c #000000",
97 "N c #000000",
98 "O c #000000",
99 "P c #000000",
100 "Q c #000000",
101 "R c #000000",
102 "S c #000000",
103 "T c #000000",
104 "U c #000000",
105 "V c #000000",
106 "W c #000000",
107 "X c #000000",
108 "Y c #000000",
109 "Z c #000000",
110 "` c #000000",
111 " . c #000000",
112 ".. c #000000",
113 "+. c #000000",
114 "@. c #000000",
115 "#. c #000000",
116 "$. c #000000",
117 "%. c #000000",
118 "&. c #000000",
119 "*. c #000000",
120 "=. c #000000",
121 "-. c #000000",
122 ";. c #000000",
123 ">. c #000000",
124 ",. c #000000",
125 "'. c #000000",
126 "). c #000000",
127 "!. c #000000",
128 "~. c #000000",
129 "{. c #000000",
130 "]. c #000000",
131 "^. c #000000",
132 "/. c #000000",
133 "(. c #000000",
134 "_. c #000000",
135 ":. c #000000",
136 "<. c #000000",
137 "[. c #000000",
138 "}. c #000000",
139 "|. c #000000",
140 "1. c #000000",
141 "2. c #000000",
142 "3. c #000000",
143 "4. c #000000",
144 "5. c #000000",
145 "6. c #000000",
146 "7. c #000000",
147 "8. c #000000",
148 "9. c #000000",
149 "0. c #000000",
150 "a. c #000000",
151 "b. c #000000",
152 "c. c #000000",
153 "d. c #000000",
154 "e. c #000000",
155 "f. c #000000",
156 "g. c #000000",
157 "h. c #000000",
158 "i. c #000000",
159 "j. c #000000",
160 "k. c #000000",
161 "l. c #000000",
162 "m. c #000000",
163 "n. c #000000",
164 "o. c #000000",
165 "p. c #000000",
166 "q. c #000000",
167 "r. c #000000",
168 "s. c #000000",
169 "t. c #000000",
170 "u. c #000000",
171 "v. c #000000",
172 "w. c #000000",
173 "x. c #000000",
174 "y. c #000000",
175 "z. c #000000",
176 "A. c #000000",
177 "B. c #000000",
178 "C. c #000000",
179 "D. c #000000",
180 "E. c #000000",
181 "F. c #000000",
182 "G. c #000000",
183 "H. c #000000",
184 "I. c #000000",
185 "J. c #000000",
186 "K. c #000000",
187 "L. c #000000",
188 "M. c #000000",
189 "N. c #000000",
190 "O. c #000000",
191 "P. c #000000",
192 "Q. c #000000",
193 "R. c #000000",
194 "S. c #000000",
195 "T. c #000000",
196 "U. c #000000",
197 "V. c #000000",
198 "W. c #000000",
199 "X. c #000000",
200 "Y. c #000000",
201 "Z. c #000000",
202 "`. c #000000",
203 " + c #000000",
204 ".+ c #000000",
205 "++ c #000000",
206 "@+ c #000000",
207 "#+ c #000000",
208 "$+ c #000000",
209 "%+ c #000000",
210 "&+ c #000000",
211 "*+ c #000000",
212 "=+ c #000000",
213 "-+ c #000000",
214 ";+ c #000000",
215 ">+ c #000000",
216 ",+ c #000000",
217 "'+ c #000000",
218 ")+ c #000000",
219 "!+ c #000000",
220 "~+ c #000000",
221 "{+ c #000000",
222 "]+ c #000000",
223 "^+ c #000000",
224 "/+ c #000000",
225 "(+ c #000000",
226 "_+ c #000000",
227 ":+ c #000000",
228 "<+ c #000000",
229 "[+ c #000000",
230 "}+ c #000000",
231 "|+ c #000000",
232 "1+ c #000000",
233 "2+ c #000000",
234 "3+ c #000000",
235 "4+ c #000000",
236 "5+ c #000000",
237 "6+ c #000000",
238 "7+ c #000000",
239 "8+ c #000000",
240 "9+ c #000000",
241 "0+ c #000000",
242 "a+ c #000000",
243 "b+ c #000000",
244 "c+ c #000000",
245 "d+ c #000000",
246 "e+ c #000000",
247 "f+ c #000000",
248 "g+ c #000000",
249 "h+ c #000000",
250 "i+ c #000000",
251 "j+ c #000000",
252 "k+ c #000000",
253 "l+ c #000000",
254 "m+ c #000000",
255 "n+ c #000000",
256 "o+ c #000000",
257 "p+ c #000000",
258 "q+ c #000000",
259 "r+ c #000000",
260 "s+ c #000000",
261 "t+ c #000000",
262 "u+ c #000000",
263 "v+ c #000000",
264 "w+ c #000000",
265 "x+ c #000000",
266 "y+ c #000000",
267 "z+ c #000000",
268 "A+ c #000000",
269 "B+ c #000000",
270 "C+ c #000000",
271 "D+ c #000000",
272 "E+ c #000000",
273 "F+ c #000000",
274 "G+ c #000000",
275 "H+ c #000000",
276 " ",
277 " - n n l h h : n - ~ ",
278 " n - - l l h n n n n - ",
279 " , 7 l l h h n : n n n n ~ ~ 7 , ",
280 " c 7 = h l h h n n n n n - - ~ = 7 c ",
281 " c , 7 , 7 ~ h h h n n n - - ~ ~ ~ 7 , 7 , c ",
282 " , , 7 7 = ~ h h n n - - ~ ~ ~ ~ ~ = 7 7 , , ",
283 " , 7 = - ~ l _ } b 4 4 b b b ~ ~ - = 7 , ",
284 " ~ ~ 4 4 4 ~ m g 1 1 = = 1 1 d d h ~ 4 4 ~ ~ ",
285 " ~ ~ ~ ~ 4 4 4 l g g 7 7 , 7 ; ; d { @ h 4 4 4 ~ ~ ~ ",
286 " ~ ~ ~ ~ h h l l 0 g 7 7 , 7 ; ; d { @ @ h n 4 ~ ~ ~ n ",
287 " @ @ @ @ @ @ l l 0 g } 7 , , ; d d { @ l h h n n n - - ",
288 " @ @ | @ @ l 0 2 0 g } = = d d d { @ l h n n n n - - ",
289 " @ @ & & @ @ l g + _ 2 2 6 6 ! @ @ l h n ^ n - - ",
290 " @ & & @ @ l l } 2 _ _ 2 2 @ @ h h n n n n - - ",
291 " @ @ @ | l l + _ _ } _ l @ h h h n n n - - ",
292 " @ @ @ @ l l + _ _ _ } _ @ h h n n n n - - ",
293 " @ @ @ l l h } _ _ } } h h h n n n - - ",
294 " @ @ @ l l h h _ _ } } } h n ^ n - - - ",
295 " @ n h h h h } _ _ } 2 2 n n - - - ",
296 " @ n n h h h } _ _ _ 2 ~ n n ~ - - ",
297 " n n n n | h ~ } } } ~ ~ - ~ ~ ~ - ",
298 " h n n n h h h - ~ } } } - - ^ ~ ~ - ",
299 " h n n h h h n - n - - * * ~ ~ ~ - ",
300 " h n h h h h n - n - - - - ~ ~ ~ - - ",
301 " h l h h h l h h n n : - - - ~ ~ ~ ~ ^ - ",
302 " h @ h | l l h n n n - - - ~ ~ ~ ~ ~ ~ - ",
303 " n l @ l l l l h n n - ~ - - ~ ~ ~ ^ ~ ~ ~ - ",
304 " n l @ l l l h n n - - ~ ~ - ~ ~ ~ ~ ~ ~ ~ - ",
305 " n | h h h = ; ; 4 ~ - ~ ~ ~ - = ; ; 4 ~ ~ ~ ^ - ",
306 " n - h h = = ; ; 4 4 ~ ~ ~ ~ = = ; ; 4 4 ~ ~ ~ - ",
307 " "};
308
309
310
311 1.1 games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch
312
313 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch?rev=1.1&view=markup
314 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch?rev=1.1&content-type=text/plain
315
316 Index: mirrormagic-2.0.2-64bit.patch
317 ===================================================================
318 From Debian:
319
320 In src/libgame/gadgets.c, check for 64bit when handling
321 GDI_TYPE,GDI_STATE in HandleGadgetTags() and use int instead of
322 unsigned long. Should probably really be uint32_t but I'll leave
323 that decision to upstream. Thanks Pelle Nilsson (and son).
324 64bit check borrowed from bug #496863. Closes: #498912.
325
326 --- src/libgame/gadgets.c
327 +++ src/libgame/gadgets.c
328 @@ -18,6 +18,12 @@
329 #include "text.h"
330 #include "misc.h"
331
332 +/* check for 64bit */
333 +#ifdef _LP64
334 +#ifndef L64
335 +#define L64 1
336 +#endif
337 +#endif
338
339 /* values for DrawGadget() */
340 #define DG_UNPRESSED 0
341 @@ -301,11 +307,19 @@
342 break;
343
344 case GDI_TYPE:
345 +#ifdef L64
346 + gi->type = va_arg(ap, int);
347 +#else
348 gi->type = va_arg(ap, unsigned long);
349 +#endif
350 break;
351
352 case GDI_STATE:
353 +#ifdef L64
354 + gi->state = va_arg(ap, int);
355 +#else
356 gi->state = va_arg(ap, unsigned long);
357 +#endif
358 break;
359
360 case GDI_CHECKED:
Report Message
Find on MARC Find on Google Groups