summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO82
-rw-r--r--PKGBUILD250
-rw-r--r--mozconfig42
-rw-r--r--mozconfig-pgo45
-rw-r--r--thunderbird-hg-safe.desktop11
-rw-r--r--thunderbird-hg.desktop174
-rw-r--r--thunderbird-hg.install21
-rw-r--r--vendor.js9
8 files changed, 369 insertions, 265 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b6f293a36112..ca4105022553 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,59 +1,63 @@
+# Generated by mksrcinfo v8
+# Sun Mar 5 11:02:53 UTC 2017
pkgbase = thunderbird-hg
- pkgdesc = Standalone Mail/News reader - Mercurial version with optional PGO
- pkgver = 41.0a1.r18019.c352d4695e28
+ pkgdesc = Standalone mail and news reader from mozilla.org - Mercurial version
+ pkgver = 54.0a1.r21260.cbc772c7b1b4
pkgrel = 1
- url = https://www.mozilla.org/thunderbird
+ url = https://www.mozilla.org/thunderbird/
install = thunderbird-hg.install
arch = i686
arch = x86_64
+ license = MPL
license = GPL
license = LGPL
- license = MPL
- makedepends = autoconf2.13
- makedepends = mercurial
- makedepends = mesa
- makedepends = python2
makedepends = unzip
- makedepends = wireless_tools
- makedepends = yasm
makedepends = zip
- depends = alsa-lib
- depends = dbus-glib
- depends = desktop-file-utils
- depends = fontconfig
- depends = freetype2
- depends = gtk-update-icon-cache
+ makedepends = diffutils
+ makedepends = python2
+ makedepends = yasm
+ makedepends = mesa
+ makedepends = imake
+ makedepends = gconf
+ makedepends = libpulse
+ makedepends = inetutils
+ makedepends = mercurial
+ makedepends = rustup
+ makedepends = python2-appdirs
+ makedepends = python2-packaging
+ makedepends = python2-pyparsing
+ makedepends = python2-six
+ makedepends = autoconf2.13
+ makedepends = python2-setuptools
+ makedepends = gst-libav
+ makedepends = xorg-server-xvfb
+ makedepends = uuid
depends = gtk2
- depends = hicolor-icon-theme
- depends = hunspell
- depends = libjpeg
- depends = libnotify
- depends = libpng
- depends = libvpx
+ depends = mozilla-common
depends = libxt
+ depends = startup-notification
depends = mime-types
- depends = mozilla-common
- depends = nspr
- depends = nss
- depends = pixman
+ depends = dbus-glib
+ depends = alsa-lib
+ depends = libvpx
+ depends = libevent
+ depends = nss>=3.30
+ depends = hunspell
depends = sqlite
- depends = startup-notification
+ depends = ttf-font
+ depends = icu
+ depends = gtk3
+ depends = gst-libav
+ depends = gst-plugins-base-libs
+ depends = gst-plugins-good
+ depends = networkmanager
optdepends = libcanberra: for sound support
- provides = thunderbird=41.0a1.r18019.c352d4695e28
options = !emptydirs
options = !makeflags
- source = hg+https://hg.mozilla.org/comm-central
- source = mozconfig
- source = mozconfig-pgo
+ source = hg+http://hg.mozilla.org/comm-central
source = thunderbird-hg.desktop
- source = thunderbird-hg-safe.desktop
- source = vendor.js
- md5sums = SKIP
- md5sums = 0c5dbb39b27bb72f837921b88a9e48c8
- md5sums = 7b0cf4656fa25e75187aac4a44376ab9
- md5sums = 5699093fbb0bb8d29b15a892ce1cbd52
- md5sums = 603059a0e97ee8b89b71ec4760225b64
- md5sums = 5a53179d14ae9631b7afe5e4d0fc0b25
+ sha256sums = SKIP
+ sha256sums = e4613036e6073ddc508eeb6386ae4cb2170304ff0bb0dafbbdccf1953b6a3b7c
pkgname = thunderbird-hg
diff --git a/PKGBUILD b/PKGBUILD
index a31b90daaf06..31b1f10c4569 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,127 +1,193 @@
# Maintainer: Det <nimetonmaili g-mail>
# Based on [extra]'s thunderbird
-# NOTE: Enable PGO on x86_64?: http://en.wikipedia.org/wiki/Profile-guided_optimization
-_pgo=0 # "1" to enable
-
pkgname=thunderbird-hg
-pkgver=41.0a1.r18019.c352d4695e28
+pkgver=54.0a1.r21260.cbc772c7b1b4
pkgrel=1
-pkgdesc="Standalone Mail/News reader - Mercurial version with optional PGO"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'MPL')
-url="https://www.mozilla.org/thunderbird"
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'fontconfig' 'freetype2' 'gtk-update-icon-cache' 'gtk2'
- 'hicolor-icon-theme' 'hunspell' 'libjpeg' 'libnotify' 'libpng' 'libvpx' 'libxt' 'mime-types'
- 'mozilla-common' 'nspr' 'nss' 'pixman' 'sqlite' 'startup-notification')
-makedepends=('autoconf2.13' 'mercurial' 'mesa' 'python2' 'unzip' 'wireless_tools' 'yasm' 'zip')
-[[ $_pgo = 1 ]] && makedepends+=('imake' 'xorg-server-xvfb')
+pkgdesc="Standalone mail and news reader from mozilla.org - Mercurial version"
+arch=(i686 x86_64)
+license=(MPL GPL LGPL)
+url="https://www.mozilla.org/thunderbird/"
+depends=(gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib
+ libvpx libevent 'nss>=3.30' hunspell sqlite ttf-font icu gtk3 gst-libav
+ gst-plugins-base-libs gst-plugins-good networkmanager)
+makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse inetutils
+ mercurial rustup python2-appdirs python2-packaging python2-pyparsing
+ python2-six autoconf2.13 python2-setuptools gst-libav xorg-server-xvfb
+ uuid)
optdepends=('libcanberra: for sound support')
-provides=("thunderbird=$pkgver")
+options=(!emptydirs !makeflags)
install=$pkgname.install
options=('!emptydirs' '!makeflags')
-source=('hg+https://hg.mozilla.org/comm-central'
- 'mozconfig'
- 'mozconfig-pgo'
- "$pkgname.desktop"
- "$pkgname-safe.desktop"
- 'vendor.js')
-md5sums=('SKIP'
- '0c5dbb39b27bb72f837921b88a9e48c8'
- '7b0cf4656fa25e75187aac4a44376ab9'
- '5699093fbb0bb8d29b15a892ce1cbd52'
- '603059a0e97ee8b89b71ec4760225b64'
- '5a53179d14ae9631b7afe5e4d0fc0b25')
+source=(hg+http://hg.mozilla.org/comm-central
+ thunderbird-hg.desktop)
+sha256sums=('SKIP'
+ 'e4613036e6073ddc508eeb6386ae4cb2170304ff0bb0dafbbdccf1953b6a3b7c')
_hgrepo="comm-central"
-pkgver() {
- cd $_hgrepo
- echo $(cat mail/config/version.txt).r$(hg identify -n).$(hg identify -i)
-}
+# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+# Note: These are for Arch Linux use ONLY. For your own distribution, please
+# get your own set of keys. Feel free to contact foutrelis@archlinux.org for
+# more information.
+_google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
+
+# Mozilla API keys (see https://location.services.mozilla.com/api)
+# Note: These are for Arch Linux use ONLY. For your own distribution, please
+# get your own set of keys. Feel free to contact heftig@archlinux.org for
+# more information.
+_mozilla_api_key=16674381-f021-49de-8622-3021c5942aff
prepare() {
cd $_hgrepo
- # Create directories
- msg2 "Creating directory structure..."
- install -d "$pkgdir"/usr/bin
- install -d "$pkgdir"/usr/share/applications
- install -d "$pkgdir"/opt
-
- # Update local copy
- msg2 "Updating local copy..."
+ # Sync local copy
+ msg2 "Syncing local copy..."
python2 client.py checkout
- # PGO?
- if [[ $CARCH = x86_64 ]] && [[ $_pgo = 1 ]]; then
- cp "$srcdir"/mozconfig-pgo .mozconfig
- else
- cp "$srcdir"/mozconfig .mozconfig
- fi
+ #
+ mkdir -p path
+ ln -sf /usr/bin/python2 path/python
+
+
+ echo -n "$_google_api_key" > google-api-key
+ echo -n "$_mozilla_api_key" > mozilla-api-key
+
+ # mozconfig
+ cat >.mozconfig <<END
+ac_add_options --enable-application=mail
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/opt/
+ac_add_options --enable-release
+ac_add_options --enable-gold
+ac_add_options --enable-pie
+
+# Branding
+ac_add_options --enable-official-branding
+
+# Keys
+ac_add_options --with-google-api-keyfile=${PWD@Q}/google-api-key
+ac_add_options --with-mozilla-api-keyfile=${PWD@Q}/mozilla-api-key
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-icu
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-pixman
+
+# Features
+ac_add_options --enable-startup-notification
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests ###
+ac_add_options --disable-debug-symbols ###
+
+STRIP_FLAGS="--strip-debug"
+END
+}
- # configure script misdetects the preprocessor without an optimization level
- # https://bugs.archlinux.org/task/34644
- sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
+pkgver() {
+ cd $_hgrepo
+
+ echo $(cat mail/config/version.txt).r$(hg identify -n).$(hg identify -i)
}
build() {
cd $_hgrepo
- # Build flags
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/opt/$pkgname-r$pkgver"
- export PYTHON="/usr/bin/python2"
-
- if [[ $CARCH = x86_64 ]] && [[ $_pgo = 1 ]]; then
- # Set up PGO
- msg2 "Running Xvfb..."
- export DISPLAY=:99
- Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-
- # Build
- msg2 "Running make..."
- if ! make -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" MOZ_PGO=1; then
- kill $!
- return 1
- fi
-
- # Kill leftovers
- kill $! || true
- else
- msg2 "Running make..."
- make -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+ # _FORTIFY_SOURCE causes configure failures
+ CPPFLAGS+=" -O2"
+
+ # Hardening
+ LDFLAGS+=" -Wl,-z,now"
+
+ # GCC 6
+ CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+
+ # Export build path
+ export PATH="$srcdir/path:$PATH"
+
+ # Set up Rust
+ if [[ $(rustup show) =~ "no active toolchain" ]]; then
+ msg2 "Setting default Rust Toolchain (stable)"
+ rustup default stable
fi
+
+ # Build
+ msg2 "Running make client.mk.."
+ # make -f client.mk profiledbuild
+ make -f client.mk build
+
+# msg2 "Running mach bootstrap.."
+# mozilla/mach bootstrap
+#
+# msg2 "Running mach build.."
+# mozilla/mach build
+ #obj-.../dist/bin/thunderbird
}
package() {
- cd $_hgrepo/obj-*
+ # cd $_hgrepo/obj-*
- # Put together
- msg2 "Running make install.."
- make package
+ # # Put together
+ # msg2 "Running make package.."
+ # make package
- # Install
- msg2 "Moving stuff in place..."
- cd dist
- tar -xf thunderbird-*.tar.bz2
- cp -r thunderbird/ "$pkgdir"/opt/$pkgname-r$pkgver/
+ # # Install
+ # msg2 "Moving stuff in place..."
+ # cd dist
+ # tar -xf thunderbird-*.tar.bz2
+ # cp -r thunderbird/ "$pkgdir"/opt/$pkgname-r$pkgver/
- # /usr/bin symlink
- ln -sf /opt/$pkgname-r$pkgver/thunderbird "$pkgdir"/usr/bin/$pkgname
+ # # /usr/bin symlink
+ # ln -sf /opt/$pkgname-r$pkgver/thunderbird "$pkgdir"/usr/bin/$pkgname
+
+ cd $_hgrepo
+ make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
+ mv "$pkgdir"/opt/thunderbird/ "$pkgdir"/opt/thunderbird-hg/
+
+ _vendorjs="$pkgdir/opt/thunderbird-hg/defaults/preferences/vendor.js"
+ install -Dm644 /dev/stdin "$_vendorjs" <<END
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
- # vendor.js
- install -Dm644 "$srcdir"/vendor.js "$pkgdir"/opt/$pkgname-r$pkgver/defaults/preferences/vendor.js
+// Disable default mailer checking.
+pref("mail.shell.checkDefaultMail", false);
- # Icons
- for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
- install -Dm644 "$srcdir"/$_hgrepo/other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
- "$pkgdir"/usr/share/icons/hicolor/$i/apps/$pkgname.png
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
+END
+
+ for i in 16 22 24 32 48 256; do
+ install -Dm644 other-licenses/branding/thunderbird/mailicon$i.png \
+ "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/thunderbird-hg.png"
done
- # Desktop
- install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/
+ install -Dm644 ../thunderbird-hg.desktop \
+ "$pkgdir/usr/share/applications/thunderbird-hg.desktop"
+
+ # Use system-provided dictionaries
+ rm -r "$pkgdir"/opt/thunderbird-hg/dictionaries
+ ln -Ts /usr/share/hunspell "$pkgdir/opt/thunderbird-hg/dictionaries"
+ ln -Ts /usr/share/hyphen "$pkgdir/opt/thunderbird-hg/hyphenation"
+
+ # Install a wrapper to avoid confusion about binary path
+ install -Dm755 /dev/stdin "$pkgdir/usr/bin/thunderbird-hg" <<END
+#!/bin/sh
+exec /opt/thunderbird-hg/thunderbird "\$@"
+END
- # Dictionaries/hyphenation
- rm -rf "$pkgdir"/opt/$pkgname-r$pkgver/{dictionaries,hyphenation}
- ln -sf /usr/share/hunspell "$pkgdir"/opt/$pkgname-r$pkgver/dictionaries
- ln -sf /usr/share/hyphen "$pkgdir"/opt/$pkgname-r$pkgver/hyphenation
+ # Replace duplicate binary with wrapper
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+ ln -srf "$pkgdir/usr/bin/thunderbird-hg" \
+ "$pkgdir/opt/thunderbird-hg/thunderbird-bin"
}
diff --git a/mozconfig b/mozconfig
deleted file mode 100644
index 623fd4f45df8..000000000000
--- a/mozconfig
+++ /dev/null
@@ -1,42 +0,0 @@
-mk_add_options MOZ_CO_PROJECT=mail
-ac_add_options --enable-application=mail
-
-ac_add_options --prefix=/opt
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-official-branding
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gstreamer
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-ac_add_options --disable-debug-symbols
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/mozconfig-pgo b/mozconfig-pgo
deleted file mode 100644
index a234012b1d39..000000000000
--- a/mozconfig-pgo
+++ /dev/null
@@ -1,45 +0,0 @@
-mk_add_options MOZ_CO_PROJECT=mail
-ac_add_options --enable-application=mail
-
-ac_add_options --prefix=/opt
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-official-branding
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gstreamer
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-ac_add_options --disable-debug-symbols
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
diff --git a/thunderbird-hg-safe.desktop b/thunderbird-hg-safe.desktop
deleted file mode 100644
index 879e0e8e700f..000000000000
--- a/thunderbird-hg-safe.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Thunderbird - Safe Mode (Mercurial version)
-Comment=Read Mail & News in Safe Mode (Mercurial version)
-GenericName=Mail Client & News Reader - Safe Mode (Mercurial version)
-Exec=thunderbird-hg -safe-mode %u
-Icon=thunderbird-hg
-Terminal=false
-Type=Application
-Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;
-StartupNotify=true \ No newline at end of file
diff --git a/thunderbird-hg.desktop b/thunderbird-hg.desktop
index 775d674e887a..988b9ca51f05 100644
--- a/thunderbird-hg.desktop
+++ b/thunderbird-hg.desktop
@@ -1,11 +1,173 @@
[Desktop Entry]
-Name=Thunderbird (Mercurial version)
-Comment=Read Mail & News (Mercurial version)
-GenericName=Mail Client & News Reader (Mercurial version)
+Name=Thunderbird (Merucial version)
+Comment=Send and receive mail with Thunderbird
+Comment[ast]=Lleer y escribir corréu electrónicu
+Comment[ca]=Llegiu i escriviu correu
+Comment[cs]=Čtení a psaní pošty
+Comment[da]=Skriv/læs e-post/nyhedsgruppe med Mozilla Thunderbird
+Comment[de]=E-Mails und Nachrichten mit Thunderbird lesen und schreiben
+Comment[el]=Διαβάστε και γράψτε γράμματα με το Mozilla Thunderbird
+Comment[es]=Lea y escriba correos y noticias con Thunderbird
+Comment[fi]=Lue ja kirjoita sähköposteja
+Comment[fr]=Lire et écrire des courriels
+Comment[gl]=Lea e escriba correo electrónico
+Comment[he]=קריאה/כתיבה של דוא״ל/חדשות באמצעות Mozilla Thunderbird
+Comment[hr]=Čitajte/šaljite e-poštu s Thunderbird
+Comment[hu]=Levelek írása és olvasása a Thunderbirddel
+Comment[it]=Per leggere e scrivere email
+Comment[ja]=メールの読み書き
+Comment[ko]=Mozilla Thunderbird 메일/뉴스 읽기 및 쓰기 클라이언트
+Comment[nl]=E-mail/nieuws lezen en schrijven met Mozilla Thunderbird
+Comment[pl]=Czytanie i wysyłanie e-maili
+Comment[pt_BR]=Leia e escreva suas mensagens
+Comment[ru]=Читайте и пишите письма
+Comment[sk]=Čítajte a píšte poštu pomocou programu Thunderbird
+Comment[sv]=Läs och skriv e-post
+Comment[ug]=ئېلخەت ۋە خەۋەرلەرنى Mozilla Thunderbird دا كۆرۈش ۋە يېزىش
+Comment[uk]=Читання та написання листів
+Comment[vi]=Đọc và soạn thư điện tử
+Comment[zh_CN]=阅读邮件或新闻
+Comment[zh_TW]=以 Mozilla Thunderbird 讀寫郵件或新聞
+GenericName=Mail Client
+GenericName[ast]=Client de correu
+GenericName[ca]=Client de correu
+GenericName[cs]=Poštovní klient
+GenericName[da]=E-postklient
+GenericName[de]=E-Mail-Anwendung
+GenericName[el]=Λογισμικό αλληλογραφίας
+GenericName[es]=Cliente de correo
+GenericName[fi]=Sähköpostiohjelma
+GenericName[fr]=Client de messagerie
+GenericName[gl]=Cliente de correo electrónico
+GenericName[he]=לקוח דוא״ל
+GenericName[hr]=Klijent e-pošte
+GenericName[hu]=Levelezőkliens
+GenericName[it]=Client email
+GenericName[ja]=電子メールクライアント
+GenericName[ko]=메일 클라이언트
+GenericName[nl]=E-mailprogramma
+GenericName[pl]=Klient poczty
+GenericName[pt_BR]=Cliente de E-mail
+GenericName[ru]=Почтовый клиент
+GenericName[sk]=Poštový klient
+GenericName[ug]=ئېلخەت دېتالى
+GenericName[uk]=Поштова програма
+GenericName[vi]=Phần mềm khách quản lý thư điện tử
+GenericName[zh_CN]=邮件新闻客户端
+GenericName[zh_TW]=郵件用戶端
Exec=thunderbird-hg %u
-Icon=thunderbird-hg
Terminal=false
Type=Application
+Icon=thunderbird-hg
Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;
-StartupNotify=true \ No newline at end of file
+MimeType=message/rfc822;x-scheme-handler/mailto;application/x-xpinstall;
+StartupNotify=true
+Actions=ComposeMessage;OpenAddressBook;
+
+[Desktop Action ComposeMessage]
+Name=Write new message
+Name[ar]=اكتب رسالة جديدة
+Name[ast]=Redactar mensaxe nuevu
+Name[be]=Напісаць новы ліст
+Name[bg]=Съставяне на ново съобщение
+Name[br]=Skrivañ ur gemennadenn nevez
+Name[ca]=Escriu un missatge nou
+Name[cs]=Napsat novou zprávu
+Name[da]=Skriv en ny meddelelse
+Name[de]=Neue Nachricht verfassen
+Name[el]=Σύνταξη νέου μηνύματος
+Name[es_AR]=Escribir un nuevo mensaje
+Name[es_ES]=Redactar nuevo mensaje
+Name[et]=Kirjuta uus kiri
+Name[eu]=Idatzi mezu berria
+Name[fi]=Kirjoita uusi viesti
+Name[fr]=Rédiger un nouveau message
+Name[fy_NL]=Skriuw in nij berjocht
+Name[ga_IE]=Scríobh teachtaireacht nua
+Name[gd]=Sgrìobh teachdaireachd ùr
+Name[gl]=Escribir unha nova mensaxe
+Name[he]=כתיבת הודעה חדשה
+Name[hr]=Piši novu poruku
+Name[hu]=Új üzenet írása
+Name[hy_AM]=Գրել նոր նամակ
+Name[is]=SKrifa nýjan póst
+Name[it]=Scrivi nuovo messaggio
+Name[ja]=新しいメッセージを作成する
+Name[ko]=새 메시지 작성
+Name[lt]=Rašyti naują laišką
+Name[nb_NO]=Skriv ny melding
+Name[nl]=Nieuw bericht aanmaken
+Name[nn_NO]=Skriv ny melding
+Name[pl]=Nowa wiadomość
+Name[pt_BR]=Nova mensagem
+Name[pt_PT]=Escrever nova mensagem
+Name[rm]=Scriver in nov messadi
+Name[ro]=Scrie un mesaj nou
+Name[ru]=Создать новое сообщение
+Name[si]=නව ලිපියක් ලියන්න
+Name[sk]=Nová e-mailová správa
+Name[sl]=Sestavi novo sporočilo
+Name[sq]=Shkruani mesazh të ri
+Name[sr]=Писање нове поруке
+Name[sv_SE]=Skriv ett nytt meddelande
+Name[ta_LK]=புதிய செய்தியை எழுதுக
+Name[tr]=Yeni ileti yaz
+Name[uk]=Написати нового листа
+Name[vi]=Viết thư mới
+Name[zh_CN]=编写新消息
+Name[zh_TW]=寫一封新訊息
+Exec=thunderbird-hg -compose
+
+[Desktop Action OpenAddressBook]
+Name=Open address book
+Name[ar]=افتح دفتر العناوين
+Name[ast]=Abrir llibreta de direiciones
+Name[be]=Адкрыць адрасную кнігу
+Name[bg]=Отваряне на адресник
+Name[br]=Digeriñ ur c'harned chomlec'hioù
+Name[ca]=Obre la llibreta d'adreces
+Name[cs]=Otevřít Adresář
+Name[da]=Åbn adressebog
+Name[de]=Adressbuch öffnen
+Name[el]=Άνοιγμα ευρετηρίου διευθύνσεων
+Name[es_AR]=Abrir libreta de direcciones
+Name[es_ES]=Abrir libreta de direcciones
+Name[et]=Ava aadressiraamat
+Name[eu]=Ireki helbide-liburua
+Name[fi]=Avaa osoitekirja
+Name[fr]=Ouvrir un carnet d'adresses
+Name[fy_NL]=Iepenje adresboek
+Name[ga_IE]=Oscail leabhar seoltaí
+Name[gd]=Fosgail leabhar-sheòlaidhean
+Name[gl]=Abrir a axenda de enderezos
+Name[he]=פתיחת ספר כתובות
+Name[hr]=Otvori adresar
+Name[hu]=Címjegyzék megnyitása
+Name[hy_AM]=Բացել Հասցեագիրքը
+Name[is]=Opna nafnaskrá
+Name[it]=Apri rubrica
+Name[ja]=アドレス帳を開く
+Name[ko]=주소록 열기
+Name[lt]=Atverti adresų knygą
+Name[nb_NO]=Åpne adressebok
+Name[nl]=Adresboek openen
+Name[nn_NO]=Opne adressebok
+Name[pl]=Książka adresowa
+Name[pt_BR]=Catálogo de endereços
+Name[pt_PT]=Abrir livro de endereços
+Name[rm]=Avrir il cudeschet d'adressas
+Name[ro]=Deschide agenda de contacte
+Name[ru]=Открыть адресную книгу
+Name[si]=ලිපින පොත විවෘත කරන්න
+Name[sk]=Otvoriť adresár
+Name[sl]=Odpri adressar
+Name[sq]=Hapni libër adresash
+Name[sr]=Отвори адресар
+Name[sv_SE]=Öppna adressboken
+Name[ta_LK]=முகவரி பத்தகத்தை திறக்க
+Name[tr]=Adres defterini aç
+Name[uk]=Відкрити адресну книгу
+Name[vi]=Mở sổ địa chỉ
+Name[zh_CN]=打开通讯录
+Name[zh_TW]=開啟通訊錄
+Exec=thunderbird-hg -addressbook
diff --git a/thunderbird-hg.install b/thunderbird-hg.install
index 4f08f918e7fa..9b5439b5bb42 100644
--- a/thunderbird-hg.install
+++ b/thunderbird-hg.install
@@ -1,8 +1,3 @@
-# Colored makepkg-like functions
-msg_blue() {
- printf "${blue}==>${bold} $1${all_off}\n"
-}
-
note() {
printf "${blue}==>${yellow} NOTE:$1${bold} $2${all_off}\n"
}
@@ -12,23 +7,7 @@ bold="${all_off}$(tput bold)"
blue="${bold}$(tput setaf 4)"
yellow="${bold}$(tput setaf 3)"
-_update() {
- msg_blue "Updating desktop database..."
- update-desktop-database -q
- msg_blue "Updating icon cache.."
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
post_install() {
- _update
note 1 "This package installs side-by-side with [extra]'s thunderbird."
note 2 "The binary is called 'thunderbird-hg'."
}
-
-post_upgrade() {
- _update
-}
-
-post_remove() {
- post_upgrade
-} \ No newline at end of file
diff --git a/vendor.js b/vendor.js
deleted file mode 100644
index 170b505a8dcc..000000000000
--- a/vendor.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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);