[med-svn] r2599 - trunk/packages/sofa-framework/trunk/debian/patches

[domibel-guest at alioth.debian.org]

Author: domibel-guest
Date: 2008-10-30 20:25:53 +0000 (Thu, 30 Oct 2008)
New Revision: 2599

Added:
   trunk/packages/sofa-framework/trunk/debian/patches/22_amd64_segfault.dpatch
   trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch
Log:
add patches


Added: trunk/packages/sofa-framework/trunk/debian/patches/22_amd64_segfault.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/22_amd64_segfault.dpatch	                        (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/22_amd64_segfault.dpatch	2008-10-30 20:25:53 UTC (rev 2599)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22_amd64_segfault.dpatch by  <domibel at sid1500>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix: segfault on amd64 + qt4
+
+ at DPATCH@
+diff -urNad sofa-framework-1.0.0~beta3~/applications/sofa/gui/qt/RealGUI.cpp sofa-framework-1.0.0~beta3/applications/sofa/gui/qt/RealGUI.cpp
+--- sofa-framework-1.0.0~beta3~/applications/sofa/gui/qt/RealGUI.cpp	2008-08-13 17:24:36.000000000 +0200
++++ sofa-framework-1.0.0~beta3/applications/sofa/gui/qt/RealGUI.cpp	2008-10-30 19:37:15.000000000 +0100
+@@ -206,10 +206,10 @@
+       {
+ 	{
+ 	  int argc=1;
+-	  char* argv[1];
++	  char **argv = new char*[2];
+ 	  argv[0] = strdup ( SofaGUI::GetProgramName() );
++	  argv[1]=NULL;
+ 	  application = new QSOFAApplication ( argc,argv );
+-	  free ( argv[0] );
+ 	}
+ 	// create interface
+ 	gui = new RealGUI ( name, options );


Property changes on: trunk/packages/sofa-framework/trunk/debian/patches/22_amd64_segfault.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch	                        (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch	2008-10-30 20:25:53 UTC (rev 2599)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55_fix_mips_sqrt.dpatch by  <domibel at sid1500>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fixes a build error on MIPS and ARM (sqrt/sqrtl)
+
+ at DPATCH@
+diff -urNad sofa-framework-1.0.0~beta3~/framework/sofa/helper/rmath.h sofa-framework-1.0.0~beta3/framework/sofa/helper/rmath.h
+--- sofa-framework-1.0.0~beta3~/framework/sofa/helper/rmath.h	2008-08-12 10:53:41.000000000 +0200
++++ sofa-framework-1.0.0~beta3/framework/sofa/helper/rmath.h	2008-10-30 19:58:09.000000000 +0100
+@@ -132,8 +132,8 @@
+ 
+ inline double rsqrt(const double& a)
+ {
+-#if defined(__GNUC__)
+-    return sqrt(a);
++#if defined(__arm__) || defined(__mips__)
++    return sqrt((double)a);
+ #else
+     return (double)sqrtl((long double)a);
+ #endif


Property changes on: trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch
___________________________________________________________________
Name: svn:executable
   + *