[med-svn] r17969 - in trunk/packages/sofa-framework/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-09-09 13:14:15 +0000 (Tue, 09 Sep 2014)
New Revision: 17969

Added:
   trunk/packages/sofa-framework/trunk/debian/patches/default-arguments-in-definition.patch
   trunk/packages/sofa-framework/trunk/debian/patches/gcc-4-9-workaround.patch
Modified:
   trunk/packages/sofa-framework/trunk/debian/changelog
   trunk/packages/sofa-framework/trunk/debian/patches/series
Log:
Apply patches by Martin Stegh?\195?\182fer <martin at steghoefer.eu> to build with gcc-4.9


Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog	2014-09-09 07:46:09 UTC (rev 17968)
+++ trunk/packages/sofa-framework/trunk/debian/changelog	2014-09-09 13:14:15 UTC (rev 17969)
@@ -1,3 +1,11 @@
+sofa-framework (1.0~beta4-9) UNRELEASED; urgency=medium
+
+  * Apply patches by Martin Steghöfer <martin at steghoefer.eu> to build with
+    gcc-4.9 (thanks to Martin)
+    Closes: #746910
+
+ -- Andreas Tille <tille at debian.org>  Tue, 09 Sep 2014 15:12:35 +0200
+
 sofa-framework (1.0~beta4-8) unstable; urgency=low
 
   * Team upload.

Added: trunk/packages/sofa-framework/trunk/debian/patches/default-arguments-in-definition.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/default-arguments-in-definition.patch	                        (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/default-arguments-in-definition.patch	2014-09-09 13:14:15 UTC (rev 17969)
@@ -0,0 +1,31 @@
+Description: No default arguments in function redeclaration
+ Compilation fix: Default arguments for function parameters are only
+ allowed in the original function declaration, not in redeclarations
+ (like the definition of functions that have already been declared).
+ They are unnecessary anyway because the default parameters have
+ already been set in the function declarations.
+Author: Martin Steghöfer <martin at steghoefer.eu>
+Bug-Debian: https://bugs.debian.org/746910
+
+--- a/framework/sofa/core/objectmodel/Data.h
++++ b/framework/sofa/core/objectmodel/Data.h
+@@ -278,7 +278,7 @@ bool TData<bool>::read( std::string& str
+ /// General case for printing default value
+ template<class T>
+ inline
+-void TData<T>::printValue( std::ostream& out=std::cout ) const
++void TData<T>::printValue( std::ostream& out ) const
+ {
+     out << value() << " ";
+ }
+--- a/modules/sofa/component/misc/Monitor.inl
++++ b/modules/sofa/component/misc/Monitor.inl
+@@ -181,7 +181,7 @@ namespace misc
+ 
+ 	/////////////////////////// fwdDraw () ////////////////////////////////////
+ 	template<class DataTypes>
+-	void Monitor<DataTypes>::fwdDraw ( Pass pass = Std )
++	void Monitor<DataTypes>::fwdDraw ( Pass pass )
+ 	{
+ 		if ( pass == core::VisualModel::Std )
+ 		{			

Added: trunk/packages/sofa-framework/trunk/debian/patches/gcc-4-9-workaround.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/gcc-4-9-workaround.patch	                        (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/gcc-4-9-workaround.patch	2014-09-09 13:14:15 UTC (rev 17969)
@@ -0,0 +1,14 @@
+Description: Workaround for gcc 4.9 bug
+ Workaround for bug #61659 in gcc 4.9.[0|1]:
+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61659
+Author: Martin Steghöfer <martin at steghoefer.eu>
+
+--- a/framework/sofa/core/CollisionModel.cpp
++++ b/framework/sofa/core/CollisionModel.cpp
+@@ -77,3 +77,6 @@ const float* CollisionModel::getColor4f(
+ 
+ } // namespace sofa
+ 
++// workaround for gcc 4.9.[0|1] bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61659
++template class sofa::core::objectmodel::TData<sofa::defaulttype::Vec<4, float> >;
++

Modified: trunk/packages/sofa-framework/trunk/debian/patches/series
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/series	2014-09-09 07:46:09 UTC (rev 17968)
+++ trunk/packages/sofa-framework/trunk/debian/patches/series	2014-09-09 13:14:15 UTC (rev 17969)
@@ -8,3 +8,5 @@
 sofa-framework-gcc-4.7.diff
 sofa-framework-1.0~beta4.libpng15.patch 
 fix-undefined-symbol.patch
+default-arguments-in-definition.patch
+gcc-4-9-workaround.patch