]> code.ossystems Code Review - openembedded-core.git/commitdiff
clutter-mozembed: Fix patch against upstream changes
authorRichard Purdie <rpurdie@linux.intel.com>
Wed, 10 Jun 2009 16:25:19 +0000 (17:25 +0100)
committerRichard Purdie <rpurdie@linux.intel.com>
Wed, 10 Jun 2009 16:25:19 +0000 (17:25 +0100)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
meta/packages/clutter/clutter-mozembed/link-with-g++.patch

index 15141a4a097614ebbae7f8c1284bc10b2513221c..135b9e79f0b671d48b2d724156eba22bc8d91197 100644 (file)
@@ -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