Merge remote-tracking branch 'x/master'

* x/master:
  firefox: update to 10.0.

srcpkgs/firefox/files/vendor.js

@@ -0,0 +1,9 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);

srcpkgs/firefox/firefox.rshlibs

@@ -17,7 +17,6 @@ libsqlite3.so.0
 libz.so.1
 libhunspell-1.2.so.0
 libevent-2.0.so.5
-libvpx.so.0
 libasound.so.2
 libplds4.so
 libplc4.so
@@ -47,3 +46,4 @@ libdbus-glib-1.so.2
 libgconf-2.so.4
 libnotify.so.4
 ld-linux.so.2
+libvpx.so.1

srcpkgs/firefox/template

@@ -1,13 +1,13 @@
 # Template build file for 'firefox'.
 pkgname=firefox
-version=9.0.1
+version=10.0
 wrksrc=mozilla-release
-distfiles="ftp://ftp.mozilla.org/pub/mozilla.org/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
+distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
 short_desc="Lightweight gecko-based web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mozilla.org/projects/firefox"
 license="MPL-1.1, GPL-2, LGPL-2.1"
-checksum=f852011c28b00b26803b4618b52de79c705204b2f4eadba08092a379f94babae
+checksum=b7392508c75ee5f326168883f696ea5ba6ae6ad57926588889e46648e5cfedb1
 long_desc="
  Mozilla Firefox is a free, open-source and cross-platform web browser
  for Windows, Linux, MacOS X and many other operating systems. It is
@@ -30,16 +30,17 @@ Add_dependency build perl	">=0"
 Add_dependency build python	">=2.7.2_3" # linux2 sys.platform fix
 Add_dependency build yasm
 Add_dependency build jpeg-devel
+Add_dependency build libpng-devel
 Add_dependency build pixman-devel
 Add_dependency build libIDL-devel
 Add_dependency build nss-devel
 Add_dependency build sqlite-devel
+Add_dependency build libXrender-devel
+Add_dependency build libXScrnSaver-devel
 Add_dependency build gtk+-devel
 Add_dependency build libevent-devel
 Add_dependency build libnotify-devel
 Add_dependency build libvpx-devel
-Add_dependency build libXrender-devel
-Add_dependency build libXScrnSaver-devel
 Add_dependency build GConf-devel
 Add_dependency build startup-notification-devel
 Add_dependency build dbus-glib-devel
@@ -52,12 +53,17 @@ do_build() {
 	sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' browser/base/Makefile.in
 	cp -f ${FILESDIR}/mozconfig .mozconfig
 	export LDFLAGS="$XBPS_LDFLAGS -Wl,-R/usr/lib/firefox"
+	# Fix for libvpx-1.0.0 detection.
+	sed -i -e "s|VPX_CODEC_USE_INPUT_PARTITION|VPX_CODEC_USE_INPUT_FRAGMENTS|g" configure
+
 	make ${makejobs} -f client.mk MOZ_MAKE_FLAGS="${makejobs}"
 }
 
 do_install() {
 	make -f client.mk DESTDIR=${DESTDIR} install
 
+	vinstall ${FILESDIR}/vendor.js 644 usr/lib/firefox/defaults/pref
+
 	vinstall ${FILESDIR}/firefox.desktop 644 usr/share/applications
 	for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
 		vinstall browser/branding/official/default${i%x*}.png 644 \