summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-07-27 15:20:41 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-07-27 15:20:41 +0100
commitdc50ffba552fb80d790ddf5620910eb8b3f94dc3 (patch)
tree2394fdf78ad495bb28302ba42187c80ee46a43fd
parentd776c574641ab6c4d7f3412b61da2063347d184d (diff)
downloadpoky-dc50ffba552fb80d790ddf5620910eb8b3f94dc3.tar.gz
clutter-mozembed: Update patches
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch13
-rw-r--r--meta/packages/clutter/clutter-mozembed/link-with-g++.patch10
-rw-r--r--meta/packages/clutter/clutter-mozembed_git.bb6
3 files changed, 21 insertions, 8 deletions
diff --git a/meta/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch b/meta/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch
new file mode 100644
index 0000000000..135b9e79f0
--- /dev/null
+++ b/meta/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch
@@ -0,0 +1,13 @@
1Index: git/cluttermozembed/Makefile.am
2===================================================================
3--- git.orig/cluttermozembed/Makefile.am 2009-06-10 15:04:54.000000000 +0100
4+++ git/cluttermozembed/Makefile.am 2009-06-10 15:10:12.000000000 +0100
5@@ -61,7 +61,7 @@
6 clutter-mozembed-private.h
7 source_c = \
8 clutter-mozembed.c \
9- clutter-mozembed-download.c
10+ clutter-mozembed-download.c dummy.cpp
11
12 bin_PROGRAMS = clutter-mozheadless
13
diff --git a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
index 135b9e79f0..dfb2b5659f 100644
--- a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
+++ b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
@@ -1,11 +1,11 @@
1Index: git/cluttermozembed/Makefile.am 1Index: git/cluttermozembed/Makefile.am
2=================================================================== 2===================================================================
3--- git.orig/cluttermozembed/Makefile.am 2009-06-10 15:04:54.000000000 +0100 3--- git.orig/cluttermozembed/Makefile.am 2009-07-24 16:58:24.000000000 +0100
4+++ git/cluttermozembed/Makefile.am 2009-06-10 15:10:12.000000000 +0100 4+++ git/cluttermozembed/Makefile.am 2009-07-24 17:00:53.000000000 +0100
5@@ -61,7 +61,7 @@ 5@@ -66,7 +66,7 @@
6 clutter-mozembed-private.h
7 source_c = \
8 clutter-mozembed.c \ 6 clutter-mozembed.c \
7 clutter-mozembed-comms.c \
8 clutter-mozembed-comms.h \
9- clutter-mozembed-download.c 9- clutter-mozembed-download.c
10+ clutter-mozembed-download.c dummy.cpp 10+ clutter-mozembed-download.c dummy.cpp
11 11
diff --git a/meta/packages/clutter/clutter-mozembed_git.bb b/meta/packages/clutter/clutter-mozembed_git.bb
index 7cce242a4c..8986c995b0 100644
--- a/meta/packages/clutter/clutter-mozembed_git.bb
+++ b/meta/packages/clutter/clutter-mozembed_git.bb
@@ -1,11 +1,11 @@
1require clutter-mozembed.inc 1require clutter-mozembed.inc
2 2
3PV = "0.8.0+git${SRCPV}" 3PV = "0.8.0+git${SRCPV}"
4PR = "r2" 4PR = "r3"
5 5
6SRC_URI = "git://git.clutter-project.org/clutter-mozembed.git;protocol=git \ 6SRC_URI = "git://git.clutter-project.org/clutter-mozembed.git;protocol=git \
7 file://link-with-g++.patch;patch=1" 7 file://link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch;patch=1;rev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41 \
8 8 file://link-with-g++.patch;patch=1;notrev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41"
9S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
10 10
11do_configure_prepend () { 11do_configure_prepend () {