diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-06-10 17:25:19 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-06-10 17:25:19 +0100 |
| commit | c4bc453eabb9efc544710f4c1f95ac0eac24530e (patch) | |
| tree | ab37bb27da746d089d06963b9d71a9fb7b99fd65 | |
| parent | acc137c1ac8fcef1a7815bc718a1f28bd10c497c (diff) | |
| download | poky-c4bc453eabb9efc544710f4c1f95ac0eac24530e.tar.gz | |
clutter-mozembed: Fix patch against upstream changes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/packages/clutter/clutter-mozembed/link-with-g++.patch | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch index 15141a4a09..135b9e79f0 100644 --- a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch +++ b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch | |||
| @@ -1,32 +1,13 @@ | |||
| 1 | Index: git/cluttermozembed/Makefile.am | 1 | Index: git/cluttermozembed/Makefile.am |
| 2 | =================================================================== | 2 | =================================================================== |
| 3 | --- git.orig/cluttermozembed/Makefile.am 2009-05-11 23:16:52.000000000 +0100 | 3 | --- git.orig/cluttermozembed/Makefile.am 2009-06-10 15:04:54.000000000 +0100 |
| 4 | +++ git/cluttermozembed/Makefile.am 2009-05-11 23:18:40.000000000 +0100 | 4 | +++ git/cluttermozembed/Makefile.am 2009-06-10 15:10:12.000000000 +0100 |
| 5 | @@ -53,13 +53,14 @@ | 5 | @@ -61,7 +61,7 @@ |
| 6 | source_h = \ | 6 | clutter-mozembed-private.h |
| 7 | clutter-mozembed.h | ||
| 8 | source_c = \ | 7 | source_c = \ |
| 9 | - clutter-mozembed.c | 8 | clutter-mozembed.c \ |
| 10 | + clutter-mozembed.c dummy.cpp | 9 | - clutter-mozembed-download.c |
| 10 | + clutter-mozembed-download.c dummy.cpp | ||
| 11 | 11 | ||
| 12 | bin_PROGRAMS = clutter-mozheadless | 12 | bin_PROGRAMS = clutter-mozheadless |
| 13 | 13 | ||
| 14 | clutter_mozheadless_SOURCES = \ | ||
| 15 | clutter-mozheadless.c \ | ||
| 16 | clutter-mozheadless.h \ | ||
| 17 | + dummy2.cpp \ | ||
| 18 | clutter-mozheadless-history.c \ | ||
| 19 | clutter-mozheadless-history.h \ | ||
| 20 | clutter-mozheadless-prefs.c \ | ||
| 21 | Index: git/configure.ac | ||
| 22 | =================================================================== | ||
| 23 | --- git.orig/configure.ac 2009-05-11 23:16:52.000000000 +0100 | ||
| 24 | +++ git/configure.ac 2009-05-11 23:16:52.000000000 +0100 | ||
| 25 | @@ -7,6 +7,7 @@ | ||
| 26 | |||
| 27 | AC_ISC_POSIX | ||
| 28 | AC_PROG_CC | ||
| 29 | +AC_PROG_CXX | ||
| 30 | AC_STDC_HEADERS | ||
| 31 | AC_PROG_LIBTOOL | ||
| 32 | |||
