From 4b24c008d7ea81456847069ece91649ee174dc28 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 4 Jul 2006 16:32:35 +0000
Subject: [PATCH] gtk needs a new version of pango (which is not clear from the
 FTP site, bad release management!) and pango needs libpng

svn path=/nixpkgs/trunk/; revision=5575
---
 pkgs/development/libraries/gtk-libs-2.10/default.nix   |  6 +++---
 .../libraries/gtk-libs-2.10/gtk+/default.nix           |  4 ++--
 .../libraries/gtk-libs-2.10/pango/default.nix          | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/gtk-libs-2.10/default.nix b/pkgs/development/libraries/gtk-libs-2.10/default.nix
index ee5abd562b1e..ed5ae35f05d5 100644
--- a/pkgs/development/libraries/gtk-libs-2.10/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.10/default.nix
@@ -1,6 +1,6 @@
 { xineramaSupport ? false
 , stdenv, fetchurl, pkgconfig, gettext, perl, x11
-, libtiff, libjpeg, libpng, cairo, libXinerama ? null
+, libtiff, libjpeg, libpng, cairo, libXinerama ? null, libXrandr
 }:
 
 rec {
@@ -14,13 +14,13 @@ rec {
   };
 
   pango = (import ./pango) {
-    inherit fetchurl stdenv pkgconfig glib x11 cairo;
+    inherit fetchurl stdenv pkgconfig glib x11 cairo libpng;
   };
 
   gtk = (import ./gtk+) {
     inherit fetchurl stdenv pkgconfig glib atk pango perl
             libtiff libjpeg libpng x11 cairo libXinerama
-            xineramaSupport;
+            xineramaSupport libXrandr;
   };
 
 }
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 453f46f59e3a..9de96341219e 100644
--- a/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix
@@ -1,6 +1,6 @@
 { xineramaSupport ? false
 , stdenv, fetchurl, pkgconfig, x11, glib, atk
-, pango, perl, libtiff, libjpeg, libpng, cairo, libXinerama ? null
+, pango, perl, libtiff, libjpeg, libpng, cairo, libXinerama ? null, libXrandr
 }:
 
 assert x11.buildClientLibs;
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     md5 = "37cdf73719e8b2af6b0d065df6236542";
   };
   buildInputs = [
-    pkgconfig perl libtiff libjpeg libpng cairo
+    pkgconfig perl libtiff libjpeg libpng cairo libXrandr
     (if xineramaSupport then libXinerama else null)
   ];
   propagatedBuildInputs = [x11 glib atk pango];
diff --git a/pkgs/development/libraries/gtk-libs-2.10/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.10/pango/default.nix
index 58dd88aeb621..4f66a3bb0738 100644
--- a/pkgs/development/libraries/gtk-libs-2.10/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.10/pango/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, pkgconfig, x11, glib, cairo}:
+{stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng}:
 
 assert x11.buildClientLibs;
 
 stdenv.mkDerivation {
-  name = "pango-1.12.3";
+  name = "pango-1.13.2";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.10/pango-1.12.3.tar.bz2;
-    md5 = "c8178e11a895166d86990bb2c38d831b";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.11/pango-1.13.2.tar.gz;
+    md5 = "17d78473c05fece044c6a3b44519b61f";
   };
-  buildInputs = [pkgconfig];
+  buildInputs = [pkgconfig libpng];
   propagatedBuildInputs = [x11 glib cairo];
 }