diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-05 14:50:56 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-05 14:50:56 +0000 |
commit | bb1427f0b953a7a7c038228edc03611b8e37b8d7 (patch) | |
tree | 12165faa9f03af8c9fb50681b4573d3758bf1532 | |
parent | 851267d2af857aa8211f7b7451fd4d2c41cc6f3a (diff) | |
download | poky-bb1427f0b953a7a7c038228edc03611b8e37b8d7.tar.gz |
moblin-floating-revisions: Use mx branch for moblin-web-browser
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | meta-moblin/conf/distro/include/moblin-floating-revisions.inc | 2 | ||||
-rw-r--r-- | meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc index 8e63005a8c..9c0c87362f 100644 --- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc | |||
@@ -93,3 +93,5 @@ PREFERRED_VERSION_libx11-trim ?= "1.2.1+git%" | |||
93 | 93 | ||
94 | PREFERRED_VERSION_libxcb ?= "1.3" | 94 | PREFERRED_VERSION_libxcb ?= "1.3" |
95 | PREFERRED_VERSION_xcb-proto ?= "1.5" | 95 | PREFERRED_VERSION_xcb-proto ?= "1.5" |
96 | |||
97 | MOBLINBROWSERBRANCH = "mx" | ||
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb index b03e9e18d9..befc28a2a0 100644 --- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb +++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | DESCRIPTION = "Moblin web browser (based on clutter + mozilla-headless/mozilla-offscreen)" | 1 | DESCRIPTION = "Moblin web browser (based on clutter + mozilla-headless/mozilla-offscreen)" |
2 | SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \ | 2 | SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git;branch=${MOBLINBROWSERBRANCH} \ |
3 | file://xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch;patch=1;rev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666 \ | 3 | file://xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch;patch=1;rev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666 \ |
4 | file://xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch;patch=1;rev=78ddd155cc297811720e4c4835d468ac6c4d9666;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6 \ | 4 | file://xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch;patch=1;rev=78ddd155cc297811720e4c4835d468ac6c4d9666;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6 \ |
5 | file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666" | 5 | file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666" |
@@ -11,6 +11,8 @@ DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk-0.10 libunique mozilla-headl | |||
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | MOBLINBROWSERBRANCH ?= "master" | ||
15 | |||
14 | EXTRA_OECONF = "--with-idl-prefix=${STAGING_DIR_TARGET}/" | 16 | EXTRA_OECONF = "--with-idl-prefix=${STAGING_DIR_TARGET}/" |
15 | 17 | ||
16 | FILES_${PN} += "${datadir}/moblin-web-browser/chrome/* ${libdir}/xulrunner-*/chrome/* ${datadir}/dbus-1/services/*" | 18 | FILES_${PN} += "${datadir}/moblin-web-browser/chrome/* ${libdir}/xulrunner-*/chrome/* ${datadir}/dbus-1/services/*" |