diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-04-21 17:48:32 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-04-21 17:48:32 +0100 |
commit | d880beba017f2ffd03439fad9f8d15d53f7859a6 (patch) | |
tree | 879e7fb2986c4c4fca87666ddc340a63979322ee | |
parent | bb2ce064aaa0dad6225ee8ec521051a472f7423f (diff) | |
download | poky-d880beba017f2ffd03439fad9f8d15d53f7859a6.tar.gz |
clutter: Refresh patch
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | meta/packages/clutter/clutter/enable_tests.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/packages/clutter/clutter/enable_tests.patch b/meta/packages/clutter/clutter/enable_tests.patch index 8544614790..953edf6bbc 100644 --- a/meta/packages/clutter/clutter/enable_tests.patch +++ b/meta/packages/clutter/clutter/enable_tests.patch | |||
@@ -6,10 +6,10 @@ | |||
6 | 6 | ||
7 | Index: git/tests/interactive/Makefile.am | 7 | Index: git/tests/interactive/Makefile.am |
8 | =================================================================== | 8 | =================================================================== |
9 | --- git.orig/tests/interactive/Makefile.am 2008-12-18 16:50:45.000000000 +0000 | 9 | --- git.orig/tests/interactive/Makefile.am 2009-03-12 11:01:36.000000000 +0000 |
10 | +++ git/tests/interactive/Makefile.am 2008-12-18 16:57:36.000000000 +0000 | 10 | +++ git/tests/interactive/Makefile.am 2009-03-12 11:04:12.000000000 +0000 |
11 | @@ -68,7 +68,7 @@ | 11 | @@ -77,7 +77,7 @@ |
12 | AM_CFLAGS = $(CLUTTER_CFLAGS) | 12 | AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) |
13 | AM_LDFLAGS = $(CLUTTER_LIBS) | 13 | AM_LDFLAGS = $(CLUTTER_LIBS) |
14 | 14 | ||
15 | -noinst_PROGRAMS = test-interactive | 15 | -noinst_PROGRAMS = test-interactive |
@@ -19,14 +19,14 @@ Index: git/tests/interactive/Makefile.am | |||
19 | test-main.c \ | 19 | test-main.c \ |
20 | Index: git/tests/interactive/test-actors.c | 20 | Index: git/tests/interactive/test-actors.c |
21 | =================================================================== | 21 | =================================================================== |
22 | --- git.orig/tests/interactive/test-actors.c 2008-12-18 16:58:06.000000000 +0000 | 22 | --- git.orig/tests/interactive/test-actors.c 2009-03-12 11:01:36.000000000 +0000 |
23 | +++ git/tests/interactive/test-actors.c 2008-12-18 16:58:13.000000000 +0000 | 23 | +++ git/tests/interactive/test-actors.c 2009-03-12 11:06:32.000000000 +0000 |
24 | @@ -189,7 +189,7 @@ | 24 | @@ -182,7 +182,7 @@ |
25 | /* Create a texture from file, then clone in to same resources */ | 25 | oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0); |
26 | if (i == 0) | 26 | oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5); |
27 | { | 27 | |
28 | - if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png", | 28 | - real_hand = clutter_texture_new_from_file ("redhand.png", &error); |
29 | + if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", | 29 | + real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error); |
30 | &error)) == NULL) | 30 | if (real_hand == NULL) |
31 | { | 31 | { |
32 | g_error ("image load failed: %s", error->message); | 32 | g_error ("image load failed: %s", error->message); |