Package: critterding
Version: 1.0-beta12.1-1
Tags: patch
Followup-For: Bug #624965
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Add:
- 10uninitialized_constant
- 11const_cast
Fixes FTBFS. (LP: #770902) (Closes: #624965)
Both patches are backported from upstream svn and are necessary to
resolve FTBFS with g++-4.6. Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
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 1969-12-31 19:00:00.000000000 -0500
+++ critterding-1.0-beta12.1/debian/patches/10uninitialized_constant 2011-09-15 00:02:14.000000000 -0400
@@ -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 1969-12-31 19:00:00.000000000 -0500
+++ critterding-1.0-beta12.1/debian/patches/11const_cast 2011-09-15 00:03:43.000000000 -0400
@@ -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-17 21:01:25.000000000 -0400
+++ critterding-1.0-beta12.1/debian/patches/series 2011-09-14 23:39:04.000000000 -0400
@@ -1 +1,3 @@
00fontandiconpath
+10uninitialized_constant
+11const_cast
