From 23bd7045301397447c44857d1683541e21e26f2d Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 2 Oct 2010 05:24:27 +0000
Subject: [PATCH] qt-4.7.0

svn path=/nixpkgs/trunk/; revision=24024
---
 .../libraries/qt-4.x/4.7/default.nix          | 10 ++++------
 .../libraries/qt-4.x/4.7/phonon-4.4.0.patch   | 19 -------------------
 2 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch

diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix
index 5de15d2f71c3..3a16679ce9f1 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -8,7 +8,7 @@
 , buildDemos ? false, buildExamples ? false, useDocs ? true}:
 
 let
-  v = "4.7.0-rc1";
+  v = "4.7.0";
 in
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz";
-    sha256 = "1bfvd42sdabb86m823yzbzgcy1sibd4ypz2wqaazd77ji768dn2r";
+    sha256 = "0mbr7sjaswkd5gibyb36mlaas049fj8vf2risi66fzfac3amclp0";
   };
 
   preConfigure = ''
@@ -90,12 +90,10 @@ stdenv.mkDerivation rec {
     ${if buildExamples == true then "-make examples" else "-nomake examples"}
     ${if useDocs then "-make docs" else "-nomake docs"}'';
 
-  patches = [ ./phonon-4.4.0.patch ];
-
-  postPatch = ''
+  prePatch = ''
     substituteInPlace configure --replace /bin/pwd pwd
     substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
-    sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
+    sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
   '';
 
   postInstall = ''
diff --git a/pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch b/pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch
deleted file mode 100644
index 50bdf5be1fa7..000000000000
--- a/pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/3rdparty/phonon/phonon/phononnamespace.h b/src/3rdparty/phonon/phonon/phononnamespace.h
-index ec42d51..eb899de 100644
---- a/src/3rdparty/phonon/phonon/phononnamespace.h
-+++ b/src/3rdparty/phonon/phonon/phononnamespace.h
-@@ -41,12 +41,12 @@
- /**
-  * PHONON_VERSION is (major << 16) + (minor << 8) + patch.
-  */
--#define PHONON_VERSION PHONON_VERSION_CHECK(4, 3, 1)
-+#define PHONON_VERSION PHONON_VERSION_CHECK(4, 4, 0)
- 
- /**
-  * PHONON_VERSION_STR is "major.minor.patch". E.g. "4.2.1"
-  */
--#define PHONON_VERSION_STR "4.3.1"
-+#define PHONON_VERSION_STR "4.4.0"
- 
- QT_BEGIN_HEADER
- QT_BEGIN_NAMESPACE