From bb2ce064aaa0dad6225ee8ec521051a472f7423f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 21 Apr 2009 17:48:10 +0100 Subject: clutter-mozembed: Refresh patch Signed-off-by: Richard Purdie --- .../clutter/clutter-mozembed/link-with-g++.patch | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'meta/packages/clutter') diff --git a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch index 8f84e6142..5a76e4522 100644 --- a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch +++ b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch @@ -1,25 +1,26 @@ Index: git/cluttermozembed/Makefile.am =================================================================== ---- git.orig/cluttermozembed/Makefile.am 2009-01-27 14:17:00.000000000 +0000 -+++ git/cluttermozembed/Makefile.am 2009-01-28 15:36:27.000000000 +0000 -@@ -16,11 +16,11 @@ +--- git.orig/cluttermozembed/Makefile.am 2009-04-16 15:54:16.000000000 +0100 ++++ git/cluttermozembed/Makefile.am 2009-04-16 15:57:02.000000000 +0100 +@@ -51,12 +51,13 @@ source_h = \ clutter-mozembed.h source_c = \ - clutter-mozembed.c -+ clutter-mozembed.c dummy2.cpp ++ clutter-mozembed.c dummy.cpp - bin_PROGRAMS = mozheadless + bin_PROGRAMS = clutter-mozheadless --mozheadless_SOURCES = mozheadless.c -+mozheadless_SOURCES = mozheadless.c dummy.cpp + clutter_mozheadless_SOURCES = \ + clutter-mozheadless.c \ ++ dummy2.cpp \ + clutter-mozheadless.h lib_LTLIBRARIES = libcluttermozembed.la - libcluttermozembed_la_SOURCES = $(source_c) $(source_h) Index: git/configure.ac =================================================================== ---- git.orig/configure.ac 2009-01-27 14:17:01.000000000 +0000 -+++ git/configure.ac 2009-01-28 15:35:38.000000000 +0000 +--- git.orig/configure.ac 2009-04-16 15:54:16.000000000 +0100 ++++ git/configure.ac 2009-04-16 15:54:30.000000000 +0100 @@ -7,6 +7,7 @@ AC_ISC_POSIX -- cgit v1.2.3 From d880beba017f2ffd03439fad9f8d15d53f7859a6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 21 Apr 2009 17:48:32 +0100 Subject: clutter: Refresh patch Signed-off-by: Richard Purdie --- meta/packages/clutter/clutter/enable_tests.patch | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'meta/packages/clutter') 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); -- cgit v1.2.3