Update thunderbird-libre to 9.0.1.

4 files changed, 19 insertions, 21 deletions

diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD
index 9ac8350ce..6a517c112 100644
--- a/libre/thunderbird-libre/PKGBUILD
+++ b/libre/thunderbird-libre/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 145298 2011-12-21 14:25:49Z ibiru $
+# $Id: PKGBUILD 145619 2011-12-24 12:00:02Z ibiru $
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom@home.se>
 pkgname=thunderbird-libre
-pkgver=9.0
+pkgver=9.0.1
 pkgrel=1
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
 url="http://www.mozilla.org/thunderbird/"
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification')
-makedepends=('p7zip-libre' 'zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'yasm' 'mesa')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
 conflicts=('thunderbird')
@@ -19,19 +19,18 @@ install=thunderbird.install
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2
         mozconfig
         thunderbird.desktop
-        thunderbird-3.0-lang.patch
         thunderbird-install-dir.patch
-        channel-prefs.js)
-md5sums=('681bdf6362945b59b2bec23f8aecc7e7'
+        channel-prefs.js
+        vendor.js)
+md5sums=('a5904751dbd33074682b438b732fdbab'
          'ca98c2bf1017b33e19dae22fdcef2e73'
          'af3e5b344d2edf1c7d61bb0a5a96de9a'
-         '25b6fe16ac24cd5c852213e5c1adb272'
          'aea906acf72c43dd82ead2fabcc1c6db'
-         '476ec205162340fb0679f522c9d31c3b')
+         '476ec205162340fb0679f522c9d31c3b'
+         '5a53179d14ae9631b7afe5e4d0fc0b25')
 
 build() {
   cd "$srcdir/comm-release"
-  patch -Np1 -i "$srcdir/thunderbird-3.0-lang.patch"
   patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
 
   cp "$srcdir/mozconfig" .mozconfig
@@ -46,6 +45,8 @@ package() {
   cd "$srcdir/comm-release"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
+  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/pref/"
+
   for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
       install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
           "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
diff --git a/libre/thunderbird-libre/thunderbird-3.0-lang.patch b/libre/thunderbird-libre/thunderbird-3.0-lang.patch
deleted file mode 100644
index b9f4a5cde..000000000
--- a/libre/thunderbird-libre/thunderbird-3.0-lang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-10-11 02:12:44.000000000 +0200
-+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-09-16 02:56:45.000000000 +0200
-@@ -890,7 +890,7 @@
- pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
- pref("intl.charset.default",                "chrome://global-platform/locale/intl.properties");
- pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
--pref("intl.locale.matchOS",                 false);
-+pref("intl.locale.matchOS",                 true);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
- // for ISO-8859-1
diff --git a/libre/thunderbird-libre/thunderbird-install-dir.patch b/libre/thunderbird-libre/thunderbird-install-dir.patch
index fc6e24c4c..74e692bf2 100644
--- a/libre/thunderbird-libre/thunderbird-install-dir.patch
+++ b/libre/thunderbird-libre/thunderbird-install-dir.patch
@@ -40,4 +40,3 @@ diff -Nur comm-beta.orig/mozilla/js/src/config/autoconf.mk.in comm-beta/mozilla/
  
  TOP_DIST	= @TOP_DIST@
  ifneq (,$(filter /%,$(TOP_DIST)))
-
diff --git a/libre/thunderbird-libre/vendor.js b/libre/thunderbird-libre/vendor.js
new file mode 100644
index 000000000..170b505a8
--- /dev/null
+++ b/libre/thunderbird-libre/vendor.js
@@ -0,0 +1,9 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default mailer checking.
+pref("mail.shell.checkDefaultMail", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);