qt-4.7.0-beta2: fool phonon version

Qt guys updated source files but not version number

svn path=/nixpkgs/trunk/; revision=22833

2 files changed, 29 insertions, 14 deletions

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 b28bd064e56..539cd01841c 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -72,11 +72,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ perl ];
 
-  # libQtNetwork will call libQtCore for it to dlopen openssl.
-  NIX_LDFLAGS = "-rpath ${openssl}/lib";
-  # Don't shrink the rpath, to keep ${openssl} in it.
-  dontPatchELF = 1;
-  
   prefixKey = "-prefix ";
 
   configureFlags = ''
@@ -84,17 +79,18 @@ stdenv.mkDerivation rec {
     -system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng
     -opengl -xrender -xrandr -xinerama -xcursor
     -plugin-sql-mysql -system-sqlite
-    -qdbus -cups -glib -xfixes -dbus-linked
+    -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked
     -fontconfig -I${freetype}/include/freetype2
     -exceptions -xmlpatterns
-    -multimedia -audio-backend
-    -phonon -phonon-backend -svg
-    -javascript-jit
+    -multimedia -audio-backend -phonon -phonon-backend
+    -webkit -javascript-jit
     ${if buildDemos == true then "-make demos" else "-nomake demos"}
     ${if buildExamples == true then "-make examples" else "-nomake examples"}
     ${if useDocs then "-make docs" else "-nomake docs"}'';
-    
-  patchPhase = ''
+
+  patches = [ ./phonon-4.4.0.patch ];
+
+  postPatch = ''
     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
@@ -102,12 +98,12 @@ stdenv.mkDerivation rec {
 
   postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else "";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://qt.nokia.com/products;
     description = "A cross-platform application framework for C++";
     license = "GPL/LGPL";
-    maintainers = with stdenv.lib.maintainers; [ urkud sander ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    maintainers = with maintainers; [ urkud sander ];
+    platforms = platforms.mesaPlatforms;
     priority = 10;
   };
 }
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
new file mode 100644
index 00000000000..50bdf5be1fa
--- /dev/null
+++ b/pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch
@@ -0,0 +1,19 @@
+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