packages: qt/qt.spec, qt/qt-gcc46.patch (NEW) - add gcc46 patch

[cactus]

Author: cactus                       Date: Wed Apr 13 20:59:39 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add gcc46 patch

---- Files affected:
packages/qt:
   qt.spec (1.405 -> 1.406) , qt-gcc46.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/qt/qt.spec
diff -u packages/qt/qt.spec:1.405 packages/qt/qt.spec:1.406
--- packages/qt/qt.spec:1.405	Thu Mar 31 20:13:12 2011
+++ packages/qt/qt.spec	Wed Apr 13 22:59:34 2011
@@ -98,6 +98,7 @@
 Patch17:	qtkdeintegration.patch
 Patch18:	qt3-png14.patch
 Patch19:	qt-buildkey-fixed.patch
+Patch20:	%{name}-gcc46.patch
 URL:		http://www.trolltech.com/products/qt/
 %{?with_ibase:BuildRequires:	Firebird-devel >= 1.5.0}
 BuildRequires:	OpenGL-GLU-devel
@@ -744,6 +745,7 @@
 %patch17 -p0
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 # copy qt kde integration files
 cp %{SOURCE8} %{SOURCE9} src/kernel
@@ -1348,6 +1350,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.406  2011/04/13 20:59:34  cactus
+- add gcc46 patch
+
 Revision 1.405  2011/03/31 18:13:12  arekm
 - release 10
 

================================================================
Index: packages/qt/qt-gcc46.patch
diff -u /dev/null packages/qt/qt-gcc46.patch:1.1
--- /dev/null	Wed Apr 13 22:59:39 2011
+++ packages/qt/qt-gcc46.patch	Wed Apr 13 22:59:34 2011
@@ -0,0 +1,33 @@
+diff -urN qt-ok/src/tools/qmap.h qt-x11-free-3.3.8b/src/tools/qmap.h
+--- qt-ok/src/tools/qmap.h	2008-01-15 20:09:13.000000000 +0100
++++ qt-x11-free-3.3.8b/src/tools/qmap.h	2011-04-13 22:49:13.651871103 +0200
+@@ -52,6 +52,7 @@
+ #ifndef QT_NO_STL
+ #include <iterator>
+ #include <map>
++#include <stddef.h>
+ #endif
+ 
+ //#define QT_CHECK_MAP_RANGE
+diff -urN qt-ok/src/tools/qvaluelist.h qt-x11-free-3.3.8b/src/tools/qvaluelist.h
+--- qt-ok/src/tools/qvaluelist.h	2011-04-13 22:45:09.000000000 +0200
++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h	2011-04-13 22:49:52.386976912 +0200
+@@ -50,6 +50,7 @@
+ #ifndef QT_NO_STL
+ #include <iterator>
+ #include <list>
++#include <stddef.h>
+ #endif
+ 
+ //#define QT_CHECK_VALUELIST_RANGE
+diff -urN qt-ok/src/tools/qvaluevector.h qt-x11-free-3.3.8b/src/tools/qvaluevector.h
+--- qt-ok/src/tools/qvaluevector.h	2008-01-15 20:09:13.000000000 +0100
++++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h	2011-04-13 22:49:25.125729465 +0200
+@@ -47,6 +47,7 @@
+ 
+ #ifndef QT_NO_STL
+ #include <vector>
++#include <stddef.h>
+ #endif
+ 
+ template <class T>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt/qt.spec?r1=1.405&r2=1.406&f=u