diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-08-11 09:13:43 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-08-11 09:13:43 +0100 |
commit | f860c8f0f77d1b48fa1b8cf23d5381e0e2556ef4 (patch) | |
tree | cc8ef7f3816c46eed42796f4ae5c300eb5a3bd43 /meta/packages/clutter | |
parent | 51536c814ae073a2b5d0c62f6377594da1ccad3c (diff) | |
download | poky-f860c8f0f77d1b48fa1b8cf23d5381e0e2556ef4.tar.gz |
clutter-mozembed: Drop unneeded patch
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/clutter')
-rw-r--r-- | meta/packages/clutter/clutter-mozembed/clutter10.patch | 26 | ||||
-rw-r--r-- | meta/packages/clutter/clutter-mozembed_git.bb | 3 |
2 files changed, 1 insertions, 28 deletions
diff --git a/meta/packages/clutter/clutter-mozembed/clutter10.patch b/meta/packages/clutter/clutter-mozembed/clutter10.patch deleted file mode 100644 index e6034f696d..0000000000 --- a/meta/packages/clutter/clutter-mozembed/clutter10.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Index: git/configure.ac | ||
2 | =================================================================== | ||
3 | --- git.orig/configure.ac 2009-07-31 10:17:45.000000000 +0100 | ||
4 | +++ git/configure.ac 2009-07-31 10:18:05.000000000 +0100 | ||
5 | @@ -29,7 +29,7 @@ | ||
6 | |||
7 | PKG_CHECK_MODULES(GOBJECT, gobject-2.0 >= 2.12.0 gio-2.0) | ||
8 | PKG_CHECK_MODULES(GTHREAD, gthread-2.0) | ||
9 | -PKG_CHECK_MODULES(CLUTTER, clutter-0.9 >= 0.9.0) | ||
10 | +PKG_CHECK_MODULES(CLUTTER, clutter-1.0 >= 1.0.0) | ||
11 | PKG_CHECK_MODULES(MOZILLA, mozilla-js mozilla-headless >= 1.9.2a1pre) | ||
12 | PKG_CHECK_MODULES(MHS, mhs-1.0) | ||
13 | |||
14 | Index: git/cluttermozembed/cluttermozembed.pc.in | ||
15 | =================================================================== | ||
16 | --- git.orig/cluttermozembed/cluttermozembed.pc.in 2009-07-31 11:44:08.000000000 +0100 | ||
17 | +++ git/cluttermozembed/cluttermozembed.pc.in 2009-07-31 11:44:17.000000000 +0100 | ||
18 | @@ -5,7 +5,7 @@ | ||
19 | |||
20 | Name: cluttermozembed | ||
21 | Description: A Clutter actor that embeds Mozilla | ||
22 | -Requires: clutter-0.9 mozilla-js mozilla-headless | ||
23 | +Requires: clutter-1.0 mozilla-js mozilla-headless | ||
24 | Version: @VERSION@ | ||
25 | Libs: -L${libdir} -lcluttermozembed | ||
26 | Cflags: -I${includedir}/cluttermozembed | ||
diff --git a/meta/packages/clutter/clutter-mozembed_git.bb b/meta/packages/clutter/clutter-mozembed_git.bb index bdd96a8cbf..e88f138f38 100644 --- a/meta/packages/clutter/clutter-mozembed_git.bb +++ b/meta/packages/clutter/clutter-mozembed_git.bb | |||
@@ -5,8 +5,7 @@ PR = "r5" | |||
5 | 5 | ||
6 | SRC_URI = "git://git.clutter-project.org/clutter-mozembed.git;protocol=git \ | 6 | SRC_URI = "git://git.clutter-project.org/clutter-mozembed.git;protocol=git \ |
7 | file://link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch;patch=1;rev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41 \ | 7 | file://link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch;patch=1;rev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41 \ |
8 | file://link-with-g++.patch;patch=1;notrev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41 \ | 8 | file://link-with-g++.patch;patch=1;notrev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41" |
9 | file://clutter10.patch;patch=1;notrev=84a39de2020003464c67e3df29312c09222cff0e" | ||
10 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
11 | 10 | ||
12 | do_configure_prepend () { | 11 | do_configure_prepend () { |