From 27c9e783c6283f8916ebee3a23c6d1ba909a5126 Mon Sep 17 00:00:00 2001
From: Robert Xu <robxu9@gmail.com>
Date: Sat, 19 Nov 2011 19:30:53 -0500
Subject: Thanks to Andrea Cascio for getting Qt3 3.3.8d building!

---
 opensuse/core/qt3/gcc46.diff | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'opensuse/core/qt3/gcc46.diff')

diff --git a/opensuse/core/qt3/gcc46.diff b/opensuse/core/qt3/gcc46.diff
index beae96ff2..756aadd7b 100644
--- a/opensuse/core/qt3/gcc46.diff
+++ b/opensuse/core/qt3/gcc46.diff
@@ -1,20 +1,8 @@
-Index: src/tools/qvaluelist.h
-===================================================================
---- src/tools/qvaluelist.h.orig	2011-03-31 20:14:47.200973928 +0200
-+++ src/tools/qvaluelist.h	2011-03-31 20:14:55.352615654 +0200
-@@ -50,6 +50,7 @@
- #ifndef QT_NO_STL
- #include <iterator>
- #include <list>
-+#include <cstddef>
- #endif
- 
- //#define QT_CHECK_VALUELIST_RANGE
 Index: src/tools/qvaluevector.h
 ===================================================================
 --- src/tools/qvaluevector.h.orig	2008-01-15 20:09:13.000000000 +0100
 +++ src/tools/qvaluevector.h	2011-03-31 20:15:15.904712567 +0200
-@@ -244,7 +244,7 @@ public:
+@@ -246,7 +246,7 @@ public:
      typedef const value_type& const_reference;
      typedef size_t size_type;
  #ifndef QT_NO_STL
@@ -27,7 +15,7 @@ Index: src/tools/qmap.h
 ===================================================================
 --- src/tools/qmap.h.orig	2008-01-15 20:09:13.000000000 +0100
 +++ src/tools/qmap.h	2011-03-31 20:24:35.802101605 +0200
-@@ -107,7 +107,7 @@ class QMapIterator
+@@ -108,7 +108,7 @@ class QMapIterator
  #endif
      typedef T          value_type;
  #ifndef QT_NO_STL
@@ -36,7 +24,7 @@ Index: src/tools/qmap.h
  #else
      typedef int difference_type;
  #endif
-@@ -223,7 +223,7 @@ class QMapConstIterator
+@@ -224,7 +224,7 @@ class QMapConstIterator
  #endif
      typedef T          value_type;
  #ifndef QT_NO_STL
@@ -45,7 +33,7 @@ Index: src/tools/qmap.h
  #else
      typedef int difference_type;
  #endif
-@@ -604,7 +604,7 @@ public:
+@@ -605,7 +605,7 @@ public:
      typedef value_type& reference;
      typedef const value_type& const_reference;
  #ifndef QT_NO_STL
-- 
cgit v1.2.1