From e6d96312f5d8d78de3874233b6fa9a891d1a5a76 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 14 May 2009 15:01:07 +0100 Subject: mozilla-headless: Convert to hg and add mozilla-headless-services Signed-off-by: Richard Purdie --- .../mozilla-headless-services/confighack.patch | 13 ++++++ .../mozilla-headless-services_git.bb | 12 ++++++ .../mozilla-headless/mozilla-headless_git.bb | 49 ---------------------- .../mozilla-headless/mozilla-headless_hg.bb | 49 ++++++++++++++++++++++ 4 files changed, 74 insertions(+), 49 deletions(-) create mode 100644 meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch create mode 100644 meta/packages/mozilla-headless/mozilla-headless-services_git.bb delete mode 100644 meta/packages/mozilla-headless/mozilla-headless_git.bb create mode 100644 meta/packages/mozilla-headless/mozilla-headless_hg.bb (limited to 'meta/packages') 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 000000000..dcfe11e0f --- /dev/null +++ b/meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch @@ -0,0 +1,13 @@ +Index: places-glib/configure.ac +=================================================================== +--- places-glib.orig/configure.ac 2009-04-17 10:29:15.000000000 +0100 ++++ places-glib/configure.ac 2009-04-17 10:29:44.000000000 +0100 +@@ -99,6 +99,8 @@ + PKG_CHECK_MODULES(GLIB, [glib-2.0]) + PKG_CHECK_MODULES(DBUS, [dbus-glib-1]) + ++XUL_LIBS="$XUL_LIBS -lmozjs" ++ + MOZHOME=`${PKG_CONFIG} --variable=prefix mozilla-headless`"/lib/xulrunner-"`${PKG_CONFIG} --modversion mozilla-headless` + AC_SUBST([MOZHOME]) + 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 000000000..cb538ee3f --- /dev/null +++ b/meta/packages/mozilla-headless/mozilla-headless-services_git.bb @@ -0,0 +1,12 @@ +SRC_URI = "git://git.moblin.org/mozilla-headless-services.git;protocol=git \ + file://confighack.patch;patch=1" +PV = "0.0+git${SRCREV}" +PR = "r1" + +DEPENDS = "glib-2.0 dbus mozilla-headless" + +S = "${WORKDIR}/git" + +FILES_${PN} += "${datadir}/dbus-1/services" + +inherit autotools_stage diff --git a/meta/packages/mozilla-headless/mozilla-headless_git.bb b/meta/packages/mozilla-headless/mozilla-headless_git.bb deleted file mode 100644 index 7e59ed35f..000000000 --- a/meta/packages/mozilla-headless/mozilla-headless_git.bb +++ /dev/null @@ -1,49 +0,0 @@ - -SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;rev=c6fe23d41598;module=offscreen \ - file://configurefix.patch;patch=1 \ - file://jsautocfg.h \ - file://mozconfig" -PV = "0.0+hg-1.0+c6fe23d41598" -PR = "r0" - -S = "${WORKDIR}/offscreen" - -DEPENDS = "gconf gnome-vfs pango dbus-glib alsa-lib libidl-native sqlite3 libidl" - -FILES_${PN} += "${libdir}/xulrunner-1.9.2a1pre" -FILES_${PN}-dev += "${libdir}/xulrunner-devel-1.9.2a1pre" -FILES_${PN}-dbg += "${libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/.debug" - -inherit autotools_stage mozilla - -acpaths = "-I ${S}/build/autoconf " - -export topsrcdir = "${S}" - -do_configure () { - cp ${S}/build/autoconf/install-sh ${S} - autotools_do_configure - # Yes, we run this twice. The first pass sets up npsrpub-config which then - # sets the values correctly on the second try. Ick. - autotools_do_configure -} - -do_compile () { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - #oe_runmake -f client.mk build_all - base_do_compile -} - -EXTRA_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" - -export LIBXUL_DIST="${S}/dist" - -do_stage_append () { - autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-1.9.2a1pre ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-1.9.2a1pre/ - autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-devel-1.9.2a1pre ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/ - ln -fs ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-1.9.2a1pre/ /media/build2/builds/poky/build1/moblin/staging/i586-poky-linux/usr/lib/xulrunner-devel-1.9.2a1pre/bin - ln -fs ${STAGING_DIR_HOST}${layout_datadir}/xulrunner-1.9.2a1pre/unstable/ /media/build2/builds/poky/build1/moblin/staging/i586-poky-linux/usr/lib/xulrunner-devel-1.9.2a1pre/idl - ln -fs ${STAGING_DIR_HOST}${layout_includedir}/xulrunner-1.9.2a1pre/unstable/ /media/build2/builds/poky/build1/moblin/staging/i586-poky-linux/usr/lib/xulrunner-devel-1.9.2a1pre/include - ln -fs ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/ /media/build2/builds/poky/build1/moblin/staging/i586-poky-linux/usr/lib/xulrunner-devel-1.9.2a1pre/lib -} - diff --git a/meta/packages/mozilla-headless/mozilla-headless_hg.bb b/meta/packages/mozilla-headless/mozilla-headless_hg.bb new file mode 100644 index 000000000..e3ef60b78 --- /dev/null +++ b/meta/packages/mozilla-headless/mozilla-headless_hg.bb @@ -0,0 +1,49 @@ + +SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;rev=71b4ab01cbf2;module=offscreen \ + file://configurefix.patch;patch=1 \ + file://jsautocfg.h \ + file://mozconfig" +PV = "0.0+hg-1.0+71b4ab01cbf2" +PR = "r0" + +S = "${WORKDIR}/offscreen" + +DEPENDS = "gconf gnome-vfs pango dbus-glib alsa-lib libidl-native sqlite3 libidl" + +FILES_${PN} += "${libdir}/xulrunner-1.9.2a1pre" +FILES_${PN}-dev += "${libdir}/xulrunner-devel-1.9.2a1pre" +FILES_${PN}-dbg += "${libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/.debug" + +inherit autotools_stage mozilla + +acpaths = "-I ${S}/build/autoconf " + +export topsrcdir = "${S}" + +do_configure () { + cp ${S}/build/autoconf/install-sh ${S} + autotools_do_configure + # Yes, we run this twice. The first pass sets up npsrpub-config which then + # sets the values correctly on the second try. Ick. + autotools_do_configure +} + +do_compile () { + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + #oe_runmake -f client.mk build_all + base_do_compile +} + +EXTRA_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" + +export LIBXUL_DIST="${S}/dist" + +do_stage_append () { + autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-1.9.2a1pre ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-1.9.2a1pre/ + autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-devel-1.9.2a1pre ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/ + ln -fs ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-1.9.2a1pre/ /media/build2/builds/poky/build1/moblin/staging/i586-poky-linux/usr/lib/xulrunner-devel-1.9.2a1pre/bin + ln -fs ${STAGING_DIR_HOST}${layout_datadir}/xulrunner-1.9.2a1pre/unstable/ /media/build2/builds/poky/build1/moblin/staging/i586-poky-linux/usr/lib/xulrunner-devel-1.9.2a1pre/idl + ln -fs ${STAGING_DIR_HOST}${layout_includedir}/xulrunner-1.9.2a1pre/unstable/ /media/build2/builds/poky/build1/moblin/staging/i586-poky-linux/usr/lib/xulrunner-devel-1.9.2a1pre/include + ln -fs ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/ /media/build2/builds/poky/build1/moblin/staging/i586-poky-linux/usr/lib/xulrunner-devel-1.9.2a1pre/lib +} + -- cgit v1.2.3