From 52bb5686e32a2b796d3db443da404e05aeb4db3e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 6 Dec 2011 11:51:39 +0100
Subject: [PATCH] gtk+: split gtk-update-icon-cache into its own subpkg, make
 gtk+ depend on it.

---
 srcpkgs/gtk+/gtk-update-icon-cache.rshlibs  |  5 +++++
 srcpkgs/gtk+/gtk-update-icon-cache.template | 14 ++++++++++++++
 srcpkgs/gtk+/template                       |  5 +++--
 srcpkgs/gtk+3/template                      |  7 ++++++-
 srcpkgs/gtk-update-icon-cache               |  1 +
 5 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/gtk+/gtk-update-icon-cache.rshlibs
 create mode 100644 srcpkgs/gtk+/gtk-update-icon-cache.template
 create mode 120000 srcpkgs/gtk-update-icon-cache

diff --git a/srcpkgs/gtk+/gtk-update-icon-cache.rshlibs b/srcpkgs/gtk+/gtk-update-icon-cache.rshlibs
new file mode 100644
index 0000000000..ae53b9f61b
--- /dev/null
+++ b/srcpkgs/gtk+/gtk-update-icon-cache.rshlibs
@@ -0,0 +1,5 @@
+libgdk_pixbuf-2.0.so.0
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/gtk+/gtk-update-icon-cache.template b/srcpkgs/gtk+/gtk-update-icon-cache.template
new file mode 100644
index 0000000000..d6c7056641
--- /dev/null
+++ b/srcpkgs/gtk+/gtk-update-icon-cache.template
@@ -0,0 +1,14 @@
+# Template file for 'gtk-update-icon-cache'.
+#
+short_desc="${sourcepkg} - The GTK+ update icon cache tool"
+long_desc="${long_desc}
+
+ This package contains gtk-update-icon-cache, to update GTK+ icon caches."
+
+replaces="gtk+<=2.24.8_3 gtk+3<=3.2.2"
+
+do_install() {
+	vmove usr/bin/gtk-update-icon-cache usr/bin
+	vinstall docs/reference/gtk/gtk-update-icon-cache.1 \
+		644 usr/share/man/man1
+}
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 815c1a72cb..2ee1e470d1 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -4,7 +4,7 @@ version=2.24.8
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-cups --with-xinput"
-revision=2
+revision=3
 short_desc="The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org"
@@ -23,9 +23,10 @@ long_desc="
 
 conf_files="/etc/gtk-2.0/im-multipress.conf"
 triggers="gtk-immodules"
-subpackages="gtk+-devel gtk+-demo"
+subpackages="gtk+-devel gtk+-demo gtk-update-icon-cache"
 
 Add_dependency run shared-mime-info
+Add_dependency run gtk-update-icon-cache
 
 Add_dependency build pkg-config
 Add_dependency build perl ">=0"
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 526e1bb368..03455e6bd6 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,6 +1,7 @@
 # Template build file for 'gtk+3'.
 pkgname=gtk+3
 version=3.2.2
+revision=1
 wrksrc="gtk+-${version}"
 distfiles="${GNOME_SITE}/gtk+/3.2/gtk+-$version.tar.xz"
 build_style=gnu-configure
@@ -26,7 +27,7 @@ triggers="gtk3-immodules"
 conf_files="/etc/gtk-3.0/im-multipress.conf"
 subpackages="gtk+3-devel gtk+3-demo"
 
-Add_dependency run gtk+ ">=0"		# for gtk-update-icon-cache
+Add_dependency run gtk-update-icon-cache
 Add_dependency run shared-mime-info
 Add_dependency run colord
 
@@ -46,3 +47,7 @@ Add_dependency build glib-devel		">=2.30.0"
 Add_dependency build fontconfig-devel
 Add_dependency build gtk+-devel
 Add_dependency build colord-devel
+
+post_install() {
+	rm -f ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1
+}
diff --git a/srcpkgs/gtk-update-icon-cache b/srcpkgs/gtk-update-icon-cache
new file mode 120000
index 0000000000..50dbbf5fe7
--- /dev/null
+++ b/srcpkgs/gtk-update-icon-cache
@@ -0,0 +1 @@
+gtk+
\ No newline at end of file