diff options
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter/symconflict.patch')
-rw-r--r-- | meta/recipes-graphics/clutter/clutter/symconflict.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-graphics/clutter/clutter/symconflict.patch b/meta/recipes-graphics/clutter/clutter/symconflict.patch new file mode 100644 index 0000000000..7685c21161 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter/symconflict.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Index: git/tests/test-depth.c | ||
2 | =================================================================== | ||
3 | --- git.orig/tests/test-depth.c 2009-05-24 14:54:40.000000000 +0100 | ||
4 | +++ git/tests/test-depth.c 2009-05-24 14:55:13.000000000 +0100 | ||
5 | @@ -11,13 +11,13 @@ | ||
6 | clutter_timeline_start (timeline); | ||
7 | } | ||
8 | |||
9 | -static ClutterActor *raise[2]; | ||
10 | +static ClutterActor *clutterraise[2]; | ||
11 | static gboolean raise_no = 0; | ||
12 | |||
13 | static gboolean | ||
14 | raise_top (gpointer ignored) | ||
15 | { | ||
16 | - clutter_actor_raise_top (raise[raise_no]); | ||
17 | + clutter_actor_raise_top (clutterraise[raise_no]); | ||
18 | raise_no = !raise_no; | ||
19 | return TRUE; | ||
20 | } | ||
21 | @@ -202,8 +202,8 @@ | ||
22 | |||
23 | clutter_timeline_start (timeline); | ||
24 | |||
25 | - raise[0] = rect; | ||
26 | - raise[1] = hand; | ||
27 | + clutterraise[0] = rect; | ||
28 | + clutterraise[1] = hand; | ||
29 | g_timeout_add (2000, raise_top, NULL); | ||
30 | |||
31 | clutter_main (); | ||