From 8dd9e323ff658e34983add17df99bcdedadd540b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 12 Dec 2007 00:21:12 +0000
Subject: [PATCH] qt-4: 4.3.3 and sv-746559

svn path=/nixpkgs/branches/stdenv-updates/; revision=9915
---
 .../development/libraries/qt-4/.default.nix.swp | Bin 0 -> 12288 bytes
 pkgs/development/libraries/qt-4/default.nix     |  12 ++++++------
 2 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-4/.default.nix.swp

diff --git a/pkgs/development/libraries/qt-4/.default.nix.swp b/pkgs/development/libraries/qt-4/.default.nix.swp
new file mode 100644
index 0000000000000000000000000000000000000000..0e8df16d5e854f37afa8f5fe259e20769cb945f0
GIT binary patch
literal 12288
zcmeI2zmFU>6vusOq60z@`~&6^5eS-@-MzhESw%Vl3b`N@8W7@#kax!OV|T{mwLSae
zqH7{rL<e*<REQ=u9UT%qLPAK;QUDDV5`691&7Dq!qds{~UyuFf`T4z%XScZZu=Ccz
z>vSjV5?oIa^74iEUcLR@Wpej1LK-!05^F!>YSgf<$7eX<al}m=iDF)B+sbjKBiAH+
z%F9|-T$rdVhKi|z>u6$vew6T(HKhsRe|CKD;R$#Gk08*PG}ygFHhbO9m5pcVGf%(y
z2uE-B1Uvyxz!UHUJONL@6YvB)f%8hh$Tjjein{<k2dyoIo4-5(PrwuK1Uvyxz!UHU
zJONL@6YvB)0Z-tZ5McO$|L1i=KEm()_V<7LKY-sZ6Y>l6BlI;?Lsy{hpCse~^eJ>7
zdI!1+U4*{9M97!W9Qx}CLjHt)hrWTnf<A-pKo_Ak=%>dC`2l(WeFEKw?m*knAIRlb
z=nLp`=wry{_aWpjPrwuK1Uvyxz!UHUJb`mS;E1fdgPyB<Y3NNlPWXVVAH9HvQprr5
zzmYS|@noYKCxxP+o{9k-GM!T<Wx4pkIdMJMpfA$6uBuvu$Mam6BeaO7bJpA1wvjsJ
zs5g<lNoTX#>5b<JE7fFslrGeKb2HAids#M}%x2xVm-d;K(?u~V^+p>+@u`il)8F3O
z+FRNhRl<h6ZbT6iwLmXK9bv7qD6cCXVGtSBh_OB18rO2+($Xr%v=ql<bIhRkY{i0A
zu2%SAQqT`K@yITNkzK<iTuj4i{0djal$oLy^!c`E8bvn5zmfY7DkqrCI#pVAX0vKI
z>Q2Q-^mf!C>#DukXm{M-sl=Wt%3VE^DorOs^ksk6*56j28j0%BhDOz8X?UE6SQiCH
zx^7g=ZRzuFH>f2Stt9{eTOs}oQ(<;^nu?8lnu_zcKprmhf3PSXBht};7J{69tu#+)
z!09!;9}No;$yu^*b&UoE-Y1b3S)=%Xo^Wfl+K+DCy?fFpG+Y}UU5~E2o}FBcwd8SY
zvw@H`#TBHrFl}HO99+GZD$dP9@}sB_aoONiSy_6k8Ixq#Xd1+gM4RETG!5oyG3UAs
zXpv?mY>JD7E8AfrvG+o7#VUqg+$decgk8{+GN=}4+u5*WMT+RQR#gRM5o3pV`%o{m
z;Z<<x)?5zImm;IV@o*$L#wpXLoi(L_r~}O<Q_S!n;lm~i3X#?{P`u>$Jj3rH+gl~e
zG<I<VMyWUodyOybIA}-IVQ}?IRhyb3fw$d|Iu;n3B2C}7c<rOAq3$KqC3V~!HXJ!$
zGPf>#Zs>|KJ+U8!kd1MREMu(zu1FpyumtMJAf!X!sM;JXpIKhSIjy*6uC7|L3^0<H
znxae&>^ipQcWpMQad|Iy&sy63b8Wlg92u|j(%dxiHqPE-ei*q?kYgC?d_XB_-}RE4
W<+mZdNtnv?4LU0fzBADskbeNB<PQ-5

literal 0
HcmV?d00001

diff --git a/pkgs/development/libraries/qt-4/default.nix b/pkgs/development/libraries/qt-4/default.nix
index 20893e8d8d9b..1fbdd362ff33 100644
--- a/pkgs/development/libraries/qt-4/default.nix
+++ b/pkgs/development/libraries/qt-4/default.nix
@@ -8,7 +8,7 @@ rec {
   fixesproto libXfixes glib libtiff];
   prefixKey = "-prefix ";
   configureFlags = "
-    -v -no-separate-debug-info -release -nomake examples -nomake demos
+    -v -no-separate-debug-info -release
     -system-zlib -system-libpng -system-libjpeg -fast
     -qt-gif -confirm-license
     -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
@@ -18,10 +18,10 @@ rec {
 }; in
 rec {
 	trolltech = stdenv.mkDerivation (common // {
-	  name = "qt-4.3.1";
+	  name = "qt-4.3.3";
 	  src = fetchurl {
-		url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.1.tar.gz;
-		sha256 = "0qg6apy2r7jbbfinxh0v1jm08yv890r40hhmy5cysn239v3x0nad";
+		url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.3.tar.gz;
+		sha256 = "0w0mfm0wwmbj1vnjn27rza1r9wj8k47mn9ril8swprffqnn4p4w9";
 	  };
 	  patchPhase = common.patchPhase;
 	});
@@ -29,8 +29,8 @@ rec {
 	  name = "qt-kde-4.3svn";
 	  src = fetchsvn {
 		  url = svn://anonsvn.kde.org/home/kde/trunk/qt-copy;
-		  rev = "732646";
-		  md5 = "9757de3dce16b483f2f358d287c848ee";
+		  rev = "746559";
+		  sha256 = "0lj2qp2q03m72kxdalrq6jfyrx33cg62ggvqww1c2f4aspvyijls";
 	  };
 	  patchPhase = "mkdir .svn; bash apply_patches;" + common.patchPhase;
 	});