tags 624965 + patch tags 624965 + pending thanks Dear maintainer,
I've prepared an NMU for critterding (versioned as 1.0-beta12.1-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Beatles
diff -Nru critterding-1.0-beta12.1/debian/changelog critterding-1.0-beta12.1/debian/changelog --- critterding-1.0-beta12.1/debian/changelog 2010-03-18 02:03:30.000000000 +0100 +++ critterding-1.0-beta12.1/debian/changelog 2011-10-23 16:19:10.000000000 +0200 @@ -1,3 +1,15 @@ +critterding (1.0-beta12.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: BulletSoftBody/btSoftBodyInternals.h:175:17: error: + uninitialized const 'zerodummy' [-fpermissive]": + add patches from Ubuntu / Daniel T Chen: + - 10uninitialized_constant + - 11const_cast + Fixes FTBFS. (LP: #770902) (Closes: #624965) + + -- gregor herrmann <gre...@debian.org> Sun, 23 Oct 2011 16:18:07 +0200 + critterding (1.0-beta12.1-1) unstable; urgency=low * New upstream release. diff -Nru critterding-1.0-beta12.1/debian/patches/10uninitialized_constant critterding-1.0-beta12.1/debian/patches/10uninitialized_constant --- critterding-1.0-beta12.1/debian/patches/10uninitialized_constant 1970-01-01 01:00:00.000000000 +0100 +++ critterding-1.0-beta12.1/debian/patches/10uninitialized_constant 2011-10-23 16:18:02.000000000 +0200 @@ -0,0 +1,33 @@ +Description: Fix g++-4.6 error by initializing T +Origin: upstream, http://bullet.googlecode.com/issues/attachment?aid=-7554332888653313858&name=zero_initialize.patch&token=a4c807e33cfb4fe1bb62cf5b13bb1be9, committed r935 in upstream svn +Bug: http://code.google.com/p/bullet/issues/detail?id=481 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624965 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/critterding/+bug/770902 +Forwarded: not-needed +Author: Erwin Coumans <erwin.coum...@gmail.com> +Reviewed-by: Daniel T Chen <crim...@ubuntu.com> +Last-Updated: 2011-09-14 + +Index: critterding-1.0-beta12.1/src/utils/bullet/BulletSoftBody/btSoftBodyInternals.h +=================================================================== +--- critterding-1.0-beta12.1.orig/src/utils/bullet/BulletSoftBody/btSoftBodyInternals.h 2011-09-14 23:18:36.000000000 -0400 ++++ critterding-1.0-beta12.1/src/utils/bullet/BulletSoftBody/btSoftBodyInternals.h 2011-09-14 23:19:13.000000000 -0400 +@@ -25,7 +25,7 @@ + #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" + #include "BulletCollision/CollisionShapes/btConvexInternalShape.h" + #include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h" +- ++#include <string.h> //for memset + // + // btSymMatrix + // +@@ -172,8 +172,7 @@ + template <typename T> + static inline void ZeroInitialize(T& value) + { +- static const T zerodummy; +- value=zerodummy; ++ memset(&value,0,sizeof(T)); + } + // + template <typename T> diff -Nru critterding-1.0-beta12.1/debian/patches/11const_cast critterding-1.0-beta12.1/debian/patches/11const_cast --- critterding-1.0-beta12.1/debian/patches/11const_cast 1970-01-01 01:00:00.000000000 +0100 +++ critterding-1.0-beta12.1/debian/patches/11const_cast 2011-10-23 16:18:02.000000000 +0200 @@ -0,0 +1,20 @@ +Description: Fix missing const parameter with g++-4.5 +Origin: upstream, committed r1123 in upstream svn +Forwarded: not-needed +Author: Daniel T Chen <crim...@ubuntu.com> +Reviewed-by: Daniel T Chen <crim...@ubuntu.com> +Last-Updated: 2011-09-15 + +Index: critterding-1.0-beta12.1/src/scenes/evolution.cpp +=================================================================== +--- critterding-1.0-beta12.1.orig/src/scenes/evolution.cpp 2011-09-14 23:39:17.000000000 -0400 ++++ critterding-1.0-beta12.1/src/scenes/evolution.cpp 2011-09-14 23:39:38.000000000 -0400 +@@ -297,7 +297,7 @@ + } + else if ( world->mouseRayHitEntity->type == 0 ) + { +- CritterB* c = static_cast<const CritterB*>(world->mouseRayHitEntity); ++ const CritterB* c = static_cast<const CritterB*>(world->mouseRayHitEntity); + Textprinter::Instance()->print( oldx+margin, oldy, "critter"); + Textprinter::Instance()->print(oldx+rmargindistance, oldy, "%1i", c->critterID); + Textprinter::Instance()->print( oldx+margin, oldy+vspacer, "energy"); diff -Nru critterding-1.0-beta12.1/debian/patches/series critterding-1.0-beta12.1/debian/patches/series --- critterding-1.0-beta12.1/debian/patches/series 2010-03-18 02:01:25.000000000 +0100 +++ critterding-1.0-beta12.1/debian/patches/series 2011-10-23 16:18:02.000000000 +0200 @@ -1 +1,3 @@ 00fontandiconpath +10uninitialized_constant +11const_cast
signature.asc
Description: Digital signature
