[med-svn] r9119 - trunk/packages/sofa-framework/trunk/debian/patches
Andreas Tille
tille at alioth.debian.org
Wed Dec 28 12:53:03 UTC 2011
Author: tille
Date: 2011-12-28 12:53:02 +0000 (Wed, 28 Dec 2011)
New Revision: 9119
Added:
trunk/packages/sofa-framework/trunk/debian/patches/30_use_debian_packaged_libraries.patch
Removed:
trunk/packages/sofa-framework/trunk/debian/patches/30_newmat.patch
Modified:
trunk/packages/sofa-framework/trunk/debian/patches/10_add_missing_include.patch
trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch
trunk/packages/sofa-framework/trunk/debian/patches/series
Log:
Try to use more Debian packaged libraries (does not build yet)
Modified: trunk/packages/sofa-framework/trunk/debian/patches/10_add_missing_include.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/10_add_missing_include.patch 2011-12-28 10:48:36 UTC (rev 9118)
+++ trunk/packages/sofa-framework/trunk/debian/patches/10_add_missing_include.patch 2011-12-28 12:53:02 UTC (rev 9119)
@@ -11,3 +11,21 @@
#ifdef SOFA_BUILD_CORE
# define SOFA_CORE_API SOFA_EXPORT_DYNAMIC_LIBRARY
+--- sofa-1.0-rc1.orig/applications/projects/Modeler/lib/TutorialSelector.cpp
++++ sofa-1.0-rc1/applications/projects/Modeler/lib/TutorialSelector.cpp
+@@ -26,10 +26,11 @@
+ #include "TutorialSelector.h"
+ #include "iconnode.xpm"
+
+-#include <tinyxml.cpp>
+-#include <tinyxmlerror.cpp>
+-#include <tinystr.cpp>
+-#include <tinyxmlparser.cpp>
++//#include <tinyxml.cpp>
++//#include <tinyxmlerror.cpp>
++//#include <tinystr.cpp>
++//#include <tinyxmlparser.cpp>
++#include <tinyxml.h>
+
+ #include <iostream>
+
Modified: trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch 2011-12-28 10:48:36 UTC (rev 9118)
+++ trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch 2011-12-28 12:53:02 UTC (rev 9119)
@@ -25,3 +25,14 @@
#include <iostream>
#include <set>
+--- sofa-1.0-rc1.orig/applications/projects/Modeler/lib/TutorialSelector.h
++++ sofa-1.0-rc1/applications/projects/Modeler/lib/TutorialSelector.h
+@@ -42,7 +42,7 @@
+
+ //Tinyxml library
+ #include <tinyxml.h>
+-#include <tinystr.h>
++//#include <tinystr.h>
+
+ #include <map>
+
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/30_newmat.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/30_newmat.patch 2011-12-28 10:48:36 UTC (rev 9118)
+++ trunk/packages/sofa-framework/trunk/debian/patches/30_newmat.patch 2011-12-28 12:53:02 UTC (rev 9119)
@@ -1,58 +0,0 @@
---- sofa-1.0-rc1.orig/sofa-dependencies.prf
-+++ sofa-1.0-rc1/sofa-dependencies.prf
-@@ -16,16 +16,21 @@
- declare(thrust, thrust.prf, cuda)
- declare(system-metis, system-metis.prf)
- declare(system-taucs, system-taucs.prf)
-+declare(newmat, newmat.prf)
-+declare(tinyxml, tinyxml.prf)
-+declare(eigen, eigen.prf)
-+declare(qwt, qwt.prf)
-+declare(QGLViewer, QGLViewer.prf)
-
- ######################################################################
- # Extlibs
- ######################################################################
-
--declare(newmat, extlibs/newmat)
--declare(tinyxml, extlibs/tinyxml)
--declare(eigen, extlibs/eigen-3.0.3/eigen.pro)
--declare(qwt, extlibs/qwt-5.2.0/src, qtgui)
--declare(QGLViewer, extlibs/libQGLViewer-2.3.3/QGLViewer, qtgui)
-+#declare(newmat, extlibs/newmat)
-+#declare(tinyxml, extlibs/tinyxml)
-+#declare(eigen, extlibs/eigen-3.0.3/eigen.pro)
-+#declare(qwt, extlibs/qwt-5.2.0/src, qtgui)
-+#declare(QGLViewer, extlibs/libQGLViewer-2.3.3/QGLViewer, qtgui)
- declare(miniFlowVR, extlibs/miniFlowVR, boost)
- declare(csparse, extlibs/csparse)
-
---- /dev/null
-+++ sofa-1.0-rc1/features/sofa/newmat.prf
-@@ -0,0 +1 @@
-+LIBS *= -lnewmat
---- /dev/null
-+++ sofa-1.0-rc1/features/sofa/qwt.prf
-@@ -0,0 +1,3 @@
-+INCLUDEPATH *= /usr/include/qwt-qt4
-+LIBS *= -lqwt-qt4
-+
---- /dev/null
-+++ sofa-1.0-rc1/features/sofa/eigen.prf
-@@ -0,0 +1,8 @@
-+INCLUDEPATH *= /usr/include/eigen3
-+MY_LIBS =
-+MY_LIBRARYPATH =
-+
-+!contains(CONFIGDEBUG, debug) {
-+ DEFINES *= EIGEN_NO_DEBUG
-+}
-+
---- /dev/null
-+++ sofa-1.0-rc1/features/sofa/tinyxml.prf
-@@ -0,0 +1 @@
-+LIBS *= -ltinyxml
---- /dev/null
-+++ sofa-1.0-rc1/features/sofa/QGLViewer.prf
-@@ -0,0 +1 @@
-+LIBS *= -lqglviewer-qt4
Added: trunk/packages/sofa-framework/trunk/debian/patches/30_use_debian_packaged_libraries.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/30_use_debian_packaged_libraries.patch (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/30_use_debian_packaged_libraries.patch 2011-12-28 12:53:02 UTC (rev 9119)
@@ -0,0 +1,60 @@
+--- sofa-1.0-rc1.orig/sofa-dependencies.prf
++++ sofa-1.0-rc1/sofa-dependencies.prf
+@@ -16,16 +16,21 @@
+ declare(thrust, thrust.prf, cuda)
+ declare(system-metis, system-metis.prf)
+ declare(system-taucs, system-taucs.prf)
++declare(newmat, newmat.prf)
++declare(tinyxml, tinyxml.prf)
++declare(eigen, eigen.prf)
++declare(qwt, qwt.prf)
++declare(QGLViewer, QGLViewer.prf)
+
+ ######################################################################
+ # Extlibs
+ ######################################################################
+
+-declare(newmat, extlibs/newmat)
+-declare(tinyxml, extlibs/tinyxml)
+-declare(eigen, extlibs/eigen-3.0.3/eigen.pro)
+-declare(qwt, extlibs/qwt-5.2.0/src, qtgui)
+-declare(QGLViewer, extlibs/libQGLViewer-2.3.3/QGLViewer, qtgui)
++#declare(newmat, extlibs/newmat)
++#declare(tinyxml, extlibs/tinyxml)
++#declare(eigen, extlibs/eigen-3.0.3/eigen.pro)
++#declare(qwt, extlibs/qwt-5.2.0/src, qtgui)
++#declare(QGLViewer, extlibs/libQGLViewer-2.3.3/QGLViewer, qtgui)
+ declare(miniFlowVR, extlibs/miniFlowVR, boost)
+ declare(csparse, extlibs/csparse)
+
+--- /dev/null
++++ sofa-1.0-rc1/features/sofa/newmat.prf
+@@ -0,0 +1 @@
++LIBS *= -lnewmat
+--- /dev/null
++++ sofa-1.0-rc1/features/sofa/qwt.prf
+@@ -0,0 +1,5 @@
++INCLUDEPATH *= /usr/include/qwt-qt4
++INCLUDEPATH *= /usr/include/qt4/Qt
++INCLUDEPATH *= /usr/include/qt4
++LIBS *= -lqwt-qt4
++#INCLUDEPATH *= /usr/include/qt4/QtGui
+--- /dev/null
++++ sofa-1.0-rc1/features/sofa/eigen.prf
+@@ -0,0 +1,8 @@
++INCLUDEPATH *= /usr/include/eigen3
++MY_LIBS =
++MY_LIBRARYPATH =
++
++!contains(CONFIGDEBUG, debug) {
++ DEFINES *= EIGEN_NO_DEBUG
++}
++
+--- /dev/null
++++ sofa-1.0-rc1/features/sofa/tinyxml.prf
+@@ -0,0 +1 @@
++LIBS *= -ltinyxml
+--- /dev/null
++++ sofa-1.0-rc1/features/sofa/QGLViewer.prf
+@@ -0,0 +1 @@
++LIBS *= -lqglviewer-qt4
Modified: trunk/packages/sofa-framework/trunk/debian/patches/series
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/series 2011-12-28 10:48:36 UTC (rev 9118)
+++ trunk/packages/sofa-framework/trunk/debian/patches/series 2011-12-28 12:53:02 UTC (rev 9119)
@@ -4,4 +4,4 @@
10_fix_mips_sqrt.patch
20_ignore_missing_atomicity_h.patch
10_add_missing_include.patch
-30_newmat.patch
+30_use_debian_packaged_libraries.patch
More information about the debian-med-commit
mailing list