From 277bd69fa9391824482b17fba65eddc9ad7a4b64 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 May 2012 21:58:57 +0000
Subject: [PATCH] * Glib/ATK/Pango/GTK+ updates.
svn path=/nixpkgs/branches/x-updates/; revision=34145
---
.../libraries/atk/{2.2.x.nix => 2.4.x.nix} | 6 +++---
.../libraries/gdk-pixbuf/{2.24.x.nix => 2.26.x.nix} | 11 +++++------
.../libraries/glib/{2.30.x.nix => 2.32.x.nix} | 8 +++++---
.../libraries/pango/{1.29.x.nix => 1.30.x.nix} | 8 +++++---
pkgs/top-level/all-packages.nix | 8 ++++----
5 files changed, 22 insertions(+), 19 deletions(-)
rename pkgs/development/libraries/atk/{2.2.x.nix => 2.4.x.nix} (83%)
rename pkgs/development/libraries/gdk-pixbuf/{2.24.x.nix => 2.26.x.nix} (73%)
rename pkgs/development/libraries/glib/{2.30.x.nix => 2.32.x.nix} (88%)
rename pkgs/development/libraries/pango/{1.29.x.nix => 1.30.x.nix} (83%)
diff --git a/pkgs/development/libraries/atk/2.2.x.nix b/pkgs/development/libraries/atk/2.4.x.nix
similarity index 83%
rename from pkgs/development/libraries/atk/2.2.x.nix
rename to pkgs/development/libraries/atk/2.4.x.nix
index d0f7e1097953..94b0b1466546 100644
--- a/pkgs/development/libraries/atk/2.2.x.nix
+++ b/pkgs/development/libraries/atk/2.4.x.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, perl, glib }:
stdenv.mkDerivation rec {
- name = "atk-2.2.0";
+ name = "atk-2.4.0";
src = fetchurl {
- url = mirror://gnome/sources/atk/2.2/atk-2.2.0.tar.xz;
- sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb";
+ url = "mirror://gnome/sources/atk/2.4/${name}.tar.xz";
+ sha256 = "091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d";
};
buildNativeInputs = [ pkgconfig perl ];
diff --git a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix
similarity index 73%
rename from pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
rename to pkgs/development/libraries/gdk-pixbuf/2.26.x.nix
index 5c0860196d39..07e66df33b57 100644
--- a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
-, jasper }:
+{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz, jasper }:
-stdenv.mkDerivation {
- name = "gdk-pixbuf-2.24.1";
+stdenv.mkDerivation rec {
+ name = "gdk-pixbuf-2.26.1";
src = fetchurl {
- url = mirror://gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.1.tar.xz;
- sha256 = "1qdywh1r75lalb7z6s9pm6pmqx82chrrxqb8cdqi629nvc03yyns";
+ url = "mirror://gnome/sources/gdk-pixbuf/2.26/${name}.tar.xz";
+ sha256 = "a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba";
};
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.32.x.nix
similarity index 88%
rename from pkgs/development/libraries/glib/2.30.x.nix
rename to pkgs/development/libraries/glib/2.32.x.nix
index 092fa7f27e09..10e675e18af9 100644
--- a/pkgs/development/libraries/glib/2.30.x.nix
+++ b/pkgs/development/libraries/glib/2.32.x.nix
@@ -12,11 +12,11 @@
# $out/bin/gtester-report' to postInstall if this is solved
stdenv.mkDerivation rec {
- name = "glib-2.30.3";
+ name = "glib-2.32.3";
src = fetchurl {
- url = mirror://gnome/sources/glib/2.30/glib-2.30.3.tar.xz;
- sha256 = "09yxfajynbw78kji48z384lylp67kihfi1g78qrrjif4f5yb5jz6";
+ url = "mirror://gnome/sources/glib/2.32/${name}.tar.xz";
+ sha256 = "b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d";
};
# configure script looks for d-bus but it is only needed for tests
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
configureFlags = "--with-pcre=system --disable-fam";
+ enableParallelBuilding = true;
+
passthru.gioModuleDir = "lib/gio/modules";
postInstall = ''rm -rvf $out/share/gtk-doc'';
diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.30.x.nix
similarity index 83%
rename from pkgs/development/libraries/pango/1.29.x.nix
rename to pkgs/development/libraries/pango/1.30.x.nix
index 6c5d0f4cebcc..d58efd79f781 100644
--- a/pkgs/development/libraries/pango/1.29.x.nix
+++ b/pkgs/development/libraries/pango/1.30.x.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
stdenv.mkDerivation rec {
- name = "pango-1.29.4";
+ name = "pango-1.30.0";
src = fetchurl {
- url = mirror://gnome/sources/pango/1.29/pango-1.29.4.tar.xz;
- sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s";
+ url = "mirror://gnome/sources/pango/1.30/${name}.tar.xz";
+ sha256 = "7c6d2ab024affaed0e942f9279b818235f9c6a36d9fc50688f48d387f4102dff";
};
buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ x11 glib cairo libpng ];
+ enableParallelBuilding = true;
+
postInstall = "rm -rf $out/share/gtk-doc";
meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0c8cff481cb..c5b8dde2624d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3658,23 +3658,23 @@ let
gtkmm;
};
- glib = callPackage ../development/libraries/glib/2.30.x.nix { };
+ glib = callPackage ../development/libraries/glib/2.32.x.nix { };
glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
glib_networking = callPackage ../development/libraries/glib-networking {};
- atk = callPackage ../development/libraries/atk/2.2.x.nix { };
+ atk = callPackage ../development/libraries/atk/2.4.x.nix { };
atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
cairo = callPackage ../development/libraries/cairo { };
- pango = callPackage ../development/libraries/pango/1.29.x.nix { };
+ pango = callPackage ../development/libraries/pango/1.30.x.nix { };
pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { };
- gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { };
+ gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { };
gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };