diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-09-09 19:42:21 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-09-09 19:42:21 -0500 |
| commit | d9301c40726753022b70cf647f716a71b62f0196 (patch) | |
| tree | 2aea673772e0d925d16de9bfa15df9bcea6cfee1 /arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff | |
| parent | 4ff1177df859e74748a37d5a03447ca200f1ce01 (diff) | |
| parent | 1b2e638684ebbf2b777ead2fbbb4b69f3ac00bcb (diff) | |
| download | tde-packaging-d9301c40726753022b70cf647f716a71b62f0196.tar.gz tde-packaging-d9301c40726753022b70cf647f716a71b62f0196.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff')
| -rw-r--r-- | arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff b/arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff new file mode 100644 index 000000000..caa9bfc44 --- /dev/null +++ b/arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff @@ -0,0 +1,61 @@ +diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qmap.h +--- qt-x11-free-3.3.8b ++++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-05-10 08:47:27.000000000 -0500 +@@ -50,6 +50,7 @@ + #endif // QT_H + + #ifndef QT_NO_STL ++#include <cstddef> + #include <iterator> + #include <map> + #endif +@@ -107,7 +108,7 @@ + #endif + typedef T value_type; + #ifndef QT_NO_STL +- typedef ptrdiff_t difference_type; ++ typedef std::ptrdiff_t difference_type; + #else + typedef int difference_type; + #endif +@@ -223,7 +224,7 @@ + #endif + typedef T value_type; + #ifndef QT_NO_STL +- typedef ptrdiff_t difference_type; ++ typedef std::ptrdiff_t difference_type; + #else + typedef int difference_type; + #endif +@@ -604,7 +605,7 @@ + typedef value_type& reference; + typedef const value_type& const_reference; + #ifndef QT_NO_STL +- typedef ptrdiff_t difference_type; ++ typedef std::ptrdiff_t difference_type; + #else + typedef int difference_type; + #endif +diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluelist.h +--- qt-x11-free-3.3.8b ++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-05-10 08:46:46.000000000 -0500 +@@ -50,6 +50,7 @@ + #ifndef QT_NO_STL + #include <iterator> + #include <list> ++#include <cstddef> + #endif + + //#define QT_CHECK_VALUELIST_RANGE +diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluevector.h +--- qt-x11-free-3.3.8b ++++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-05-10 08:46:46.000000000 -0500 +@@ -244,7 +244,7 @@ + typedef const value_type& const_reference; + typedef size_t size_type; + #ifndef QT_NO_STL +- typedef ptrdiff_t difference_type; ++ typedef std::ptrdiff_t difference_type; + #else + typedef int difference_type; + #endif |