diff options
Diffstat (limited to 'meta/packages/clutter/clutter')
-rw-r--r-- | meta/packages/clutter/clutter/enable_tests-0.4.patch | 52 | ||||
-rw-r--r-- | meta/packages/clutter/clutter/enable_tests-0.8.patch | 50 |
2 files changed, 50 insertions, 52 deletions
diff --git a/meta/packages/clutter/clutter/enable_tests-0.4.patch b/meta/packages/clutter/clutter/enable_tests-0.4.patch deleted file mode 100644 index 3178a2cd6c..0000000000 --- a/meta/packages/clutter/clutter/enable_tests-0.4.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- - tests/Makefile.am | 7 ++++++- - tests/test-actors.c | 2 +- - tests/test-text.c | 2 +- - 3 files changed, 8 insertions(+), 3 deletions(-) - -Index: clutter-0-4/tests/Makefile.am -=================================================================== ---- clutter-0-4.orig/tests/Makefile.am 2007-11-06 21:49:25.000000000 +0000 -+++ clutter-0-4/tests/Makefile.am 2007-11-06 21:49:48.000000000 +0000 -@@ -1,4 +1,4 @@ --noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ -+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ - test-actors test-behave test-text test-entry test-project \ - test-boxes test-perspective test-rotate test-depth \ - test-threads test-timeline -@@ -24,4 +24,9 @@ test_depth_SOURCES = test-depth.c - test_threads_SOURCES = test-threads.c - test_timeline_SOURCES = test-timeline.c - -+test_textdir = $(pkgdatadir) -+test_text_DATA = test-text.c -+test_actorsdir = $(pkgdatadir) -+test_actors_DATA = redhand.png -+ - EXTRA_DIST = redhand.png -Index: clutter-0-4/tests/test-actors.c -=================================================================== ---- clutter-0-4.orig/tests/test-actors.c 2007-11-06 21:49:25.000000000 +0000 -+++ clutter-0-4/tests/test-actors.c 2007-11-06 21:49:28.000000000 +0000 -@@ -143,7 +143,7 @@ main (int argc, char *argv[]) - stage = clutter_stage_get_default (); - clutter_actor_set_size (stage, 800, 600); - -- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL); -+ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL); - - if (!pixbuf) - g_error("pixbuf load failed"); -Index: clutter-0-4/tests/test-text.c -=================================================================== ---- clutter-0-4.orig/tests/test-text.c 2007-11-06 21:49:25.000000000 +0000 -+++ clutter-0-4/tests/test-text.c 2007-11-06 21:49:28.000000000 +0000 -@@ -27,7 +27,7 @@ main (int argc, char *argv[]) - - stage = clutter_stage_get_default (); - -- if (!g_file_get_contents ("test-text.c", &text, &size, NULL)) -+ if (!g_file_get_contents ("/usr/share/clutter/test-text.c", &text, &size, NULL)) - g_error("g_file_get_contents() of test-text.c failed"); - - clutter_actor_set_size (stage, 800, 600); diff --git a/meta/packages/clutter/clutter/enable_tests-0.8.patch b/meta/packages/clutter/clutter/enable_tests-0.8.patch new file mode 100644 index 0000000000..4f449b1177 --- /dev/null +++ b/meta/packages/clutter/clutter/enable_tests-0.8.patch @@ -0,0 +1,50 @@ +--- + tests/Makefile.am | 7 ++++++- + tests/test-actors.c | 2 +- + tests/test-text.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Index: clutter/tests/Makefile.am +=================================================================== +--- clutter.orig/tests/Makefile.am 2008-06-26 16:46:26.000000000 +0100 ++++ clutter/tests/Makefile.am 2008-06-26 16:46:50.000000000 +0100 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ ++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ + test-actors test-behave test-text test-entry test-project \ + test-perspective test-rotate test-depth \ + test-threads test-timeline test-timeline-dup-frames \ +@@ -17,8 +17,8 @@ + test-invariants + + if X11_TESTS +-noinst_PROGRAMS += test-pixmap +-noinst_PROGRAMS += test-devices ++bin_PROGRAMS += test-pixmap ++bin_PROGRAMS += test-devices + endif + + INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter +@@ -73,4 +73,9 @@ + test_invariants_SOURCES = test-invariants.c + test_devices_SOURCES = test-devices.c + ++test_textdir = $(pkgdatadir) ++test_text_DATA = test-text.c ++test_actorsdir = $(pkgdatadir) ++test_actors_DATA = redhand.png ++ + EXTRA_DIST = redhand.png test-script.json +Index: clutter/tests/test-actors.c +=================================================================== +--- clutter.orig/tests/test-actors.c 2008-06-26 16:46:26.000000000 +0100 ++++ clutter/tests/test-actors.c 2008-06-26 16:46:31.000000000 +0100 +@@ -195,7 +195,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); |