clutter: Fix building version 0.8

Fix building of Clutter with new Automake

Signed-off-by: Joshua Lock <josh@linux.intel.com>

diff --git a/meta/packages/clutter/clutter-0.8_git.bb b/meta/packages/clutter/clutter-0.8_git.bb
index 42efd3b109b498c57dbbf0013f71b05adaf3b954..71e6198030e47284a4f67cecc8cdd33d4c5e2bcf 100644 (file)
--- a/meta/packages/clutter/clutter-0.8_git.bb
+++ b/meta/packages/clutter/clutter-0.8_git.bb
@@ -7,6 +7,7 @@ PACKAGES =+ "clutter-examples-0.8"
 FILES_clutter-examples-0.8 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
 
 SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8 \
-          file://enable_tests-0.8.patch;patch=1 "
+          file://enable_tests-0.8.patch;patch=1 \
+     file://build-fix.patch;patch=1"
 
 S = "${WORKDIR}/git"

diff --git a/meta/packages/clutter/clutter/build-fix.patch b/meta/packages/clutter/clutter/build-fix.patch
new file mode 100644 (file)
index 0000000..68cf84e
--- /dev/null
+++ b/meta/packages/clutter/clutter/build-fix.patch
@@ -0,0 +1,16 @@
+Installing the same file twice causes an error in Automake 1.11
+
+JL 19/03/10
+
+Index: git/clutter/Makefile.am
+===================================================================
+--- git.orig/clutter/Makefile.am       2010-03-19 11:37:51.000000000 +0000
++++ git/clutter/Makefile.am    2010-03-19 11:50:46.744042007 +0000
+@@ -219,7 +219,6 @@
+       $(source_h) \
+       clutter-json.h \
+       clutter-enum-types.h \
+-      clutter-version.h \
+       clutter.h
+ 
+ DISTCLEANFILES = \