Package: gentle / 1.9+cvs20100605+dfsg1-7

remove_tinyxml.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
Description: Since Debian packaged tinyxml is used there is no point in using
  the code copy provided by gentle upstream

--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,7 @@
 bitmaps/scissors.bmp
 
 
-GENtle_LDADD = $(WX_LIBS) -L/usr/lib -L/usr/local/lib -lsqlite -lsqlite3 -lmysqlclient
+GENtle_LDADD = $(WX_LIBS) -L/usr/lib -L/usr/local/lib -lsqlite -lsqlite3 -lmysqlclient -ltinyxml
 GENtle_LDFLAGS = -s
 GENtle_SOURCES = TXMLfile.cpp\
 TVectorTree.cpp\
@@ -137,10 +137,6 @@
 TPhyloTree.cpp\
 PCR_Troubleshoot.cpp\
 TProteolysis.cpp\
-tinyxml/tinyxmlparser.cpp\
-tinyxml/tinyxmlerror.cpp\
-tinyxml/tinyxml.cpp\
-tinyxml/tinystr.cpp\
 clustalw/alnscore.cpp\
 clustalw/amenu.cpp\
 clustalw/calcgap.cpp\
@@ -235,8 +231,6 @@
 TPhyloTree.h\
 TEliteLaChromLogDialog.h\
 ncoils.h\
-tinyxml/tinyxml.h\
-tinyxml/tinystr.h\
 clustalw/clustalw.h\
 clustalw/dayhoff.h \
 clustalw/general.h \
--- a/main.h
+++ b/main.h
@@ -129,7 +129,11 @@
 
 // Don't you *EVER* turn this on again!!!!
 //#define TIXML_USE_STL
+#ifndef __DEBIAN__
 #include "tinyxml/tinyxml.h"
+#else
+#include "tinyxml.h"
+#endif
 
 #include <wx/wx.h>
 #include <wx/toolbar.h>
--- a/TXMLfile.cpp
+++ b/TXMLfile.cpp
@@ -50,7 +50,7 @@
     analyze ( doc ) ;
     }
 
-void TXMLfile::analyze ( const TiXmlDocument &doc )
+void TXMLfile::analyze ( TiXmlDocument &doc )
     {
     if ( doc.FirstChild ( "GBSeq" ) )
         {
--- a/TXMLfile.h
+++ b/TXMLfile.h
@@ -25,7 +25,7 @@
     TVector *getVector ( int a ) ; ///< Returns pointer to one of the vectors
     
     private :
-    void analyze ( const TiXmlDocument &doc ) ; ///< Parse single/multiple sequences
+    void analyze ( TiXmlDocument &doc ) ; ///< Parse single/multiple sequences
     void readGBSeq ( TiXmlNode *base ) ; ///< The actual parser
     wxString t ( TiXmlText *txt ) ; ///< Safe text conversion
     wxString t ( const char *txt ) ; ///< Safe text conversion