diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-30 17:44:00 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-30 17:44:00 +0000 |
| commit | 5bc023564072e5cf485de2d40cc8c3f6e04cb7b0 (patch) | |
| tree | 0d830eda768fc0dc602530f7ccc0142980b75cfd /meta | |
| parent | 6661806a5e2d0c30237097b8686e6d8da9ed42ff (diff) | |
| download | openembedded-core-5bc023564072e5cf485de2d40cc8c3f6e04cb7b0.tar.gz openembedded-core-5bc023564072e5cf485de2d40cc8c3f6e04cb7b0.tar.bz2 openembedded-core-5bc023564072e5cf485de2d40cc8c3f6e04cb7b0.tar.xz openembedded-core-5bc023564072e5cf485de2d40cc8c3f6e04cb7b0.zip | |
clutter-git: Update patch
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/clutter/clutter/enable_tests.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/meta/packages/clutter/clutter/enable_tests.patch b/meta/packages/clutter/clutter/enable_tests.patch index 953edf6bb..f4af7c94f 100644 --- a/meta/packages/clutter/clutter/enable_tests.patch +++ b/meta/packages/clutter/clutter/enable_tests.patch @@ -6,27 +6,27 @@ Index: git/tests/interactive/Makefile.am =================================================================== ---- 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) +--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000 ++++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000 +@@ -88,7 +88,7 @@ + + common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la -noinst_PROGRAMS = test-interactive +bin_PROGRAMS = test-interactive - test_interactive_SOURCES = \ - test-main.c \ + test_interactive_SOURCES = test-main.c $(UNIT_TESTS) + test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) Index: git/tests/interactive/test-actors.c =================================================================== ---- 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 @@ +--- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000 ++++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000 +@@ -178,7 +178,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); +- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL); ++ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL); + real_hand = clutter_texture_new_from_file (file, &error); if (real_hand == NULL) - { - g_error ("image load failed: %s", error->message); + g_error ("image load failed: %s", error->message); |