From 2cd54b0e100621f2da6b44c02d758bfa6773228e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 6 Jan 2010 11:48:02 +0100
Subject: [PATCH] gtk+: update to 2.18.5.

--HG--
extra : convert_revision : bad1d425f3d45c15fdc71fda50e614bf49bf8e4d
---
 srcpkgs/gtk+/gtk+-devel.template |  2 --
 srcpkgs/gtk+/template            | 55 +++++++-------------------------
 2 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/srcpkgs/gtk+/gtk+-devel.template b/srcpkgs/gtk+/gtk+-devel.template
index 76b2028a513..747075b21be 100644
--- a/srcpkgs/gtk+/gtk+-devel.template
+++ b/srcpkgs/gtk+/gtk+-devel.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run atk-devel
 Add_dependency run cairo-devel
 Add_dependency run fontconfig-devel
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index e9c90577e80..c15e14d5d73 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,13 +1,12 @@
 # Template build file for 'gtk+'.
 pkgname=gtk+
-version=2.18.3
-revision=1
+version=2.18.5
 distfiles="${GNOME_SITE}/gtk+/2.18/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-cups --with-xinput"
 short_desc="The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=1c0665fe560a560851e8b3c9a6501d416c4b54abfb6fa07549d703a04ea768bf
+checksum=4986365bce2f164edae10be20a4d417eadca9534eedfd9e2176a0c45334b7bf4
 long_desc="
  GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK+ is suitable for
@@ -23,46 +22,16 @@ conf_files="/etc/gtk-2.0/im-multipress.conf"
 triggers="gtk-pixbuf-loaders gtk-immodules"
 subpackages="$pkgname-devel"
 
-Add_dependency run atk
-Add_dependency run cairo
 Add_dependency run glibc
-Add_dependency run fontconfig
-Add_dependency run freetype
-Add_dependency run glib
-Add_dependency run jpeg
-Add_dependency run pango
-Add_dependency run libpng
-Add_dependency run tiff
-Add_dependency run shared-mime-info
-Add_dependency run libX11
-Add_dependency run libXcomposite
-Add_dependency run libXcursor
-Add_dependency run libXdamage
-Add_dependency run libXext
-Add_dependency run libXfixes
-Add_dependency run libXinerama
-Add_dependency run libXi
-Add_dependency run libXrandr
-Add_dependency run libXrender
-
 Add_dependency build pkg-config
 Add_dependency build perl
-Add_dependency build atk-devel
-Add_dependency build cairo-devel
-Add_dependency build fontconfig-devel
-Add_dependency build freetype-devel
-Add_dependency build glib-devel
-Add_dependency build jpeg-devel
-Add_dependency build pango-devel
-Add_dependency build libpng-devel
-Add_dependency build tiff-devel
-Add_dependency build libX11-devel
-Add_dependency build libXcomposite-devel
-Add_dependency build libXcursor-devel
-Add_dependency build libXdamage-devel
-Add_dependency build libXext-devel
-Add_dependency build libXfixes-devel
-Add_dependency build libXinerama-devel
-Add_dependency build libXi-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXrender-devel
+Add_dependency full shared-mime-info
+
+_gtk_deps="atk cairo fontconfig freetype glib jpeg pango libpng tiff"
+_gtk_deps="${_gtk_deps} libX11 libXcomposite libXcursor libXrandr libXrender"
+_gtk_deps="${_gtk_deps} libXdamage libXext libXfixes libXinerama libXi"
+
+for _dep_ in ${_gtk_deps}; do
+	Add_dependency run	${_dep_}
+	Add_dependency build	${_dep_}-devel
+done