diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-03 11:39:36 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-03 11:39:36 -0300 |
| commit | ca2e05bb7791418f2af678704160d56d8184a21a (patch) | |
| tree | 48a6f85c00b3ed2362cc4d9c9d7f5230bb854eba /libre/thunderbird-libre | |
| parent | 45675ec8babcd9ea73f6a49f51f6e7da9d1f1592 (diff) | |
| parent | 48c96871761a4aad193d814e87ddb87c322e17d2 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/libgda3/PKGBUILD
community/intel-tbb/PKGBUILD
community/mtpaint/PKGBUILD
extra/cmake/PKGBUILD
extra/graphicsmagick/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdelibs/PKGBUILD
extra/lyx/PKGBUILD
extra/qtscriptgenerator/PKGBUILD
kde-unstable/kdeadmin/PKGBUILD
kde-unstable/kdelibs/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
libre/libretools/PKGBUILD
libre/p7zip-libre/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/wine/PKGBUILD
testing/glibc/PKGBUILD
Diffstat (limited to 'libre/thunderbird-libre')
| -rw-r--r-- | libre/thunderbird-libre/PKGBUILD | 19 | ||||
| -rw-r--r-- | libre/thunderbird-libre/thunderbird-install-dir.patch | 1 | ||||
| -rw-r--r-- | libre/thunderbird-libre/vendor.js | 9 |
3 files changed, 19 insertions, 10 deletions
diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD index 14306a43f..d7bd9bb2e 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' 'mips64el') 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-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); |