diff options
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/clutter/clutter-1.0_git.bb | 15 | ||||
-rw-r--r-- | meta/packages/clutter/clutter-mozembed/clutter10.patch | 26 | ||||
-rw-r--r-- | meta/packages/clutter/clutter-mozembed/link-with-g++.patch | 4 | ||||
-rw-r--r-- | meta/packages/clutter/clutter-mozembed_git.bb | 11 | ||||
-rw-r--r-- | meta/packages/clutter/clutter/enable_tests-1.0.patch | 32 |
5 files changed, 54 insertions, 34 deletions
diff --git a/meta/packages/clutter/clutter-1.0_git.bb b/meta/packages/clutter/clutter-1.0_git.bb new file mode 100644 index 0000000000..bfa41cd30c --- /dev/null +++ b/meta/packages/clutter/clutter-1.0_git.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | require clutter.inc | ||
2 | |||
3 | PV = "1.0+git${SRCPV}" | ||
4 | PR = "r0" | ||
5 | |||
6 | PACKAGES =+ "clutter-examples-1.0" | ||
7 | FILES_clutter-examples-1.0 = "${bindir}/test-* ${pkgdatadir}/redhand.png" | ||
8 | |||
9 | SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-1.0 \ | ||
10 | file://enable_tests-1.0.patch;patch=1 " | ||
11 | |||
12 | S = "${WORKDIR}/git" | ||
13 | |||
14 | BASE_CONF += "--disable-introspection" | ||
15 | |||
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/link-with-g++.patch b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch index dfb2b5659f..cc9d43a674 100644 --- a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch +++ b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | Index: git/cluttermozembed/Makefile.am | 1 | Index: git/cluttermozembed/Makefile.am |
2 | =================================================================== | 2 | =================================================================== |
3 | --- git.orig/cluttermozembed/Makefile.am 2009-07-24 16:58:24.000000000 +0100 | 3 | --- git.orig/clutter-mozembed/Makefile.am 2009-07-24 16:58:24.000000000 +0100 |
4 | +++ git/cluttermozembed/Makefile.am 2009-07-24 17:00:53.000000000 +0100 | 4 | +++ git/clutter-mozembed/Makefile.am 2009-07-24 17:00:53.000000000 +0100 |
5 | @@ -66,7 +66,7 @@ | 5 | @@ -66,7 +66,7 @@ |
6 | clutter-mozembed.c \ | 6 | clutter-mozembed.c \ |
7 | clutter-mozembed-comms.c \ | 7 | clutter-mozembed-comms.c \ |
diff --git a/meta/packages/clutter/clutter-mozembed_git.bb b/meta/packages/clutter/clutter-mozembed_git.bb index bdd96a8cbf..4a51422e2e 100644 --- a/meta/packages/clutter/clutter-mozembed_git.bb +++ b/meta/packages/clutter/clutter-mozembed_git.bb | |||
@@ -1,15 +1,14 @@ | |||
1 | require clutter-mozembed.inc | 1 | require clutter-mozembed.inc |
2 | 2 | ||
3 | PV = "0.8.0+git${SRCPV}" | 3 | PV = "0.8.0+git${SRCPV}" |
4 | PR = "r5" | 4 | PR = "r6" |
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 () { |
13 | touch ${S}/cluttermozembed/dummy.cpp | 12 | touch ${S}/clutter-mozembed/dummy.cpp |
14 | touch ${S}/cluttermozembed/dummy2.cpp | 13 | touch ${S}/clutter-mozembed/dummy2.cpp |
15 | } \ No newline at end of file | 14 | } |
diff --git a/meta/packages/clutter/clutter/enable_tests-1.0.patch b/meta/packages/clutter/clutter/enable_tests-1.0.patch new file mode 100644 index 0000000000..953edf6bbc --- /dev/null +++ b/meta/packages/clutter/clutter/enable_tests-1.0.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | --- | ||
2 | tests/Makefile.am | 7 ++++++- | ||
3 | tests/test-actors.c | 2 +- | ||
4 | tests/test-text.c | 2 +- | ||
5 | 3 files changed, 8 insertions(+), 3 deletions(-) | ||
6 | |||
7 | Index: git/tests/interactive/Makefile.am | ||
8 | =================================================================== | ||
9 | --- git.orig/tests/interactive/Makefile.am 2009-03-12 11:01:36.000000000 +0000 | ||
10 | +++ git/tests/interactive/Makefile.am 2009-03-12 11:04:12.000000000 +0000 | ||
11 | @@ -77,7 +77,7 @@ | ||
12 | AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) | ||
13 | AM_LDFLAGS = $(CLUTTER_LIBS) | ||
14 | |||
15 | -noinst_PROGRAMS = test-interactive | ||
16 | +bin_PROGRAMS = test-interactive | ||
17 | |||
18 | test_interactive_SOURCES = \ | ||
19 | test-main.c \ | ||
20 | Index: git/tests/interactive/test-actors.c | ||
21 | =================================================================== | ||
22 | --- git.orig/tests/interactive/test-actors.c 2009-03-12 11:01:36.000000000 +0000 | ||
23 | +++ git/tests/interactive/test-actors.c 2009-03-12 11:06:32.000000000 +0000 | ||
24 | @@ -182,7 +182,7 @@ | ||
25 | oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0); | ||
26 | oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5); | ||
27 | |||
28 | - real_hand = clutter_texture_new_from_file ("redhand.png", &error); | ||
29 | + real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error); | ||
30 | if (real_hand == NULL) | ||
31 | { | ||
32 | g_error ("image load failed: %s", error->message); | ||