From bcbe60782bbfb118bdf5305ab2e733b960d9c679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 26 Feb 2012 21:27:15 +0000
Subject: [PATCH] Trying to make qt3 build, with a patch related to the new gcc
 4.6.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32604
---
 pkgs/development/libraries/qt-3/default.nix   |  3 +++
 .../libraries/qt-3/qt3-gcc4.6.0.patch         | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch

diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index e023235b936..c9cb14030a5 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -62,6 +62,9 @@ stdenv.mkDerivation {
     
     # randr.h and Xrandr.h need not be in the same prefix.
     ./xrandr.patch
+
+    # Make it build with gcc 4.6.0
+    ./qt3-gcc4.6.0.patch
   ];
 
   passthru = {inherit mysqlSupport;};
diff --git a/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch b/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch
new file mode 100644
index 00000000000..c1a903c130c
--- /dev/null
+++ b/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch
@@ -0,0 +1,23 @@
+I picked it here:
+https://bugs.archlinux.org/task/23915
+
+--- 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