summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-05-24 14:57:26 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-05-24 14:57:26 +0100
commitfb26ad86b12723a6f6e5d85fcc71c6e3d6be04d6 (patch)
tree05b5c2c1f6a3db71869541bab95a5cf0ea5aa2ef /meta
parenta844e018b68609a759eacc83bccbc53b1483c905 (diff)
downloadopenembedded-core-fb26ad86b12723a6f6e5d85fcc71c6e3d6be04d6.tar.gz
openembedded-core-fb26ad86b12723a6f6e5d85fcc71c6e3d6be04d6.tar.bz2
openembedded-core-fb26ad86b12723a6f6e5d85fcc71c6e3d6be04d6.tar.xz
openembedded-core-fb26ad86b12723a6f6e5d85fcc71c6e3d6be04d6.zip
clutter-0.6: Fix symbol conflict with libc headers
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/clutter/clutter-0.6_git.bb3
-rw-r--r--meta/packages/clutter/clutter/symconflict.patch31
2 files changed, 33 insertions, 1 deletions
diff --git a/meta/packages/clutter/clutter-0.6_git.bb b/meta/packages/clutter/clutter-0.6_git.bb
index 2deca8766..5b34cad4e 100644
--- a/meta/packages/clutter/clutter-0.6_git.bb
+++ b/meta/packages/clutter/clutter-0.6_git.bb
@@ -1,9 +1,10 @@
require clutter.inc
PV = "0.6.0+gitr${SRCREV}"
-PR = "r3"
+PR = "r4"
SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-6 \
+ file://symconflict.patch;patch=1 \
file://enable_tests-0.6.patch;patch=1 "
S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter/symconflict.patch b/meta/packages/clutter/clutter/symconflict.patch
new file mode 100644
index 000000000..7685c2116
--- /dev/null
+++ b/meta/packages/clutter/clutter/symconflict.patch
@@ -0,0 +1,31 @@
+Index: git/tests/test-depth.c
+===================================================================
+--- git.orig/tests/test-depth.c 2009-05-24 14:54:40.000000000 +0100
++++ git/tests/test-depth.c 2009-05-24 14:55:13.000000000 +0100
+@@ -11,13 +11,13 @@
+ clutter_timeline_start (timeline);
+ }
+
+-static ClutterActor *raise[2];
++static ClutterActor *clutterraise[2];
+ static gboolean raise_no = 0;
+
+ static gboolean
+ raise_top (gpointer ignored)
+ {
+- clutter_actor_raise_top (raise[raise_no]);
++ clutter_actor_raise_top (clutterraise[raise_no]);
+ raise_no = !raise_no;
+ return TRUE;
+ }
+@@ -202,8 +202,8 @@
+
+ clutter_timeline_start (timeline);
+
+- raise[0] = rect;
+- raise[1] = hand;
++ clutterraise[0] = rect;
++ clutterraise[1] = hand;
+ g_timeout_add (2000, raise_top, NULL);
+
+ clutter_main ();