From cdad2980407ed68ed976533edee7906d3a47b85f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Apr 2007 18:37:33 +0000
Subject: [PATCH] * Cairo 1.4.4.  This fixes some bad interaction with the
 latest   xorg-server (namely, BadMatch crashes in programs such as  
 gtk-window-decorator in compiz). * Some GTK updates while we're at it.

svn path=/nixpkgs/trunk/; revision=8617
---
 pkgs/development/libraries/cairo/default.nix              | 6 +++---
 pkgs/development/libraries/gtk-libs-2.10/glib/default.nix | 6 +++---
 pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index eb89ea078a21..f0b2d45010c6 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -9,10 +9,10 @@ assert postscriptSupport -> zlib != null;
 assert pngSupport -> libpng != null;
 
 stdenv.mkDerivation {
-  name = "cairo-1.2.6";
+  name = "cairo-1.4.4";
   src = fetchurl {
-    url = http://cairographics.org/releases/cairo-1.2.6.tar.gz;
-    sha1 = "b86b4017a9abd565ef11c72b7faee9082a04118f";
+    url = http://cairographics.org/releases/cairo-1.4.4.tar.gz;
+    sha1 = "71a7ce8352500944f7b2b73d4dc25ee947ec56ec";
   };
   buildInputs = [
     pkgconfig x11 fontconfig freetype
diff --git a/pkgs/development/libraries/gtk-libs-2.10/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.10/glib/default.nix
index 630bc4e7648b..47b8a58db7bc 100644
--- a/pkgs/development/libraries/gtk-libs-2.10/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.10/glib/default.nix
@@ -3,10 +3,10 @@
 assert pkgconfig != null && gettext != null && perl != null;
 
 stdenv.mkDerivation {
-  name = "glib-2.12.9"; # <- sic! gtk 2.10 needs glib 2.12
+  name = "glib-2.12.11"; # <- sic! gtk 2.10 needs glib 2.12
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/glib/2.12/glib-2.12.9.tar.bz2;
-    md5 = "b3f6a2a318610af6398b3445f1a2d6c6";
+    url = ftp://ftp.gtk.org/pub/glib/2.12/glib-2.12.11.tar.bz2;
+    md5 = "077a9917b673a9a0bc63f351786dde24";
   };
   buildInputs = [pkgconfig gettext perl];
 }
diff --git a/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix
index 4d22af50891b..4c40272bcac3 100644
--- a/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix
@@ -8,10 +8,10 @@ assert xineramaSupport -> libXinerama != null;
 
 
 stdenv.mkDerivation {
-  name = "gtk+-2.10.9";
+  name = "gtk+-2.10.11";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.9.tar.bz2;
-    md5 = "20d763198efb38263b22dee347f69da6";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.11.tar.bz2;
+    md5 = "3b32eab43bf5195d981867d25ba55d66";
   };
   buildInputs = [
     pkgconfig perl libtiff libjpeg libpng cairo libXrandr