# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1350741332 0
# Node ID 9b4bda888249d67d767c7a4cf388ddb446e806cb
# Parent  4941013a3cb792ebba791ccccf28e5c967662f8c
gtk+: Sync with wok-tank.

diff -r 4941013a3cb7 -r 9b4bda888249 gtk+-demo/receipt
--- a/gtk+-demo/receipt	Sat Oct 20 12:48:43 2012 +0200
+++ b/gtk+-demo/receipt	Sat Oct 20 13:55:32 2012 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="gtk+-demo"
-VERSION="2.24.10"
+VERSION="2.24.13"
 CATEGORY="development"
 SHORT_DESC="The GIMP Toolkit example code and demo."
 MAINTAINER="pankso@slitaz.org"
@@ -13,7 +13,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin $fs/usr/share/applications
-	cp -a $_pkg/usr/bin/gtk-demo $fs/usr/bin
-	cp -a $_pkg/usr/share/gtk-2.0 $fs/usr/share
+	cp -a $install/usr/bin/gtk-demo $fs/usr/bin
+	cp -a $install/usr/share/gtk-2.0 $fs/usr/share
 	cp $stuff/*.desktop $fs/usr/share/applications
 }
diff -r 4941013a3cb7 -r 9b4bda888249 gtk+-dev/receipt
--- a/gtk+-dev/receipt	Sat Oct 20 12:48:43 2012 +0200
+++ b/gtk+-dev/receipt	Sat Oct 20 13:55:32 2012 +0000
@@ -13,13 +13,12 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib $fs/usr/share
-	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
-	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
+	cp -a $install/usr/lib/*.*a $fs/usr/lib
+	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
 	# Copy all libs and remove the shared.
-	cp -a $_pkg/usr/lib/gtk-2.0 $fs/usr/lib
+	cp -a $install/usr/lib/gtk-2.0 $fs/usr/lib
 	rm -rf $fs/usr/lib/gtk-2.0/2.10.0/*/*.so*
-	cp -a $_pkg/usr/include $fs/usr
-	cp -a $src/gdk/gdkconfig.h $fs/usr/include
-	cp -a $_pkg/usr/share/aclocal $fs/usr/share
-	cp -a $_pkg/usr/share/gir-1.0 $fs/usr/share
+	cp -a $install/usr/include $fs/usr
+	cp -a $install/usr/share/aclocal $fs/usr/share
+	cp -a $install/usr/share/gir-1.0 $fs/usr/share
 }
diff -r 4941013a3cb7 -r 9b4bda888249 gtk+/receipt
--- a/gtk+/receipt	Sat Oct 20 12:48:43 2012 +0200
+++ b/gtk+/receipt	Sat Oct 20 13:55:32 2012 +0000
@@ -17,8 +17,8 @@
 xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext \
 xorg-libXfixes xorg-libXinerama xorg-libXrender xorg-libXrandr"
 BUILD_DEPENDS="bash pkg-config xorg-xextproto cups-dev libcomerr3 cups dbus-dev \
-gobject-introspection gobject-introspection-dev libffi-dev perl gdk-pixbuf-dev \
-atk-dev pango-dev cairo-dev libgio-dev xorg-dev"
+gobject-introspection gobject-introspection-dev libffi-dev perl atk-dev \
+pango-dev cairo-dev gdk-pixbuf-dev"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -41,17 +41,17 @@
 	mkdir -p $fs/usr/lib/gtk-2.0 $fs/usr/share $fs/usr/bin
 
 	# Libs.
-	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
-	cp -a $_pkg/usr/lib/gtk-2.0/2.10.0 $fs/usr/lib/gtk-2.0
+	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	cp -a $install/usr/lib/gtk-2.0/2.10.0 $fs/usr/lib/gtk-2.0
 	rm -rf $fs/usr/lib/gtk-2.0/2.10.0/*/*.la
 
 	# Themes
-	cp -a $_pkg/usr/share/themes $fs/usr/share
+	cp -a $install/usr/share/themes $fs/usr/share
 
 	# Apps.
-	cp  $_pkg/usr/bin/gtk-query-immodules-2.0 $fs/usr/bin
-	cp  $_pkg/usr/bin/gtk-update-icon-cache $fs/usr/bin
-	cp  $_pkg/usr/bin/gtk-builder-convert $fs/usr/bin
+	cp -a $install/usr/bin/gtk-query-immodules-2.0 $fs/usr/bin
+	cp -a $install/usr/bin/gtk-update-icon-cache $fs/usr/bin
+	cp -a $install/usr/bin/gtk-builder-convert $fs/usr/bin
 
 	mkdir -p $fs/etc/gtk-2.0
 	touch $fs/etc/gtk-2.0/gtk.immodules