From 17b0f144f71549458898a6cf9d176d349318b7d5 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 11 Nov 2007 15:56:30 +0000
Subject: [PATCH] qt-4 (kde version) upgrade, added libtiff to qt-4
 dependencies

svn path=/nixpkgs/trunk/; revision=9632
---
 pkgs/development/libraries/qt-4/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix             | 4 +---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/qt-4/default.nix b/pkgs/development/libraries/qt-4/default.nix
index 38b1b2b9da78..20893e8d8d9b 100644
--- a/pkgs/development/libraries/qt-4/default.nix
+++ b/pkgs/development/libraries/qt-4/default.nix
@@ -5,14 +5,14 @@ rec {
   propagatedBuildInputs = [libXft libXrender libXrandr randrproto xextproto
   libXinerama xineramaproto libXcursor zlib libjpeg mysql libpng which mesa
   libXmu openssl dbus cups pkgconfig libXext freetype fontconfig inputproto
-  fixesproto libXfixes glib];
+  fixesproto libXfixes glib libtiff];
   prefixKey = "-prefix ";
   configureFlags = "
     -v -no-separate-debug-info -release -nomake examples -nomake demos
     -system-zlib -system-libpng -system-libjpeg -fast
     -qt-gif -confirm-license
     -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
-    -L${mysql}/lib/mysql -I${mysql}/include/mysql -qdbus -cups -glib -xfixes
+    -qdbus -cups -glib -xfixes
     -fontconfig -I${freetype}/include/freetype2";
   patchPhase = "sed -e 's@/bin/pwd@pwd@' -i configure; sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf";
 }; in
@@ -29,9 +29,10 @@ rec {
 	  name = "qt-kde-4.3svn";
 	  src = fetchsvn {
 		  url = svn://anonsvn.kde.org/home/kde/trunk/qt-copy;
-		  md5 = "b0588d8ef36642613bdb92930a2330b4";
+		  rev = "732646";
+		  md5 = "9757de3dce16b483f2f358d287c848ee";
 	  };
-	  patchPhase = "mkdir .svn; bash apply_patches;patch -R -p0 < patches/0172-prefer-xrandr-over-xinerama.diff;" + common.patchPhase;
+	  patchPhase = "mkdir .svn; bash apply_patches;" + common.patchPhase;
 	});
 	default = kde;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01c24a038164..70db0c89bb99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2158,11 +2158,9 @@ rec {
   };
 
   qt4 = getVersion "qt4" qt4_alts;
-  # Builds, but not tested yet
-  # There are two versions: kde and trolltech
   qt4_alts = import ../development/libraries/qt-4 {
 	inherit fetchurl fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus
-	  fontconfig freetype pkgconfig;
+	  fontconfig freetype pkgconfig libtiff;
     inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
 	  libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext
 	  inputproto fixesproto libXfixes;