On 05/10/2011 08:40 AM, David C. Rankin wrote:
> On 05/09/2011 07:27 PM, Baho Utot wrote:
>
>> Here is the correct patch...
>>
>> --- qt-x11-free-3.3.8b/src/tools/qmap.h~ 2008-01-15 19:09:13.000000000 +0000
>> +++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-04-11 00:16:04.000000000 +0100
>> @@ -50,6 +50,7 @@
>> #endif // QT_H
>>
>> #ifndef QT_NO_STL
>> +#include <cstddef>
>> #include <iterator>
>> #include <map>
>> #endif
>> --- qt-x11-free-3.3.8b/src/tools/qvaluelist.h~ 2008-01-15 19:09:13.000000000
>> +0000
>> +++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-04-11 00:16:49.000000000 +0100
>> @@ -48,6 +48,7 @@
>> #endif // QT_H
>>
>> #ifndef QT_NO_STL
>> +#include <cstddef>
>> #include <iterator>
>> #include <list>
>> #endif
>>
>> I am rebuilding qt3 with the correct patch as we speak
>>
>
> Baho,
>
> We need to blend your patch with this one:
>
> http://svn.trinitydesktop.org/svn/trinity-packaging/arch/master/trinity-qt3/gcc46.diff
>
>
>
>

Here is what I come up with (do you see anything wrong with doing it this way?):

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


-- 
David C. Rankin, J.D.,P.E.