diff options
Diffstat (limited to 'packages/mozilla')
| -rw-r--r-- | packages/mozilla/fennec/mozconfig | 22 | ||||
| -rw-r--r-- | packages/mozilla/fennec_hg.bb | 45 | ||||
| -rw-r--r-- | packages/mozilla/firefox.inc | 40 |
3 files changed, 52 insertions, 55 deletions
diff --git a/packages/mozilla/fennec/mozconfig b/packages/mozilla/fennec/mozconfig index f4b2c5aa95..ba4099d691 100644 --- a/packages/mozilla/fennec/mozconfig +++ b/packages/mozilla/fennec/mozconfig @@ -1,25 +1,9 @@ -# Options for client.mk. mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile" -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../mobilebase - -# Global options -#ac_add_options --enable-debug -#ac_add_options --disable-optimize -#ac_add_options --enable-logging -#ac_cv_visibility_pragma=no +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir +mk_add_options AUTOCONF=autoconf2.13 -#ac_add_options --enable-timeline +ac_add_options --disable-javaxpcom -# XULRunner options ac_add_app_options xulrunner --enable-application=xulrunner -ac_add_app_options xulrunner --disable-javaxpcom -# mobile options ac_add_app_options mobile --enable-application=mobile -ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist - -# configure will be automatically generated using the 'autoconf-2.13' -# command. If autoconf-2.13 isn't the right name for your system, as -# is the case on OS X using MacPorts, use the real command name as -# demonstrated below. -mk_add_options AUTOCONF=autoconf2.13 diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb index 8aeca90f6e..24ff40dd2e 100644 --- a/packages/mozilla/fennec_hg.bb +++ b/packages/mozilla/fennec_hg.bb @@ -1,9 +1,10 @@ -DEPENDS += "cairo" +DEPENDS += "cairo alsa-lib " -PV = "0.0" +PV = "0.7" +PR = "r1" -SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=d14db8996980 \ - hg://hg.mozilla.org/;module=mobile-browser;rev=60dd20721284 \ +SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=7352ef83055a \ + hg://hg.mozilla.org/;module=mobile-browser;rev=767c0315369c \ file://jsautocfg.h \ " @@ -12,9 +13,12 @@ S = "${WORKDIR}/mozilla-central" inherit mozilla require firefox.inc +PARALLEL_MAKE = "" export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" +export LIBXUL_DIST="${S}/objdir/xulrunner/dist/" + do_configure_prepend() { if [ -e ${WORKDIR}/mobile-browser ] ; then mv ${WORKDIR}/mobile-browser ${S}/mobile @@ -24,19 +28,28 @@ do_configure_prepend() { do_compile_prepend() { cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk + cp ${WORKDIR}/jsautocfg.h ${S}/objdir/xulrunner/js/src/ + sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \ + -e s:'$(OS_TEST)':${TARGET_ARCH}:g \ + ${S}/security/coreconf/Linux.mk + + sed -i -e /LIBXUL_DIST/d \ + -e /LIBXUL_SDK/d \ + ${S}/objdir/mobile/config/autoconf.mk + + echo "LIBXUL_DIST = ${S}/objdir/xulrunner/dist" >> ${S}/objdir/mobile/config/autoconf.mk + echo "LIBXUL_SDK = ${S}/objdir/xulrunner/dist" >> ${S}/objdir/mobile/config/autoconf.mk } -do_stage() { - install -d ${STAGING_INCDIR}/fennec-${PV} - cd dist/sdk/include - rm -rf obsolete - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/fennec-${PV}/ - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/fennec-${PV}/nsIServiceManager.h + +do_install() { + cd ${S}/objdir/mobile/ + oe_runmake package + install -d ${D}/${libdir} + tar xjf ${S}/objdir/mobile/dist/fennec-${PV}*.tar.bz2 -C ${D}/${libdir} + # remove x86 binary + rm ${D}/${libdir}/fennec/xulrunner/nsinstall } +FILES_${PN} += "${libdir}/fennec" + diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc index 1fae3a759e..76f12df365 100644 --- a/packages/mozilla/firefox.inc +++ b/packages/mozilla/firefox.inc @@ -1,26 +1,26 @@ SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop" -PACKAGES =+ "firefox-inspector" +PACKAGES =+ "${PN}-inspector" -PACKAGES += "firefox-sdk" +PACKAGES += "${PN}-sdk" -FILES_firefox-inspector = " ${libdir}/firefox-${PV}/chrome/inspector* \ - ${libdir}/firefox-${PV}/components/*nspector* \ - ${libdir}/firefox-${PV}/extensions/inspector* \ - ${libdir}/firefox-${PV}/defaults/preferences/inspector* \ +FILES_${PN}-inspector = " ${libdir}/${PN}-${PV}/chrome/inspector* \ + ${libdir}/${PN}-${PV}/components/*nspector* \ + ${libdir}/${PN}-${PV}/extensions/inspector* \ + ${libdir}/${PN}-${PV}/defaults/preferences/inspector* \ " -FILES_${PN} = "${bindir}/firefox \ +FILES_${PN} = "${bindir}/${PN} \ ${datadir}/applications/ \ ${datadir}/pixmaps/ \ - ${libdir}/firefox-${PV}/* \ - ${libdir}/firefox-${PV}/.autoreg \ + ${libdir}/${PN}-${PV}/* \ + ${libdir}/${PN}-${PV}/.autoreg \ ${bindir}/defaults" -FILES_${PN}-dev += "${datadir}/idl ${bindir}/firefox-config" -FILES_firefox-sdk += "${libdir}/firefox-devel-${PV}" -FILES_${PN}-dbg += " ${libdir}/firefox-*/.debug \ - ${libdir}/firefox-*/*/.debug \ - ${libdir}/firefox-*/*/*/.debug \ - ${libdir}/firefox-*/*/*/*/.debug \ +FILES_${PN}-dev += "${datadir}/idl ${bindir}/${PN}-config" +FILES_${PN}-sdk += "${libdir}/${PN}-devel-${PV}" +FILES_${PN}-dbg += " ${libdir}/${PN}-*/.debug \ + ${libdir}/${PN}-*/*/.debug \ + ${libdir}/${PN}-*/*/*/.debug \ + ${libdir}/${PN}-*/*/*/*/.debug \ ${bindir}/.debug \ " @@ -28,14 +28,14 @@ do_install() { oe_runmake DESTDIR="${D}" destdir="${D}" install install -d ${D}${datadir}/applications install -d ${D}${datadir}/pixmaps - install -m 0644 ${WORKDIR}/mozilla-firefox.desktop ${D}${datadir}/applications/ - install -m 0644 ${WORKDIR}/mozilla-firefox.png ${D}${datadir}/pixmaps/ - rm -f ${D}${libdir}/firefox-*/TestGtkEmbed + install -m 0644 ${WORKDIR}/mozilla-${PN}.desktop ${D}${datadir}/applications/ + install -m 0644 ${WORKDIR}/mozilla-${PN}.png ${D}${datadir}/pixmaps/ + rm -f ${D}${libdir}/${PN}-*/TestGtkEmbed } -pkg_postinst_firefox() { +pkg_postinst_${PN}() { # work around requirement for root access on first startup - chmod -R a+w ${libdir}/firefox* ||true + chmod -R a+w ${libdir}/${PN}* ||true } do_stage() { |