From 601791258b58e2a2c98a383f763136a0168bdec4 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 9 Oct 2012 18:11:34 +0200
Subject: [PATCH] gtk+3: rebuilt with xbps-src>=31.

---
 srcpkgs/gtk+3/gtk+3-devel.template |  4 ++--
 srcpkgs/gtk+3/gtk+3.rshlibs        | 36 ++++++++++++------------------
 srcpkgs/gtk+3/template             | 27 ++++++++++++----------
 3 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/srcpkgs/gtk+3/gtk+3-devel.template b/srcpkgs/gtk+3/gtk+3-devel.template
index 5fd0af3bc5..58dc997586 100644
--- a/srcpkgs/gtk+3/gtk+3-devel.template
+++ b/srcpkgs/gtk+3/gtk+3-devel.template
@@ -1,8 +1,8 @@
 # Template file for 'gtk+3-devel'.
 #
 depends="glib-devel>=2.34.0 atk-devel>=2.6.0 cairo-devel gdk-pixbuf-devel
-pango-devel libXinerama-devel libXi-devel libXrandr-devel libXcursor-devel
-libXcomposite-devel at-spi2-atk-devel>=2.6.0 gtk+3>=${version}_${revision}"
+ pango-devel at-spi2-atk-devel>=2.6.0 gtk+3-${version}_${revision}"
+
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gtk+3/gtk+3.rshlibs b/srcpkgs/gtk+3/gtk+3.rshlibs
index 13edd117f2..d8f273cb18 100644
--- a/srcpkgs/gtk+3/gtk+3.rshlibs
+++ b/srcpkgs/gtk+3/gtk+3.rshlibs
@@ -1,35 +1,27 @@
-libatk-bridge-2.0.so.0
-libpango-1.0.so.0
-libgmodule-2.0.so.0
-libglib-2.0.so.0
-libpthread.so.0
-libc.so.6
-libXext.so.6
+libpangocairo-1.0.so.0
+libgdk_pixbuf-2.0.so.0
+libcairo-gobject.so.2
+libgio-2.0.so.0
 libXinerama.so.1
 libXi.so.6
 libXrandr.so.2
 libXcursor.so.1
-libpangocairo-1.0.so.0
-libX11.so.6
 libXcomposite.so.1
 libXdamage.so.1
 libXfixes.so.3
-libatk-1.0.so.0
-libcairo-gobject.so.2
+libX11.so.6
+libXext.so.6
 libcairo.so.2
-libgdk_pixbuf-2.0.so.0
-libgio-2.0.so.0
-libpangoft2-1.0.so.0
-libfreetype.so.6
+libpango-1.0.so.0
 libfontconfig.so.1
 libgobject-2.0.so.0
-librt.so.1
+libglib-2.0.so.0
 libm.so.6
+libc.so.6
+libgmodule-2.0.so.0
+libatk-1.0.so.0
+libatk-bridge-2.0.so.0
+libpangoft2-1.0.so.0
+libpthread.so.0
 libcolord.so.1
 libcups.so.2
-libgssapi_krb5.so.2
-libkrb5.so.3
-libk5crypto.so.3
-libcom_err.so.2
-libz.so.1
-libcrypt.so.1
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index ae6a86decf..d1d2d58818 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,21 +1,12 @@
 # Template build file for 'gtk+3'.
 pkgname=gtk+3
 version=3.6.0
-revision=3
+revision=4
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
 configure_args="--enable-cups --disable-schemas-compile
---enable-gtk2-dependency --enable-colord --enable-x11-backend
---enable-broadway-backend"
-triggers="gtk3-immodules"
-conf_files="/etc/gtk-3.0/im-multipress.conf"
-subpackages="gtk+3-devel gtk+3-demo"
-depends="gtk-update-icon-cache shared-mime-info atk>=2.6.0"
-makedepends="libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel
-libXi-devel libXrandr-devel libXcomposite-devel glib-devel>=2.34.0
-atk-devel>=2.6.0 at-spi2-atk-devel>=2.6.0_2 libpng-devel fontconfig-devel
-cairo-devel pango-devel>=1.29.3 gdk-pixbuf-devel>=2.25.2 gtk+-devel
-colord-devel>=0.1.23_3 gobject-introspection cups-devel"
+ --enable-gtk2-dependency --enable-colord --enable-x11-backend
+ --enable-broadway-backend"
 short_desc="The GTK+ toolkit (v3)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
@@ -33,6 +24,18 @@ long_desc="
  Python (especially in combination with the Glade GUI builder) provides
  an effective method of rapid application development."
 
+triggers="gtk3-immodules"
+conf_files="/etc/gtk-3.0/im-multipress.conf"
+subpackages="gtk+3-devel gtk+3-demo"
+
+depends="gtk-update-icon-cache shared-mime-info atk>=2.6.0"
+
+makedepends="libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel
+ libXi-devel libXrandr-devel libXcomposite-devel glib-devel>=2.34.0
+ atk-devel>=2.6.0 at-spi2-atk-devel>=2.6.0_2 libpng-devel fontconfig-devel
+ cairo-devel pango-devel>=1.29.3 gdk-pixbuf-devel>=2.25.2 gtk+-devel
+ colord-devel>=0.1.23_3 gobject-introspection cups-devel"
+
 post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1
 }