diff options
author | Khem Raj <raj.khem@gmail.com> | 2010-10-26 16:42:31 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2010-10-26 16:43:08 -0700 |
commit | d9f64014e9c71383a58536716181e12ecf063f0a (patch) | |
tree | 1eec0d1318e8257b4978720e1afe64d3ad1ae89b /recipes | |
parent | a578c12219dd4b29264ae8f914cb6d2e72d7102b (diff) | |
download | openembedded-d9f64014e9c71383a58536716181e12ecf063f0a.tar.gz |
ubahnnav_0.4.1.bb: Fix complilation with gcc 4.5
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes')
-rw-r--r-- | recipes/ubahnnav/ubahnnav/gcc45-compilation-fixes.patch | 109 | ||||
-rw-r--r-- | recipes/ubahnnav/ubahnnav_0.4.1.bb | 6 |
2 files changed, 113 insertions, 2 deletions
diff --git a/recipes/ubahnnav/ubahnnav/gcc45-compilation-fixes.patch b/recipes/ubahnnav/ubahnnav/gcc45-compilation-fixes.patch new file mode 100644 index 0000000000..73e46b5441 --- /dev/null +++ b/recipes/ubahnnav/ubahnnav/gcc45-compilation-fixes.patch @@ -0,0 +1,109 @@ +Index: ubahnnav-0.4.1/src/libsubwaymap/baseclasses.cpp +=================================================================== +--- ubahnnav-0.4.1.orig/src/libsubwaymap/baseclasses.cpp ++++ ubahnnav-0.4.1/src/libsubwaymap/baseclasses.cpp +@@ -493,7 +493,7 @@ int String::strnicmp(const char *rval, i + + + +-ostream& operator<<(ostream& os, const String& s) ++std::ostream& operator<<(std::ostream& os, const String& s) + { + return os << s._string; + } +Index: ubahnnav-0.4.1/src/libsubwaymap/baseclasses.h +=================================================================== +--- ubahnnav-0.4.1.orig/src/libsubwaymap/baseclasses.h ++++ ubahnnav-0.4.1/src/libsubwaymap/baseclasses.h +@@ -36,12 +36,14 @@ + #include <time.h> + #include <stdio.h> + +-#include <iostream.h> ++#include <iostream> + + #ifdef MPATROL + #include <mp/mpatrol.h> + #endif + ++using namespace std; ++ + class ObjectList; + class ObjectListIterator; + class ObjectListContainer; +Index: ubahnnav-0.4.1/src/libsubwaymap/debug.h +=================================================================== +--- ubahnnav-0.4.1.orig/src/libsubwaymap/debug.h ++++ ubahnnav-0.4.1/src/libsubwaymap/debug.h +@@ -21,7 +21,7 @@ + #ifndef __DEBUG_H__ + #define __DEBUG_H__ + +- ++using namespace std; + #include "baseclasses.h" + + class Debug : public Object +Index: ubahnnav-0.4.1/src/libsubwaymap/subwaymap/SMXMLWriter.h +=================================================================== +--- ubahnnav-0.4.1.orig/src/libsubwaymap/subwaymap/SMXMLWriter.h ++++ ubahnnav-0.4.1/src/libsubwaymap/subwaymap/SMXMLWriter.h +@@ -23,15 +23,15 @@ + + #include "baseclasses.h" + #include "SMError.h" +-#include <iostream.h> +-#include <fstream.h> ++#include <iostream> ++#include <fstream> + + +-class SMXMLWriter : public ofstream ++class SMXMLWriter : public std::ofstream + { + public: +- SMXMLWriter(const char *filename) : ofstream(filename) { +- *this<< "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>" << endl <<endl; ++ SMXMLWriter(const char *filename) : std::ofstream(filename) { ++ *this<< "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>" << std::endl <<std::endl; + } + protected: + +Index: ubahnnav-0.4.1/src/libsubwaymap/subwaymap/SubwayMap.h +=================================================================== +--- ubahnnav-0.4.1.orig/src/libsubwaymap/subwaymap/SubwayMap.h ++++ ubahnnav-0.4.1/src/libsubwaymap/subwaymap/SubwayMap.h +@@ -25,6 +25,7 @@ + #include "SMError.h" + #include "SMXMLWriter.h" + ++using namespace std; + + enum eDirection { + both=0, // search in both directions +Index: ubahnnav-0.4.1/src/libsubwaymap/subwaymap/XMLBase.h +=================================================================== +--- ubahnnav-0.4.1.orig/src/libsubwaymap/subwaymap/XMLBase.h ++++ ubahnnav-0.4.1/src/libsubwaymap/subwaymap/XMLBase.h +@@ -21,7 +21,7 @@ + #ifndef __XMLBASE_H__ + #define __XMLBASE_H__ + +-#include <iostream.h> ++#include <iostream> + #include "baseclasses.h" + + +Index: ubahnnav-0.4.1/src/ubahnnav/UBahnNavMain.cpp +=================================================================== +--- ubahnnav-0.4.1.orig/src/ubahnnav/UBahnNavMain.cpp ++++ ubahnnav-0.4.1/src/ubahnnav/UBahnNavMain.cpp +@@ -18,7 +18,7 @@ + ######################################################################### + */ + +-#include <iostream.h> ++#include <iostream> + #include <qmessagebox.h> + #include <qdatetime.h> + diff --git a/recipes/ubahnnav/ubahnnav_0.4.1.bb b/recipes/ubahnnav/ubahnnav_0.4.1.bb index 72f882b5f2..89d91fbc7b 100644 --- a/recipes/ubahnnav/ubahnnav_0.4.1.bb +++ b/recipes/ubahnnav/ubahnnav_0.4.1.bb @@ -10,10 +10,12 @@ LICENSE = "GPL" APPNAME = "ubahnnav" APPTYPE = "binary" APPDESKTOP = "${S}/src/ubahnnav" -PR = "r0" +PR = "r1" SRC_URI = "http://ubahnstation.net/source/ubahnnav-${PV}.tar.gz \ - file://qmake.patch" + file://qmake.patch \ + file://gcc45-compilation-fixes.patch \ + " S = "${WORKDIR}/ubahnnav-${PV}" inherit opie |