tag 667422 patch
thanks

Matthias Klose <d...@debian.org> (03/04/2012):
> Package: xmoto
> Version: 0.5.5-1
> Severity: important
> Tags: sid wheezy
> User: debian-...@lists.debian.org
> Usertags: ftbfs-gcc-4.7

Please find attached a patch to fix this FTBFS (which hopefully does the
right thing, but no runtime tests were performed). I don't intend to
NMU.

Mraw,
KiBi.
--- xmoto-0.5.5/debian/changelog
+++ xmoto-0.5.5/debian/changelog
@@ -1,3 +1,11 @@
+xmoto (0.5.5-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with gcc 4.7 due to redeclared variable name in nested
+    scopes, by renaming the inner variable from i to j (Closes: #667422).
+
+ -- Cyril Brulebois <k...@debian.org>  Wed, 04 Apr 2012 14:31:13 +0000
+
 xmoto (0.5.5-1) unstable; urgency=low
 
   * Team upload.
--- xmoto-0.5.5/src/xmscene/GhostTrail.cpp
+++ xmoto-0.5.5/src/xmscene/GhostTrail.cpp
@@ -84,7 +84,7 @@
       }
       
       // check if new position vector is very near the next simplifiedtrailData, else pushback vectors in its direction, assume 0.2
-      int i=0;
+      int j=0;
       do {
 	// so lets push back new vector2fsm untilk we're near the next point on the simplified trail
 	v_P_new.x = (v_vecTmp.x / v_vecTmp.length()) * v_time + v_P_old.x;
@@ -93,13 +93,13 @@
 	m_interpolatedTrailData.push_back(v_P_new);
 	v_P_old = v_P_new;
 	
-	i++;
-	v_checkTeleport = Vector2f( m_trailData[i].x -  v_P_old.x, m_trailData[i].y - v_P_old.y);
+	j++;
+	v_checkTeleport = Vector2f( m_trailData[j].x -  v_P_old.x, m_trailData[j].y - v_P_old.y);
 	if( v_checkTeleport.length() > 5 ) {
 	  continue;  
 	}
 	
-      } while( i<int(v_vecTmp.length()/v_time) );
+      } while( j<int(v_vecTmp.length()/v_time) );
     }
     
     // now smoothen path in time: cumulate Vector.length, every n length pushBack median

Attachment: signature.asc
Description: Digital signature

Reply via email to