[critterding] 01/04: Imported Debian patch 1.0-beta12.1-1.1

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script.

gg0-guest pushed a commit to branch master
in repository critterding.

commit 5e6b24a92a29abfe77f6aede00ca2eabc136c0c6
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Oct 23 16:18:07 2011 +0200

    Imported Debian patch 1.0-beta12.1-1.1
---
 debian/changelog                        | 12 ++++++++++++
 debian/patches/10uninitialized_constant | 33 +++++++++++++++++++++++++++++++++
 debian/patches/11const_cast             | 20 ++++++++++++++++++++
 debian/patches/series                   |  2 ++
 4 files changed, 67 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dd8a4b2..9281f5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <gregoa at debian.org>  Sun, 23 Oct 2011 16:18:07 +0200
+
 critterding (1.0-beta12.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/10uninitialized_constant b/debian/patches/10uninitialized_constant
new file mode 100644
index 0000000..327a938
--- /dev/null
+++ b/debian/patches/10uninitialized_constant
@@ -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.coumans at gmail.com>
+Reviewed-by: Daniel T Chen <crimsun at 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 --git a/debian/patches/11const_cast b/debian/patches/11const_cast
new file mode 100644
index 0000000..a35097d
--- /dev/null
+++ b/debian/patches/11const_cast
@@ -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 <crimsun at ubuntu.com>
+Reviewed-by: Daniel T Chen <crimsun at 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 --git a/debian/patches/series b/debian/patches/series
index ef20dbc..2b9e82f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 00fontandiconpath
+10uninitialized_constant
+11const_cast

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/critterding.git