Bug#667118: blockattack: diff for NMU version 1.4.1+ds1-2.1

[Jonathan Wiltshire]

tags 667118 + pending
thanks

Dear maintainer,

I've prepared an NMU for blockattack (versioned as 1.4.1+ds1-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

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-05-13 15:19:14.000000000 +0100
@@ -1,3 +1,12 @@
+blockattack (1.4.1+ds1-2.1) unstable; urgency=low
+
+  [ Cyril Brulebois ]
+  * Non-maintainer upload.
+  * Fix FTBFS with gcc 4.7 by adding “this->” when appropriate
+    (Closes: #667118).
+
+ -- Jonathan Wiltshire <jmw at debian.org>  Sun, 13 May 2012 15:19:11 +0100
+
 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 01:00:00.000000000 +0100
+++ blockattack-1.4.1+ds1/debian/patches/gcc47.diff	2012-05-13 15:19:00.000000000 +0100
@@ -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-05-13 15:19:00.000000000 +0100
@@ -2,3 +2,4 @@
 fix-scons-paths.patch
 fix-spelling-errors.patch
 enet-1.3.1.patch
+gcc47.diff