mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

clutter-0.6: Fix symbol conflict with libc headers

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2009-05-24 14:57:26 +01:00
parent a844e018b6
commit fb26ad86b1
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/clutter/clutter-0.6_git.bb
+2 -1
View File
@@ -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"
meta/packages/clutter/clutter/symconflict.patch
+31
View File
@@ -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 ();