tags 667200 + pending thanks Dear maintainer,
I've prepared an NMU for hexxagon (versioned as 1.0pl1-3.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Status Quo: Mean Girl
diff -u hexxagon-1.0pl1/debian/changelog hexxagon-1.0pl1/debian/changelog
--- hexxagon-1.0pl1/debian/changelog
+++ hexxagon-1.0pl1/debian/changelog
@@ -1,3 +1,12 @@
+hexxagon (1.0pl1-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "ftbfs with GCC-4.7": apply patch from Paul Tagliamonte that
+ disambiguates variable names.
+ Closes: #667200
+
+ -- gregor herrmann <gre...@debian.org> Sat, 05 May 2012 15:22:29 +0200
+
hexxagon (1.0pl1-3) unstable; urgency=low
* Builds from source even with new GCC (closes: #551934, #560503, #564198)
only in patch2:
unchanged:
--- hexxagon-1.0pl1.orig/src/gui/gtkhexxagonboard.cpp
+++ hexxagon-1.0pl1/src/gui/gtkhexxagonboard.cpp
@@ -138,8 +138,8 @@
posx += width * offset / 2;
posy += height * offset / 2;
- int x = (int) round(posx) + xoff;
- int y = (int) round(posy) + yoff;
+ int nx = (int) round(posx) + xoff;
+ int ny = (int) round(posy) + yoff;
int type;
LookUp lookup(bbMask);
@@ -173,10 +173,10 @@
Glib::RefPtr<Gdk::GC> gc = Gdk::GC::create(back);
gc->set_clip_mask(mask[type]);
- gc->set_clip_origin(x, y);
+ gc->set_clip_origin(nx, ny);
if(back && map_board[type])
- back->draw_drawable(gc, map_board[type], 0, 0, x, y, -1, -1);
+ back->draw_drawable(gc, map_board[type], 0, 0, nx, ny, -1, -1);
cellNo++;
}
@@ -224,12 +224,12 @@
posx += width * offset / 2;
posy += height * offset / 2;
- int x = (int) round(posx + w / 2) + xoff;
- int y = (int) round(posy + h / 2) + yoff;
+ int nx = (int) round(posx + w / 2) + xoff;
+ int ny = (int) round(posy + h / 2) + yoff;
// Now we got the place for cell cellNo
- double dx = inx - x;
- double dy = iny - y;
+ double dx = inx - nx;
+ double dy = iny - ny;
double a = (w/2)*(w/2);
double b = (h/2)*(h/2);
signature.asc
Description: Digital signature
