summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages')
-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 000000000..135b9e79f
--- /dev/null
+++ b/meta/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch
@@ -0,0 +1,13 @@
+Index: git/cluttermozembed/Makefile.am
+===================================================================
+--- 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-download.c
++ clutter-mozembed-download.c dummy.cpp
+
+ bin_PROGRAMS = clutter-mozheadless
+
diff --git a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
index 135b9e79f..dfb2b5659 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 @@
Index: git/cluttermozembed/Makefile.am
===================================================================
---- 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 = \
+--- git.orig/cluttermozembed/Makefile.am 2009-07-24 16:58:24.000000000 +0100
++++ git/cluttermozembed/Makefile.am 2009-07-24 17:00:53.000000000 +0100
+@@ -66,7 +66,7 @@
clutter-mozembed.c \
+ clutter-mozembed-comms.c \
+ clutter-mozembed-comms.h \
- clutter-mozembed-download.c
+ clutter-mozembed-download.c dummy.cpp
diff --git a/meta/packages/clutter/clutter-mozembed_git.bb b/meta/packages/clutter/clutter-mozembed_git.bb
index 7cce242a4..8986c995b 100644
--- a/meta/packages/clutter/clutter-mozembed_git.bb
+++ b/meta/packages/clutter/clutter-mozembed_git.bb
@@ -1,11 +1,11 @@
require clutter-mozembed.inc
PV = "0.8.0+git${SRCPV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "git://git.clutter-project.org/clutter-mozembed.git;protocol=git \
- file://link-with-g++.patch;patch=1"
-
+ file://link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch;patch=1;rev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41 \
+ file://link-with-g++.patch;patch=1;notrev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41"
S = "${WORKDIR}/git"
do_configure_prepend () {