Trying to make qt3 build, with a patch related to the new gcc 4.6.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32604
This commit is contained in:
parent
b7f1724543
commit
bcbe60782b
@ -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;};
|
||||
|
23
pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch
Normal file
23
pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch
Normal file
@ -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
|
Loading…
Reference in New Issue
Block a user