From ed9151d3388399362b49060205753cdabc36e62a Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 9 Oct 2008 23:21:39 +0000
Subject: [PATCH] gimp 2.4 -> 2.6 + update dependencies

svn path=/nixpkgs/trunk/; revision=13039
---
 pkgs/applications/graphics/gimp/default.nix | 10 +++++-----
 pkgs/development/libraries/gegl/default.nix |  8 ++++----
 pkgs/top-level/all-packages.nix             |  6 ++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index d3571793c03..86bd4f2a0c7 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, freetype
 , fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
-, perlXMLParser, python, pygtk, gettext, xlibs
+, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl
 }:
 
 stdenv.mkDerivation {
-  name = "gimp-2.4.7";
+  name = "gimp-2.6.1";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gimp/v2.4/gimp-2.4.7.tar.bz2;
-    sha256 = "1j8904cy5sp021fz7ikh2dxm339a36ihns94qr9i1y7sb3qfx66k";
+    url = ftp://ftp.gtk.org/pub/gimp/v2.6/gimp-2.6.1.tar.bz2;
+    sha256 = "02lacx01marjc4kkpr4m2c1z1rj1sv6rg4wjyv06whjb5nh0qpq9";
   };
   
   buildInputs = [
     pkgconfig gtk libgtkhtml freetype fontconfig
     libart_lgpl libtiff libjpeg libpng libexif zlib perl
-    perlXMLParser python pygtk gettext
+    perlXMLParser python pygtk gettext intltool babl gegl
   ];
 
   configureFlags = [ "--disable-print" ];
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 732816a598b..6e94971b520 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -1,15 +1,15 @@
 args:
 args.stdenv.mkDerivation {
-  name = "gegl-0.0.16";
+  name = "gegl-0.0.20";
 
   src = args.fetchurl {
-    url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.16.tar.bz2;
-    sha256 = "0jgbqgpv85x9kc14zi6a6bs6jvsm3hy48nvwrhhygmivayswa3qj";
+    url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.20.tar.bz2;
+    sha256 = "1dqdammp2jv6cwycwx5pwn5m9n3xss5j6656xb59dj4xxypvd2vh";
   };
 
   configureFlags = "--disable-docs"; # needs fonts otherwise  don't know how to pass them
 
-  buildInputs =(with args; [pkgconfig glib babl libpng cairo libjpeg librsvg pango ]  );
+  buildInputs =(with args; [pkgconfig glib babl libpng cairo libjpeg librsvg pango gtk]  );
 
   meta = { 
       description = "graph based image processing framework";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4138d7f8ca5..454dee07eee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2764,12 +2764,10 @@ let
 
   gegl = import ../development/libraries/gegl {
     inherit fetchurl stdenv libpng pkgconfig babl;
-    # optional gtk+
-    glib = glib214;
     openexr = openexr_1_6_1;
     #  avocodec avformat librsvg
     inherit cairo libjpeg librsvg;
-    inherit (gtkLibs) pango;
+    inherit (gtkLibs) pango glib gtk;
   };
 
   geos = import ../development/libraries/geos {
@@ -6284,7 +6282,7 @@ let
   gimp = import ../applications/graphics/gimp {
     inherit fetchurl stdenv pkgconfig freetype fontconfig
       libtiff libjpeg libpng libexif zlib perl perlXMLParser
-      python pygtk gettext xlibs;
+      python pygtk gettext xlibs intltool babl gegl;
     inherit (gnome) gtk libgtkhtml libart_lgpl;
   };