| 1 |
tristan 12/07/07 23:10:26 |
| 2 |
|
| 3 |
Added: hexxagon-1.0.1-gcc47.patch |
| 4 |
Log: |
| 5 |
Patch to fix building with gcc-4.7 from Daniel Johnson, bug #423465 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: hexxagon-1.0.1-gcc47.patch |
| 16 |
=================================================================== |
| 17 |
--- src/gui/gtkhexxagonboard.cpp |
| 18 |
+++ src/gui/gtkhexxagonboard.cpp |
| 19 |
@@ -120,8 +120,8 @@ |
| 20 |
posx += width * offset / 2; |
| 21 |
posy += height * offset / 2; |
| 22 |
|
| 23 |
- int x = (int) round(posx) + xoff; |
| 24 |
- int y = (int) round(posy) + yoff; |
| 25 |
+ int displayx = (int) round(posx) + xoff; |
| 26 |
+ int displayy = (int) round(posy) + yoff; |
| 27 |
|
| 28 |
int type; |
| 29 |
LookUp lookup(bbMask); |
| 30 |
@@ -155,10 +155,10 @@ |
| 31 |
|
| 32 |
Glib::RefPtr<Gdk::GC> gc = Gdk::GC::create(back); |
| 33 |
gc->set_clip_mask(mask[type]); |
| 34 |
- gc->set_clip_origin(x, y); |
| 35 |
+ gc->set_clip_origin(displayx, displayy); |
| 36 |
|
| 37 |
if(back && map_board[type]) |
| 38 |
- back->draw_drawable(gc, map_board[type], 0, 0, x, y, -1, -1); |
| 39 |
+ back->draw_drawable(gc, map_board[type], 0, 0, displayx, displayy, -1, -1); |
| 40 |
|
| 41 |
cellNo++; |
| 42 |
} |
| 43 |
@@ -205,12 +205,12 @@ |
| 44 |
posx += width * offset / 2; |
| 45 |
posy += height * offset / 2; |
| 46 |
|
| 47 |
- int x = (int) round(posx + w / 2) + xoff; |
| 48 |
- int y = (int) round(posy + h / 2) + yoff; |
| 49 |
+ int displayx = (int) round(posx + w / 2) + xoff; |
| 50 |
+ int displayy = (int) round(posy + h / 2) + yoff; |
| 51 |
|
| 52 |
// Now we got the place for cell cellNo |
| 53 |
- double dx = inx - x; |
| 54 |
- double dy = iny - y; |
| 55 |
+ double dx = inx - displayx; |
| 56 |
+ double dy = iny - displayy; |
| 57 |
double a = (w/2)*(w/2); |
| 58 |
double b = (h/2)*(h/2); |
Archives