[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#611255: GCC 4.6 fix for Qt 3



Package: qt-x11-free

GCC 4.6 is more strict about headers than previous versions.  Programmes that use Qt 3 fail to compile.  This patch fixes the problem.
diff -u qt-x11-free-3.3.8-b/debian/changelog qt-x11-free-3.3.8-b/debian/changelog
--- qt-x11-free-3.3.8-b/debian/changelog
+++ qt-x11-free-3.3.8-b/debian/changelog
@@ -1,3 +1,10 @@
+qt-x11-free (3:3.3.8-b-7ubuntu2) natty; urgency=low
+
+  * Add kubuntu_10_gcc46_includes.diff to fix programmes using Qt3 and
+    compiling with GCC 4.6
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 27 Jan 2011 10:31:32 +0000
+
 qt-x11-free (3:3.3.8-b-7ubuntu1) natty; urgency=low
 
   * Merge with Debian, remaining changes:
diff -u qt-x11-free-3.3.8-b/debian/patches/series qt-x11-free-3.3.8-b/debian/patches/series
--- qt-x11-free-3.3.8-b/debian/patches/series
+++ qt-x11-free-3.3.8-b/debian/patches/series
@@ -61,0 +62 @@
+kubuntu_10_gcc46_includes.diff
only in patch2:
unchanged:
--- qt-x11-free-3.3.8-b.orig/debian/patches/kubuntu_10_gcc46_includes.diff
+++ qt-x11-free-3.3.8-b/debian/patches/kubuntu_10_gcc46_includes.diff
@@ -0,0 +1,20 @@
+--- qt3/src/tools/qvaluelist.h	2008-01-15 19:09:13.000000000 +0000
++++ qt3/src/tools/qvaluelist.h	2011-01-27 10:29:39.559757983 +0000
+@@ -50,6 +50,7 @@
+ #ifndef QT_NO_STL
+ #include <iterator>
+ #include <list>
++#include <cstddef>
+ #endif
+ 
+ //#define QT_CHECK_VALUELIST_RANGE
+--- qt3/src/tools/qmap.h	2008-01-15 19:09:13.000000000 +0000
++++ qt3/src/tools/qmap.h	2011-01-27 10:30:12.087757984 +0000
+@@ -52,6 +52,7 @@
+ #ifndef QT_NO_STL
+ #include <iterator>
+ #include <map>
++#include <cstddef>
+ #endif
+ 
+ //#define QT_CHECK_MAP_RANGE

Reply to: