From c9e31a831236fe1a01d1e442070ceba57767abfd Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 5 Feb 2011 16:40:06 +0100
Subject: [PATCH] clutter: update to 1.6.0.

---
 srcpkgs/clutter/clutter-devel.template |  5 +++--
 srcpkgs/clutter/template               | 23 ++++++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/clutter/clutter-devel.template b/srcpkgs/clutter/clutter-devel.template
index c367ea57d9d..b34bed146e2 100644
--- a/srcpkgs/clutter/clutter-devel.template
+++ b/srcpkgs/clutter/clutter-devel.template
@@ -5,6 +5,7 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+Add_dependency run json-glib-devel
 Add_dependency run gtk+-devel
 Add_dependency run gobject-introspection
 Add_dependency run MesaLib-devel
@@ -17,8 +18,8 @@ Add_dependency run clutter
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
+	mkdir -p ${DESTDIR}/usr/{lib,share}
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/share/{gtk-doc,gir*} ${DESTDIR}/usr/share
 }
diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template
index 21d43245b40..f0930bfb38d 100644
--- a/srcpkgs/clutter/template
+++ b/srcpkgs/clutter/template
@@ -1,13 +1,13 @@
 # Template file for 'clutter'
 pkgname=clutter
-version=1.2.4
-distfiles="http://www.clutter-project.org/sources/clutter/1.2/$pkgname-$version.tar.bz2"
+version=1.6.0
+distfiles="http://www.clutter-project.org/sources/clutter/1.6/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-x --with-flavour=glx --with-imagebackend=gdk-pixbuf
  --enable-xinput"
 short_desc="OpenGL based interactive canvas library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=14528674af19eca4f6638c6e1e0ac07e40d047a6a31bac2f8cbb6ee0349ccb65
+checksum=7e956fad7b8f7aa78500c155c824584201e2b8c4117da61a1f7ec2c120945400
 long_desc="
  Clutter is an open source software library for creating fast, visually
  rich and animated graphical user interfaces."
@@ -16,6 +16,11 @@ subpackages="gir-$pkgname $pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
+Add_dependency run json-glib
+Add_dependency run atk
+Add_dependency run gdk-pixbuf
+Add_dependency run libpng
+Add_dependency run libdrm
 Add_dependency run pango
 Add_dependency run cairo
 Add_dependency run gtk+
@@ -26,10 +31,16 @@ Add_dependency run libXdamage
 Add_dependency run libXfixes
 Add_dependency run libXcomposite
 Add_dependency run libXi
+
 Add_dependency build pkg-config
+Add_dependency build atk-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build libpng-devel
+Add_dependency build libdrm-devel
 Add_dependency build pango-devel
 Add_dependency build cairo-devel
 Add_dependency build glib-devel
+Add_dependency build json-glib-devel
 Add_dependency build gtk+-devel
 Add_dependency build MesaLib-devel
 Add_dependency build libX11-devel
@@ -39,9 +50,3 @@ Add_dependency build libXfixes-devel
 Add_dependency build libXcomposite-devel
 Add_dependency build libXi-devel
 Add_dependency build gobject-introspection
-
-pre_configure()
-{
-	# Use cmp(1) from diffutils.
-	export PATH="/usr/bin:$PATH"
-}