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 | openembedded-core-contrib-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 @@ Index: git/cluttermozembed/Makefile.am =================================================================== ---- git.orig/cluttermozembed/Makefile.am 2009-05-11 23:16:52.000000000 +0100 -+++ git/cluttermozembed/Makefile.am 2009-05-11 23:18:40.000000000 +0100 -@@ -53,13 +53,14 @@ - source_h = \ - clutter-mozembed.h +--- git.orig/cluttermozembed/Makefile.am 2009-06-10 15:04:54.000000000 +0100 ++++ git/cluttermozembed/Makefile.am 2009-06-10 15:10:12.000000000 +0100 +@@ -61,7 +61,7 @@ + clutter-mozembed-private.h source_c = \ -- clutter-mozembed.c -+ clutter-mozembed.c dummy.cpp + clutter-mozembed.c \ +- clutter-mozembed-download.c ++ clutter-mozembed-download.c dummy.cpp bin_PROGRAMS = clutter-mozheadless - clutter_mozheadless_SOURCES = \ - clutter-mozheadless.c \ - clutter-mozheadless.h \ -+ dummy2.cpp \ - clutter-mozheadless-history.c \ - clutter-mozheadless-history.h \ - clutter-mozheadless-prefs.c \ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2009-05-11 23:16:52.000000000 +0100 -+++ git/configure.ac 2009-05-11 23:16:52.000000000 +0100 -@@ -7,6 +7,7 @@ - - AC_ISC_POSIX - AC_PROG_CC -+AC_PROG_CXX - AC_STDC_HEADERS - AC_PROG_LIBTOOL - |