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

[Andreas Tille]

Author: tille
Date: 2011-12-19 15:41:17 +0000 (Mon, 19 Dec 2011)
New Revision: 9048

Removed:
   trunk/packages/sofa-framework/trunk/debian/patches/qwt5-qt4.patch
   trunk/packages/sofa-framework/trunk/debian/patches/tinyxml26.diff
Modified:
   trunk/packages/sofa-framework/trunk/debian/patches/series
Log:
Removed two patches which are handled upstream


Deleted: trunk/packages/sofa-framework/trunk/debian/patches/qwt5-qt4.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/qwt5-qt4.patch	2011-12-19 15:36:02 UTC (rev 9047)
+++ trunk/packages/sofa-framework/trunk/debian/patches/qwt5-qt4.patch	2011-12-19 15:41:17 UTC (rev 9048)
@@ -1,28 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Changed: Tue, 13 Dec 2011 12:55:52 +0100
-Description: Sofa does not build properly with
- libqwt-dev so adjusting include directory and fixing some header
- file is needed
-
---- sofa-framework-1.0~beta4.orig/applications/sofa/gui/qt/GraphDataWidget.h
-+++ sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphDataWidget.h
-@@ -33,6 +33,8 @@
- #include <qwt_plot.h>
- #include <qwt_legend.h>
- #include <qwt_scale_engine.h>
-+#include <qwt_data.h>
-+#include <qwt_double_rect.h>
- 
- namespace sofa
- {
---- sofa-framework-1.0~beta4.orig/sofa.cfg
-+++ sofa-framework-1.0~beta4/sofa.cfg
-@@ -212,7 +212,7 @@
-                $$SOFA_DIR/modules \
-                $$SOFA_DIR/applications \
-                /usr/include/qt4 \
--               /usr/include/qwt
-+               /usr/include/qwt-qt4
- 
- 
- 

Modified: trunk/packages/sofa-framework/trunk/debian/patches/series
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/series	2011-12-19 15:36:02 UTC (rev 9047)
+++ trunk/packages/sofa-framework/trunk/debian/patches/series	2011-12-19 15:41:17 UTC (rev 9048)
@@ -4,5 +4,3 @@
 10_fix_mips_sqrt.patch
 20_ignore_missing_atomicity_h.patch
 10_add_missing_include.patch
-tinyxml26.diff
-qwt5-qt4.patch

Deleted: trunk/packages/sofa-framework/trunk/debian/patches/tinyxml26.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/tinyxml26.diff	2011-12-19 15:36:02 UTC (rev 9047)
+++ trunk/packages/sofa-framework/trunk/debian/patches/tinyxml26.diff	2011-12-19 15:41:17 UTC (rev 9048)
@@ -1,48 +0,0 @@
---- a/applications/sofa/gui/qt/GraphVisitor.cpp
-+++ b/applications/sofa/gui/qt/GraphVisitor.cpp
-@@ -207,10 +207,10 @@
- 	Q3ListViewItem *graphNode=NULL;
- 	switch (typeOfNode)
- 	  {
--	  case TiXmlNode::DOCUMENT:
-+	  case TiXmlNode::TINYXML_DOCUMENT:
- 	    break;
- 
--	  case TiXmlNode::ELEMENT:
-+	  case TiXmlNode::TINYXML_ELEMENT:
-             if (nameOfNode == "Time")
-               {
-                 openTime( node, parent);
-@@ -222,17 +222,17 @@
-               }
- 	    break;
- 
--	  case TiXmlNode::COMMENT:
-+	  case TiXmlNode::TINYXML_COMMENT:
- 	    graphNode = addComment(parent, elementAbove, nameOfNode); 
- 	    break;
- 
--	  case TiXmlNode::UNKNOWN:
-+	  case TiXmlNode::TINYXML_UNKNOWN:
- 	    break;
- 
--	  case TiXmlNode::TEXT:
-+	  case TiXmlNode::TINYXML_TEXT:
- 	    break;
- 
--	  case TiXmlNode::DECLARATION:
-+	  case TiXmlNode::TINYXML_DECLARATION:
- 	    break;
- 	  default:
- 	    break;
---- a/modules/sofa/simulation/tree/xml/XML.cpp
-+++ b/modules/sofa/simulation/tree/xml/XML.cpp
-@@ -84,7 +84,7 @@
- BaseElement* createNode(TiXmlNode* root, const char *basefilename, bool isRoot = false)
- {
- 	//if (!xmlStrcmp(root->name,(const xmlChar*)"text")) return NULL;
--    if (root->Type() != TiXmlNode::ELEMENT) return NULL;
-+    if (root->Type() != TiXmlNode::TINYXML_ELEMENT) return NULL;
- 	TiXmlElement* element = root->ToElement();
- 	if (!element || !element->Value() || !element->Value()[0]) return NULL;
-