summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-04-21 17:48:32 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-04-21 17:48:32 +0100
commitd880beba017f2ffd03439fad9f8d15d53f7859a6 (patch)
tree879e7fb2986c4c4fca87666ddc340a63979322ee /meta
parentbb2ce064aaa0dad6225ee8ec521051a472f7423f (diff)
downloadopenembedded-core-d880beba017f2ffd03439fad9f8d15d53f7859a6.tar.gz
openembedded-core-d880beba017f2ffd03439fad9f8d15d53f7859a6.tar.bz2
openembedded-core-d880beba017f2ffd03439fad9f8d15d53f7859a6.tar.xz
openembedded-core-d880beba017f2ffd03439fad9f8d15d53f7859a6.zip
clutter: Refresh patch
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/clutter/clutter/enable_tests.patch30
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 854461479..953edf6bb 100644
--- a/meta/packages/clutter/clutter/enable_tests.patch
+++ b/meta/packages/clutter/clutter/enable_tests.patch
@@ -6,10 +6,10 @@
Index: git/tests/interactive/Makefile.am
===================================================================
---- git.orig/tests/interactive/Makefile.am 2008-12-18 16:50:45.000000000 +0000
-+++ git/tests/interactive/Makefile.am 2008-12-18 16:57:36.000000000 +0000
-@@ -68,7 +68,7 @@
- AM_CFLAGS = $(CLUTTER_CFLAGS)
+--- git.orig/tests/interactive/Makefile.am 2009-03-12 11:01:36.000000000 +0000
++++ git/tests/interactive/Makefile.am 2009-03-12 11:04:12.000000000 +0000
+@@ -77,7 +77,7 @@
+ AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
AM_LDFLAGS = $(CLUTTER_LIBS)
-noinst_PROGRAMS = test-interactive
@@ -19,14 +19,14 @@ Index: git/tests/interactive/Makefile.am
test-main.c \
Index: git/tests/interactive/test-actors.c
===================================================================
---- git.orig/tests/interactive/test-actors.c 2008-12-18 16:58:06.000000000 +0000
-+++ git/tests/interactive/test-actors.c 2008-12-18 16:58:13.000000000 +0000
-@@ -189,7 +189,7 @@
- /* Create a texture from file, then clone in to same resources */
- if (i == 0)
- {
-- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png",
-+ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png",
- &error)) == NULL)
- {
- g_error ("image load failed: %s", error->message);
+--- git.orig/tests/interactive/test-actors.c 2009-03-12 11:01:36.000000000 +0000
++++ git/tests/interactive/test-actors.c 2009-03-12 11:06:32.000000000 +0000
+@@ -182,7 +182,7 @@
+ oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
+ oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
+
+- real_hand = clutter_texture_new_from_file ("redhand.png", &error);
++ real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error);
+ if (real_hand == NULL)
+ {
+ g_error ("image load failed: %s", error->message);