diff options
| -rw-r--r-- | meta/packages/clutter/clutter-0.6_git.bb | 3 | ||||
| -rw-r--r-- | meta/packages/clutter/clutter/symconflict.patch | 31 |
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 (); |