Date: Wednesday, April 13, 2016 @ 22:52:32 Author: heftig Revision: 264847
45.0-1 Modified: thunderbird/trunk/PKGBUILD thunderbird/trunk/mozconfig thunderbird/trunk/thunderbird.install ---------------------+ PKGBUILD | 65 +++++++++++++++++++++++++++++++++++--------------- mozconfig | 21 ++++++---------- thunderbird.install | 8 +++--- 3 files changed, 58 insertions(+), 36 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-04-13 20:51:10 UTC (rev 264846) +++ PKGBUILD 2016-04-13 20:52:32 UTC (rev 264847) @@ -1,40 +1,69 @@ # $Id$ -# Maintainer : Ionut Biru <ib...@archlinux.org> +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> # Contributor: Alexander Baldeck <alexan...@archlinux.org> # Contributor: Dale Blount <d...@archlinux.org> # Contributor: Anders Bostrom <anders.bost...@home.se> pkgname=thunderbird -pkgver=38.7.2 +pkgver=45.0 pkgrel=1 -pkgdesc="Standalone Mail/News reader" +pkgdesc="Standalone mail and news reader from mozilla.org" arch=('i686' 'x86_64') license=('MPL' 'GPL') url="http://www.mozilla.org/thunderbird/" depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme' - 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite') -makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse') + 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'ttf-font') +makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf' + 'libpulse' 'inetutils') optdepends=('libcanberra: for sound support') install=thunderbird.install -source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2 +options=('!emptydirs' '!makeflags') +source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz mozconfig thunderbird.desktop thunderbird-install-dir.patch vendor.js) -options=('!emptydirs' '!makeflags') -sha256sums=('e2b1453ac193615586e350bc729278db8c8a61a8d4ac089db370754af47d4493' - '6d60c77705baae25dc9324765c420e8623173390e8d2abea66f3d0d30ce388e4' +sha256sums=('15693897f1e46cbb5a95932b8c087a53004635415845fb4f50d4edfbba77d667' + 'e77d609ed4423aba542d296ee16c92b9e7ab21662d02e75ff7c04f8fb330004c' '3fba13d88aeb003ab0811ef739463858172ce0662a1c7d62835df3d83ddbb8fb' '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d' 'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed') +# 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 foutre...@archlinux.org for +# more information. +_google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM +_google_default_client_id=413772536636.apps.googleusercontent.com +_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 + +# 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 hef...@archlinux.org for +# more information. +_mozilla_api_key=16674381-f021-49de-8622-3021c5942aff + + prepare() { - cd comm-esr${pkgver%%.*} + cd $pkgname-$pkgver + + cp ../mozconfig .mozconfig patch -Np1 -i ../thunderbird-install-dir.patch - cp "$srcdir/mozconfig" .mozconfig + echo -n "$_google_api_key" >google-api-key + echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig + echo -n "$_google_default_client_id $_google_default_client_secret" >google-oauth-api-key + echo "ac_add_options --with-google-oauth-api-keyfile=\"$PWD/google-oauth-api-key\"" >>.mozconfig + + echo -n "$_mozilla_api_key" >mozilla-api-key + echo "ac_add_options --with-mozilla-api-keyfile=\"$PWD/mozilla-api-key\"" >>.mozconfig + + mkdir "$srcdir/path" + ln -s /usr/bin/python2 "$srcdir/path/python" + # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure @@ -41,8 +70,9 @@ } build() { - cd comm-esr${pkgver%%.*} + cd $pkgname-$pkgver + export PATH="$srcdir/path:$PATH" export PYTHON="/usr/bin/python2" make -f client.mk build @@ -49,8 +79,8 @@ } package() { - cd comm-esr${pkgver%%.*} - make -f client.mk DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install install -Dm644 ../vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js" @@ -64,13 +94,10 @@ # Use system-provided dictionaries rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation" + ln -s /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries" + ln -s /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation" # Replace duplicate binary with symlink # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 ln -sf thunderbird "$pkgdir/usr/lib/thunderbird/thunderbird-bin" - - # Remove development stuff - rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel-*,share/idl} } Modified: mozconfig =================================================================== --- mozconfig 2016-04-13 20:51:10 UTC (rev 264846) +++ mozconfig 2016-04-13 20:52:32 UTC (rev 264847) @@ -1,10 +1,13 @@ -mk_add_options MOZ_CO_PROJECT=mail ac_add_options --enable-application=mail ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib +ac_add_options --enable-release +ac_add_options --enable-gold ac_add_options --enable-pie +ac_add_options --enable-official-branding + # System libraries ac_add_options --with-system-nspr ac_add_options --with-system-nss @@ -22,22 +25,14 @@ ac_add_options --enable-system-pixman # Features -ac_add_options --enable-official-branding -ac_add_options --enable-safe-browsing +ac_add_options --enable-calendar ac_add_options --enable-startup-notification -ac_add_options --enable-gio +ac_add_options --enable-pulseaudio +ac_add_options --disable-gstreamer -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 +# vim:set ft=sh: Modified: thunderbird.install =================================================================== --- thunderbird.install 2016-04-13 20:51:10 UTC (rev 264846) +++ thunderbird.install 2016-04-13 20:52:32 UTC (rev 264847) @@ -1,12 +1,12 @@ post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install }