summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-05-14 15:01:07 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-05-14 15:01:07 +0100
commite6d96312f5d8d78de3874233b6fa9a891d1a5a76 (patch)
tree35d054e021a9b2924e529661ac4d8f4bbcafff59
parent59bb17f5c492e2f3e32df8e1a29b4cb8fddb4b05 (diff)
downloadpoky-e6d96312f5d8d78de3874233b6fa9a891d1a5a76.tar.gz
mozilla-headless: Convert to hg and add mozilla-headless-services
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch13
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless-services_git.bb12
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless_hg.bb (renamed from meta/packages/mozilla-headless/mozilla-headless_git.bb)6
3 files changed, 28 insertions, 3 deletions
diff --git a/meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch b/meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch
new file mode 100644
index 0000000000..dcfe11e0ff
--- /dev/null
+++ b/meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch
@@ -0,0 +1,13 @@
1Index: places-glib/configure.ac
2===================================================================
3--- places-glib.orig/configure.ac 2009-04-17 10:29:15.000000000 +0100
4+++ places-glib/configure.ac 2009-04-17 10:29:44.000000000 +0100
5@@ -99,6 +99,8 @@
6 PKG_CHECK_MODULES(GLIB, [glib-2.0])
7 PKG_CHECK_MODULES(DBUS, [dbus-glib-1])
8
9+XUL_LIBS="$XUL_LIBS -lmozjs"
10+
11 MOZHOME=`${PKG_CONFIG} --variable=prefix mozilla-headless`"/lib/xulrunner-"`${PKG_CONFIG} --modversion mozilla-headless`
12 AC_SUBST([MOZHOME])
13
diff --git a/meta/packages/mozilla-headless/mozilla-headless-services_git.bb b/meta/packages/mozilla-headless/mozilla-headless-services_git.bb
new file mode 100644
index 0000000000..cb538ee3fb
--- /dev/null
+++ b/meta/packages/mozilla-headless/mozilla-headless-services_git.bb
@@ -0,0 +1,12 @@
1SRC_URI = "git://git.moblin.org/mozilla-headless-services.git;protocol=git \
2 file://confighack.patch;patch=1"
3PV = "0.0+git${SRCREV}"
4PR = "r1"
5
6DEPENDS = "glib-2.0 dbus mozilla-headless"
7
8S = "${WORKDIR}/git"
9
10FILES_${PN} += "${datadir}/dbus-1/services"
11
12inherit autotools_stage
diff --git a/meta/packages/mozilla-headless/mozilla-headless_git.bb b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
index 7e59ed35f7..e3ef60b783 100644
--- a/meta/packages/mozilla-headless/mozilla-headless_git.bb
+++ b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
@@ -1,9 +1,9 @@
1 1
2SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;rev=c6fe23d41598;module=offscreen \ 2SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;rev=71b4ab01cbf2;module=offscreen \
3 file://configurefix.patch;patch=1 \ 3 file://configurefix.patch;patch=1 \
4 file://jsautocfg.h \ 4 file://jsautocfg.h \
5 file://mozconfig" 5 file://mozconfig"
6PV = "0.0+hg-1.0+c6fe23d41598" 6PV = "0.0+hg-1.0+71b4ab01cbf2"
7PR = "r0" 7PR = "r0"
8 8
9S = "${WORKDIR}/offscreen" 9S = "${WORKDIR}/offscreen"
@@ -34,7 +34,7 @@ do_compile () {
34 base_do_compile 34 base_do_compile
35} 35}
36 36
37EXTRA_OECONF =+ "--enable-application=xulrunner --disable-javaxpcom --enable-system-sqlite --enable-default-toolkit=cairo-headless --disable-printing --disable-crashreporter --disable-plugins --disable-accessibility --enable-pango --disable-tests" 37EXTRA_OECONF =+ "--enable-application=xulrunner --enable-default-toolkit=cairo-headless --enable-pango --disable-optimize --enable-debug --disable-tests --disable-printing --disable-crashreporter --disable-accessibility --disable-javaxpcom --enable-plugins --enable-system-sqlite --disable-necko-wifi"
38 38
39export LIBXUL_DIST="${S}/dist" 39export LIBXUL_DIST="${S}/dist"
40 40