Author: domibel-guest
Date: 2008-11-19 01:24:43 +0000 (Wed, 19 Nov 2008)
New Revision: 2706
Added:
trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch
Modified:
trunk/packages/sofa-framework/trunk/debian/changelog
trunk/packages/sofa-framework/trunk/debian/patches/00list
Log:
Added #include headers required by GCC 4.4
Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog 2008-11-18
22:17:16 UTC (rev 2705)
+++ trunk/packages/sofa-framework/trunk/debian/changelog 2008-11-19
01:24:43 UTC (rev 2706)
@@ -1,5 +1,6 @@
-sofa-framework (1.0~beta3-5) UNRELEASED; urgency=low
+sofa-framework (1.0~beta3-5) unstable; urgency=low
+ * set SOFA_QT4 explicitly, Added #include headers required by GCC 4.4
(Closes: #505953)
* missing PML files added
* fixeded sofa wrapper
Modified: trunk/packages/sofa-framework/trunk/debian/patches/00list
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/00list 2008-11-18
22:17:16 UTC (rev 2705)
+++ trunk/packages/sofa-framework/trunk/debian/patches/00list 2008-11-19
01:24:43 UTC (rev 2706)
@@ -1,3 +1,4 @@
+13_gcc4.4.dpatch
22_amd64_segfault.dpatch
25_newmat.dpatch
#10changes.dpatch
Added: trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch
(rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch
2008-11-19 01:24:43 UTC (rev 2706)
@@ -0,0 +1,63 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_gcc4.4.dpatch by <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad sofa-framework-1.0~beta3~/framework/sofa/helper/Quater.inl
sofa-framework-1.0~beta3/framework/sofa/helper/Quater.inl
+--- sofa-framework-1.0~beta3~/framework/sofa/helper/Quater.inl 2008-08-12
08:53:41.000000000 +0000
++++ sofa-framework-1.0~beta3/framework/sofa/helper/Quater.inl 2008-11-19
01:18:38.000000000 +0000
+@@ -28,6 +28,7 @@
+ #define SOFA_HELPER_QUATER_INL
+
+ #include "Quater.h"
++#include <cstdio>
+ #include <math.h>
+ #include <iostream>
+
+diff -urNad sofa-framework-1.0~beta3~/framework/sofa/helper/gl/Capture.cpp
sofa-framework-1.0~beta3/framework/sofa/helper/gl/Capture.cpp
+--- sofa-framework-1.0~beta3~/framework/sofa/helper/gl/Capture.cpp
2008-08-12 08:53:40.000000000 +0000
++++ sofa-framework-1.0~beta3/framework/sofa/helper/gl/Capture.cpp
2008-11-19 01:17:55.000000000 +0000
+@@ -30,6 +30,7 @@
+ #include <sofa/helper/io/ImagePNG.h>
+ #endif
+
++#include <cstdio>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+diff -urNad sofa-framework-1.0~beta3~/framework/sofa/helper/io/ImageBMP.cpp
sofa-framework-1.0~beta3/framework/sofa/helper/io/ImageBMP.cpp
+--- sofa-framework-1.0~beta3~/framework/sofa/helper/io/ImageBMP.cpp
2008-08-12 08:53:40.000000000 +0000
++++ sofa-framework-1.0~beta3/framework/sofa/helper/io/ImageBMP.cpp
2008-11-19 01:17:17.000000000 +0000
+@@ -26,6 +26,7 @@
+
******************************************************************************/
+ #include <sofa/helper/io/ImageBMP.h>
+ #include <sofa/helper/system/FileRepository.h>
++#include <cstdio>
+ #include <iostream>
+
+ namespace sofa
+diff -urNad sofa-framework-1.0~beta3~/framework/sofa/helper/io/MeshTrian.cpp
sofa-framework-1.0~beta3/framework/sofa/helper/io/MeshTrian.cpp
+--- sofa-framework-1.0~beta3~/framework/sofa/helper/io/MeshTrian.cpp
2008-08-12 08:53:40.000000000 +0000
++++ sofa-framework-1.0~beta3/framework/sofa/helper/io/MeshTrian.cpp
2008-11-19 01:18:18.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include <sofa/helper/io/MeshTrian.h>
+ #include <sofa/helper/system/FileRepository.h>
+ #include <stdlib.h>
++#include <cstdio>
+ #include <iostream>
+ #include <string>
+
+diff -urNad sofa-framework-1.0~beta3~/sofa.cfg
sofa-framework-1.0~beta3/sofa.cfg
+--- sofa-framework-1.0~beta3~/sofa.cfg 2008-08-12 08:56:12.000000000 +0000
++++ sofa-framework-1.0~beta3/sofa.cfg 2008-11-19 01:19:19.000000000 +0000
+@@ -19,7 +19,7 @@
+
+ # Auto-detect Qt 4.x
+ # The QT variable was introduced in Qt 4
+-!isEmpty(QT): DEFINES += SOFA_QT4
++DEFINES += SOFA_QT4
+
+ !include( sofa-local.cfg ) {
+ # Copy sofa-default.cfg to sofa-local.cfg and modify it to change local
options
Property changes on:
trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch
___________________________________________________________________
Name: svn:executable
+ *
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
