From 35257ada4ee71d64072aa1b469ca2cf506dfe1e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Jan 2010 12:11:06 +0000
Subject: [PATCH] * Updated gtk+, glib, pango.

svn path=/nixpkgs/trunk/; revision=19388
---
 doc/package-notes.xml                       | 4 ++--
 pkgs/development/libraries/glib/2.22.x.nix  | 4 ++--
 pkgs/development/libraries/gtk+/2.18.x.nix  | 4 ++--
 pkgs/development/libraries/pango/1.26.x.nix | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index e9c90523cc1..39ad9d897e3 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -11,7 +11,7 @@ Linux kernel or X.org.</para>
 
 <!--============================================================-->
 
-<section>
+<section xml:id="sec-linux-kernel">
 
 <title>Linux kernel</title>
 
@@ -195,7 +195,7 @@ tarballs between runs.  Pay close attention to the <literal>NOT FOUND:
 run, since they may indicate missing dependencies.  (Some might be
 optional dependencies, however.)</para>
 
-<para>A file like <filename>tarballs-7.4.list</filename> contains all
+<para>A file like <filename>tarballs-7.5.list</filename> contains all
 tarballs in a X.org release.  It can be generated like this:
 
 <screen>
diff --git a/pkgs/development/libraries/glib/2.22.x.nix b/pkgs/development/libraries/glib/2.22.x.nix
index b1965f1915f..eaf6a56dade 100644
--- a/pkgs/development/libraries/glib/2.22.x.nix
+++ b/pkgs/development/libraries/glib/2.22.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gettext, perl }:
 
 stdenv.mkDerivation rec {
-  name = "glib-2.22.2";
+  name = "glib-2.22.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/2.22/${name}.tar.bz2";
-    sha256 = "18ycpaf69wlpp4wq385hkq7bcfhbis8ncd7wl7zmwgrdzh11v954";
+    sha256 = "055dv2hymbyzwpcd39r97x747vsvlkyywa826zr75dzambw6n7qd";
   };
 
   buildInputs = [pkgconfig gettext perl];
diff --git a/pkgs/development/libraries/gtk+/2.18.x.nix b/pkgs/development/libraries/gtk+/2.18.x.nix
index 22efef4255f..b0d17bf4581 100644
--- a/pkgs/development/libraries/gtk+/2.18.x.nix
+++ b/pkgs/development/libraries/gtk+/2.18.x.nix
@@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.18.3";
+  name = "gtk+-2.18.6";
   
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.18/${name}.tar.bz2";
-    sha256 = "1gv8lx7a00yp95ss0vzvmda4nv213m8adjdkx18hhmhaavz6a1hw";
+    sha256 = "0k9mz46q97537kdpmz8j5bhrzpn3zjp7k4mni4niafdp2x4r8aan";
   };
   
   buildInputs = [ pkgconfig perl jasper ];
diff --git a/pkgs/development/libraries/pango/1.26.x.nix b/pkgs/development/libraries/pango/1.26.x.nix
index 7efca117cba..423f4c8c702 100644
--- a/pkgs/development/libraries/pango/1.26.x.nix
+++ b/pkgs/development/libraries/pango/1.26.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pango-1.26.0";
+  name = "pango-1.26.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/1.26/${name}.tar.bz2";
-    sha256 = "1hx6v6w3xk9wfcrb26gg7rrfl6m6ykxk2bqm67aqdzql4vysxgz1";
+    sha256 = "021ygk3l9bk00gsvxk02flxsk68w0wl99dx221fmb547bng8g19v";
   };
 
   buildInputs = [pkgconfig] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext;