diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-06-26 15:50:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-06-26 15:50:35 +0000 |
| commit | 85221a39bc256f5a8116b35ff9eddd97affafa07 (patch) | |
| tree | 7abbc8b81223d6d84f8b01cec6936f6be1b0fb70 | |
| parent | f4f936a3a7021f6bf558bb40b8fd1c29377c6a24 (diff) | |
| download | poky-85221a39bc256f5a8116b35ff9eddd97affafa07.tar.gz | |
clutter: Add missing patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4735 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/clutter/clutter/enable-tests-r2990.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/packages/clutter/clutter/enable-tests-r2990.patch b/meta/packages/clutter/clutter/enable-tests-r2990.patch new file mode 100644 index 0000000000..4f449b1177 --- /dev/null +++ b/meta/packages/clutter/clutter/enable-tests-r2990.patch | |||
| @@ -0,0 +1,50 @@ | |||
| 1 | --- | ||
| 2 | tests/Makefile.am | 7 ++++++- | ||
| 3 | tests/test-actors.c | 2 +- | ||
| 4 | tests/test-text.c | 2 +- | ||
| 5 | 3 files changed, 8 insertions(+), 3 deletions(-) | ||
| 6 | |||
| 7 | Index: clutter/tests/Makefile.am | ||
| 8 | =================================================================== | ||
| 9 | --- clutter.orig/tests/Makefile.am 2008-06-26 16:46:26.000000000 +0100 | ||
| 10 | +++ clutter/tests/Makefile.am 2008-06-26 16:46:50.000000000 +0100 | ||
| 11 | @@ -1,4 +1,4 @@ | ||
| 12 | -noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ | ||
| 13 | +bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ | ||
| 14 | test-actors test-behave test-text test-entry test-project \ | ||
| 15 | test-perspective test-rotate test-depth \ | ||
| 16 | test-threads test-timeline test-timeline-dup-frames \ | ||
| 17 | @@ -17,8 +17,8 @@ | ||
| 18 | test-invariants | ||
| 19 | |||
| 20 | if X11_TESTS | ||
| 21 | -noinst_PROGRAMS += test-pixmap | ||
| 22 | -noinst_PROGRAMS += test-devices | ||
| 23 | +bin_PROGRAMS += test-pixmap | ||
| 24 | +bin_PROGRAMS += test-devices | ||
| 25 | endif | ||
| 26 | |||
| 27 | INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter | ||
| 28 | @@ -73,4 +73,9 @@ | ||
| 29 | test_invariants_SOURCES = test-invariants.c | ||
| 30 | test_devices_SOURCES = test-devices.c | ||
| 31 | |||
| 32 | +test_textdir = $(pkgdatadir) | ||
| 33 | +test_text_DATA = test-text.c | ||
| 34 | +test_actorsdir = $(pkgdatadir) | ||
| 35 | +test_actors_DATA = redhand.png | ||
| 36 | + | ||
| 37 | EXTRA_DIST = redhand.png test-script.json | ||
| 38 | Index: clutter/tests/test-actors.c | ||
| 39 | =================================================================== | ||
| 40 | --- clutter.orig/tests/test-actors.c 2008-06-26 16:46:26.000000000 +0100 | ||
| 41 | +++ clutter/tests/test-actors.c 2008-06-26 16:46:31.000000000 +0100 | ||
| 42 | @@ -195,7 +195,7 @@ | ||
| 43 | /* Create a texture from file, then clone in to same resources */ | ||
| 44 | if (i == 0) | ||
| 45 | { | ||
| 46 | - if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png", | ||
| 47 | + if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", | ||
| 48 | &error)) == NULL) | ||
| 49 | { | ||
| 50 | g_error ("image load failed: %s", error->message); | ||
