From a35370c961b634a9de7bb16509cd9e1486cc92c9 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 27 Mar 2012 08:19:02 +0200
Subject: [PATCH] gtk+: rebuild against glib-2.32.0.

---
 srcpkgs/gtk+/gtk+-demo.rshlibs              | 1 -
 srcpkgs/gtk+/gtk+-demo.template             | 2 ++
 srcpkgs/gtk+/gtk+-devel.template            | 4 ++--
 srcpkgs/gtk+/gtk+.rshlibs                   | 2 --
 srcpkgs/gtk+/gtk-update-icon-cache.rshlibs  | 1 -
 srcpkgs/gtk+/gtk-update-icon-cache.template | 1 +
 srcpkgs/gtk+/template                       | 1 +
 7 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/gtk+-demo.rshlibs b/srcpkgs/gtk+/gtk+-demo.rshlibs
index 2c5b8594e91..15190fb7619 100644
--- a/srcpkgs/gtk+/gtk+-demo.rshlibs
+++ b/srcpkgs/gtk+/gtk+-demo.rshlibs
@@ -7,5 +7,4 @@ libpango-1.0.so.0
 libgobject-2.0.so.0
 libglib-2.0.so.0
 libm.so.6
-libpthread.so.0
 libc.so.6
diff --git a/srcpkgs/gtk+/gtk+-demo.template b/srcpkgs/gtk+/gtk+-demo.template
index 10a5b0b4a65..e550a4f702c 100644
--- a/srcpkgs/gtk+/gtk+-demo.template
+++ b/srcpkgs/gtk+/gtk+-demo.template
@@ -6,6 +6,8 @@ long_desc="${long_desc}
  This package contains the example files and a demonstration program
  for GTK+3."
 
+revision=1
+
 do_install() {
 	vmove usr/bin/gtk-demo usr/bin
 	vmove usr/share/gtk-2.0 usr/share
diff --git a/srcpkgs/gtk+/gtk+-devel.template b/srcpkgs/gtk+/gtk+-devel.template
index 8feb5850f19..0900dd6368f 100644
--- a/srcpkgs/gtk+/gtk+-devel.template
+++ b/srcpkgs/gtk+/gtk+-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'gtk+-devel'.
 #
-revision=1
+revision=2
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}
 
@@ -11,7 +11,7 @@ Add_dependency run atk-devel
 Add_dependency run cairo-devel
 Add_dependency run gdk-pixbuf-devel
 Add_dependency run pango-devel
-Add_dependency run gtk+
+Add_dependency run gtk+ ">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/gtk+/gtk+.rshlibs b/srcpkgs/gtk+/gtk+.rshlibs
index 299f4680f3e..144c399ef9b 100644
--- a/srcpkgs/gtk+/gtk+.rshlibs
+++ b/srcpkgs/gtk+/gtk+.rshlibs
@@ -17,8 +17,6 @@ libXcursor.so.1
 libXcomposite.so.1
 libXdamage.so.1
 libXfixes.so.3
-libgthread-2.0.so.0
-librt.so.1
 libcairo.so.2
 libX11.so.6
 libm.so.6
diff --git a/srcpkgs/gtk+/gtk-update-icon-cache.rshlibs b/srcpkgs/gtk+/gtk-update-icon-cache.rshlibs
index ae53b9f61be..053403be3c6 100644
--- a/srcpkgs/gtk+/gtk-update-icon-cache.rshlibs
+++ b/srcpkgs/gtk+/gtk-update-icon-cache.rshlibs
@@ -1,5 +1,4 @@
 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
index d6c70566410..83bad408dd9 100644
--- a/srcpkgs/gtk+/gtk-update-icon-cache.template
+++ b/srcpkgs/gtk+/gtk-update-icon-cache.template
@@ -6,6 +6,7 @@ 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"
+revision=1
 
 do_install() {
 	vmove usr/bin/gtk-update-icon-cache usr/bin
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 4d9e7b38e0c..93fb160f5cb 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,6 +1,7 @@
 # Template build file for 'gtk+'.
 pkgname=gtk+
 version=2.24.10
+revision=1
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-cups --with-xinput"