[arch-commits] Commit in firefox/trunk (3 files)

[Ionut Biru]

    Date: Thursday, December 22, 2011 @ 07:33:37
  Author: ibiru
Revision: 145444

update to 9.0.1
implement vendor.js setting the locale to match the os
don't disable our languages extensions

Added:
  firefox/trunk/vendor.js
Modified:
  firefox/trunk/PKGBUILD
Deleted:
  firefox/trunk/mozilla-firefox-1.0-lang.patch

--------------------------------+
 PKGBUILD                       |   15 ++++++++-------
 mozilla-firefox-1.0-lang.patch |   12 ------------
 vendor.js                      |    9 +++++++++
 3 files changed, 17 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-22 10:25:42 UTC (rev 145443)
+++ PKGBUILD	2011-12-22 12:33:37 UTC (rev 145444)
@@ -2,7 +2,7 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=9.0
+pkgver=9.0.1
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
@@ -11,19 +11,18 @@
 makedepends=('unzip' 'zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'libidl2' 'xorg-server-xvfb')
 url="http://www.mozilla.org/projects/firefox"
 install=firefox.install
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//${pkgver}/source/firefox-${pkgver}.source.tar.bz2
-        mozconfig firefox.desktop mozilla-firefox-1.0-lang.patch firefox-install-dir.patch)
-md5sums=('d8d0c8c79660752b02d9e9ab69a68f94'
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/firefox-$pkgver.source.tar.bz2
+        mozconfig firefox.desktop firefox-install-dir.patch vendor.js)
+md5sums=('7cf2bd379792a9b232267c6a79680566'
          '4b925c654eb2484e26d08f743df118fa'
          'bdeb0380c7fae30dd0ead6d2d3bc5873'
-         'bd5db57c23c72a02a489592644f18995'
-         '594523c536a9be951b52c90dd85aff18')
+         '594523c536a9be951b52c90dd85aff18'
+         '0d053487907de4376d67d8f499c5502b')
 
 build() {
   cd "$srcdir/mozilla-release"
 
   cp "$srcdir/mozconfig" .mozconfig
-  patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch"
   patch -Np1 -i "$srcdir/firefox-install-dir.patch"
 
   # Fix PRE_RELEASE_SUFFIX
@@ -42,6 +41,8 @@
   cd "$srcdir/mozilla-release"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
+  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/firefox/defaults/pref"
+
   for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
       install -Dm644 browser/branding/official/default${i/x*/}.png \
         "$pkgdir/usr/share/icons/hicolor/$i/apps/firefox.png"

Deleted: mozilla-firefox-1.0-lang.patch
===================================================================
--- mozilla-firefox-1.0-lang.patch	2011-12-22 10:25:42 UTC (rev 145443)
+++ mozilla-firefox-1.0-lang.patch	2011-12-22 12:33:37 UTC (rev 145444)
@@ -1,12 +0,0 @@
---- mozilla/browser/app/profile/firefox.js.lang	2005-01-13 15:32:03.509282726 +0100
-+++ mozilla/browser/app/profile/firefox.js	2005-01-13 15:33:40.220914789 +0100
-@@ -253,6 +253,9 @@
- pref("font.language.group", "chrome://global/locale/intl.properties");
- pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
- 
-+// Use LANG environment variable to choose locale
-+pref("intl.locale.matchOS", true);
-+
- // 0=lines, 1=pages, 2=history , 3=text size
- pref("mousewheel.withcontrolkey.action",3);
- pref("mousewheel.withshiftkey.action",2);

Added: vendor.js
===================================================================
--- vendor.js	                        (rev 0)
+++ vendor.js	2011-12-22 12:33:37 UTC (rev 145444)
@@ -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);