tag 667425 patch thanks Matthias Klose <d...@debian.org> (03/04/2012): > Package: xshisen > Version: 1:1.51-3.2 > Severity: important > Tags: sid wheezy > User: debian-...@lists.debian.org > Usertags: ftbfs-gcc-4.7
Here's a patch to fix this FTBFS; I don't intend to NMU. It would make sense to get rid of simple-patchsys given: - it's deprecated; - 3.0 (quilt) is already selected. Mraw, KiBi.
diff -Nru xshisen-1.51/debian/changelog xshisen-1.51/debian/changelog --- xshisen-1.51/debian/changelog 2011-11-24 20:41:22.000000000 +0000 +++ xshisen-1.51/debian/changelog 2012-04-04 14:03:41.000000000 +0000 @@ -1,3 +1,10 @@ +xshisen (1:1.51-3.3) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with gcc 4.7 by using “this->foo” where needed (Closes: #667425). + + -- Cyril Brulebois <k...@debian.org> Wed, 04 Apr 2012 14:02:59 +0000 + xshisen (1:1.51-3.2) unstable; urgency=low * Non-maintainer upload. diff -Nru xshisen-1.51/debian/patches/fix-ftbfs-with-gcc-4.7 xshisen-1.51/debian/patches/fix-ftbfs-with-gcc-4.7 --- xshisen-1.51/debian/patches/fix-ftbfs-with-gcc-4.7 1970-01-01 00:00:00.000000000 +0000 +++ xshisen-1.51/debian/patches/fix-ftbfs-with-gcc-4.7 2012-04-04 14:06:18.000000000 +0000 @@ -0,0 +1,46 @@ +Description: Fix FTBFS with gcc 4.7 by using “this->foo” where needed (Closes: #667425). +Author: Cyril Brulebois <k...@debian.org> +Bug-Debian: http://bugs.debian.org/667425 + +--- a/body.C ++++ b/body.C +@@ -40,13 +40,13 @@ Body::Body(int g, int x, int y, Widget p + { + int i, num_each; + +- pie = new (Mahjong** [xsize]); +- initialp = new (Mahjong** [xsize]); +- pstatus = new (unsigned char* [xsize]); ++ pie = new (Mahjong** [this->xsize]); ++ initialp = new (Mahjong** [this->xsize]); ++ pstatus = new (unsigned char* [this->xsize]); + for(i=0; i<xsize; i++) { +- pie[i] = new (Mahjong* [ysize]); +- initialp[i] = new (Mahjong* [ysize]); +- pstatus[i] = new unsigned char [ysize]; ++ pie[i] = new (Mahjong* [this->ysize]); ++ initialp[i] = new (Mahjong* [this->ysize]); ++ pstatus[i] = new unsigned char [this->ysize]; + } + num_each = x*y/PKIND; + for(i=0; i<PKIND; i++) { +@@ -146,13 +146,13 @@ Body::ChangeGame(int g, int x, int y) + delete[] initialp; + delete[] pstatus; + +- pie = new (Mahjong** [xsize]); +- initialp = new (Mahjong** [xsize]); +- pstatus = new (unsigned char* [xsize]); ++ pie = new (Mahjong** [this->xsize]); ++ initialp = new (Mahjong** [this->xsize]); ++ pstatus = new (unsigned char* [this->xsize]); + for(i=0; i<xsize; i++) { +- pie[i] = new (Mahjong* [ysize]); +- initialp[i] = new (Mahjong* [ysize]); +- pstatus[i] = new unsigned char [ysize]; ++ pie[i] = new (Mahjong* [this->ysize]); ++ initialp[i] = new (Mahjong* [this->ysize]); ++ pstatus[i] = new unsigned char [this->ysize]; + } + num_each = x*y/PKIND; + for(i=0; i<PKIND; i++) { diff -Nru xshisen-1.51/debian/patches/series xshisen-1.51/debian/patches/series --- xshisen-1.51/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ xshisen-1.51/debian/patches/series 2012-04-04 14:03:58.000000000 +0000 @@ -0,0 +1 @@ +fix-ftbfs-with-gcc-4.7
signature.asc
Description: Digital signature
