7 files changed, 75 insertions, 6 deletions
diff --git a/packages/mozilla/fennec/mozconfig b/packages/mozilla/fennec/mozconfig
index ba4099d691..7696f78a9c 100644
--- a/packages/mozilla/fennec/mozconfig
+++ b/packages/mozilla/fennec/mozconfig
@@ -4,6 +4,11 @@ mk_add_options AUTOCONF=autoconf2.13
 
 ac_add_options --disable-javaxpcom
 
+ac_add_options --enable-system-cairo
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+
 ac_add_app_options xulrunner --enable-application=xulrunner
 
 ac_add_app_options mobile --enable-application=mobile
diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb
index 8c6f326f73..ecc2876bec 100644
--- a/packages/mozilla/fennec_hg.bb
+++ b/packages/mozilla/fennec_hg.bb
@@ -2,12 +2,12 @@ DESCRIPTION = "Mozilla Mobile browser"
 DEPENDS += "cairo alsa-lib "
 
 PV = "0.9+1.0a1"
-MOZPV = "1.0a1"
-PR = "r0"
+MOZPV = "1.0a2pre"
+PR = "r1"
 PE = "1"
 
-SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=6c2f8bd79cbc \
-           hg://hg.mozilla.org/;module=mobile-browser;rev=8f96b58057ad \
+SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=30a69fb5df8e \
+           hg://hg.mozilla.org/;module=mobile-browser;rev=b6dd20dc72fa \
            file://jsautocfg.h \
            file://jsautocfg-dontoverwrite.patch;patch=1 \
 "
diff --git a/packages/mozilla/firefox-3.0.1/mozconfig b/packages/mozilla/firefox-3.0.1/mozconfig
index f7ab5dd3a3..652c780bbd 100644
--- a/packages/mozilla/firefox-3.0.1/mozconfig
+++ b/packages/mozilla/firefox-3.0.1/mozconfig
@@ -12,6 +12,7 @@ ac_add_options --enable-single-profile
 
 ac_add_options --with-system-zlib
 ac_add_options --with-system-jpeg
+ac_add_options --with-system-bz2
 #ac_add_options --with-system-png
 
 ac_add_options --disable-accessibility
diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc
index 9cc670a9ba..419398de95 100644
--- a/packages/mozilla/firefox.inc
+++ b/packages/mozilla/firefox.inc
@@ -2,6 +2,7 @@ DESCRIPTION ?= "Browser made by mozilla"
 SRC_URI += "file://mozilla-${PN}.png file://mozilla-${PN}.desktop"
 
 PARALLEL_MAKE = ""
+ARM_INSTRUCTION_SET = "arm"
 
 MOZPV ?= "${PV}"
 
@@ -47,3 +48,34 @@ do_stage() {
 	autotools_stage_all
 }
 
+# We don't build XUL as system shared lib, so we can mark all libs as private
+PRIVATE_LIBS = "libnssckbi.so \
+                libxpcom.so \
+                libplc4.so \
+                libssl3.so \
+                libfreebl3.so \
+                libnss3.so \
+                libnspr4.so \
+                libmozjs.so \
+                libxul.so \
+                libplds4.so \
+                libnssutil3.so \
+                libsqlite3.so \
+                libsoftokn3.so \
+                libnssdbm3.so \
+                libsmime3.so \
+                libnullplugin.so \
+                libimgicon.so \
+                libdbusservice.so \
+                libbrowserdirprovider.so \
+                libbrowsercomps.so \
+                libnptest.so \
+                libMyService.so \
+                libmozgnome.so \
+                libtestdynamic.so \
+                libnkgnomevfs.so \
+                libxpcomsample.so \
+                libunixprintplugin.so \
+"
+
+
diff --git a/packages/mozilla/firefox_3.0.1.bb b/packages/mozilla/firefox_3.0.1.bb
index 5d09bb4375..24927c7f3d 100644
--- a/packages/mozilla/firefox_3.0.1.bb
+++ b/packages/mozilla/firefox_3.0.1.bb
@@ -1,5 +1,5 @@
 DEPENDS += "cairo"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
diff --git a/packages/mozilla/firefox_3.1b1.bb b/packages/mozilla/firefox_3.1b1.bb
index eac4adcb75..7a41491ea7 100644
--- a/packages/mozilla/firefox_3.1b1.bb
+++ b/packages/mozilla/firefox_3.1b1.bb
@@ -2,7 +2,7 @@ DEPENDS += "cairo"
 
 PV = "3.0.1+3.1b1"
 MOZPV = "3.1b1"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build2/source/firefox-${MOZPV}-source.tar.bz2 \
 	file://jsautocfg.h \
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index b94dff2ab1..074f0e123b 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -12,6 +12,7 @@ MOZDATE = "20070626"
 
 PV = "0.02+cvs${MOZDATE}"
 PE = "1"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
 	   file://minimo.patch;patch=1 \
@@ -149,5 +150,35 @@ do_install() {
 	install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html
 }
 
+# We don't build XUL as system shared lib, so we can mark all libs as private
+PRIVATE_LIBS = "libnssckbi.so \
+                libxpcom.so \
+                libplc4.so \
+                libssl3.so \
+                libfreebl3.so \
+                libnss3.so \
+                libnspr4.so \
+                libmozjs.so \
+                libxul.so \
+                libplds4.so \
+                libnssutil3.so \
+                libsqlite3.so \
+                libsoftokn3.so \
+                libnssdbm3.so \
+                libsmime3.so \
+                libnullplugin.so \
+                libimgicon.so \
+                libdbusservice.so \
+                libbrowserdirprovider.so \
+                libbrowsercomps.so \
+                libnptest.so \
+                libMyService.so \
+                libmozgnome.so \
+                libtestdynamic.so \
+                libnkgnomevfs.so \
+                libxpcomsample.so \
+                libunixprintplugin.so \
+"
+
 FILES_${PN}-dbg += "${libdir}/mozilla-minimo/.debug*"
 FILES_${PN} += "${mozdir}"