tag 667118 patch thanks Matthias Klose <d...@debian.org> (03/04/2012): > Package: blockattack > Version: 1.4.1+ds1-2 > Severity: important > Tags: sid wheezy > User: debian-...@lists.debian.org > Usertags: ftbfs-gcc-4.7
Here's a patch to fix this FTBFS. No intent to NMU. Mraw, KiBi.
diff -Nru blockattack-1.4.1+ds1/debian/changelog blockattack-1.4.1+ds1/debian/changelog --- blockattack-1.4.1+ds1/debian/changelog 2011-03-12 18:04:29.000000000 +0000 +++ blockattack-1.4.1+ds1/debian/changelog 2012-04-04 22:44:38.000000000 +0000 @@ -1,3 +1,11 @@ +blockattack (1.4.1+ds1-2.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with gcc 4.7 by adding “this->” when appropriate + (Closes: #667118). + + -- Cyril Brulebois <k...@debian.org> Wed, 04 Apr 2012 22:44:04 +0000 + blockattack (1.4.1+ds1-2) unstable; urgency=low * Team upload. diff -Nru blockattack-1.4.1+ds1/debian/patches/gcc47.diff blockattack-1.4.1+ds1/debian/patches/gcc47.diff --- blockattack-1.4.1+ds1/debian/patches/gcc47.diff 1970-01-01 00:00:00.000000000 +0000 +++ blockattack-1.4.1+ds1/debian/patches/gcc47.diff 2012-04-04 22:43:46.000000000 +0000 @@ -0,0 +1,29 @@ +--- a/source/code/physfs_stream.hpp ++++ b/source/code/physfs_stream.hpp +@@ -196,7 +196,7 @@ namespace PhysFS + } + + char_type* xend = (static_cast<size_t> (objectsRead) == BUF_SIZE) ? &*_buf.end() : &_buf[objectsRead]; +- setg(&*_buf.begin(), &*_buf.begin(), xend); ++ this->setg(&*_buf.begin(), &*_buf.begin(), xend); + + return traits_type::to_int_type(_buf.front()); + } +@@ -212,7 +212,7 @@ namespace PhysFS + } + + // the seek invalidated the buffer +- setg(&*_buf.begin(), &*_buf.begin(), &*_buf.begin()); ++ this->setg(&*_buf.begin(), &*_buf.begin(), &*_buf.begin()); + return pos; + } + +@@ -277,7 +277,7 @@ namespace PhysFS + } + + char_type* xend = (static_cast<size_t> (res) == BUF_SIZE) ? &*_buf.end() : &_buf[res]; +- setp(&*_buf.begin(), xend); ++ this->setp(&*_buf.begin(), xend); + return 0; + } + diff -Nru blockattack-1.4.1+ds1/debian/patches/series blockattack-1.4.1+ds1/debian/patches/series --- blockattack-1.4.1+ds1/debian/patches/series 2011-03-12 18:00:28.000000000 +0000 +++ blockattack-1.4.1+ds1/debian/patches/series 2012-04-04 22:42:50.000000000 +0000 @@ -2,3 +2,4 @@ fix-scons-paths.patch fix-spelling-errors.patch enet-1.3.1.patch +gcc47.diff
signature.asc
Description: Digital signature
