Date: Tuesday, September 2, 2014 @ 15:24:12 Author: foutrelis Revision: 220891
archrelease: copy trunk to extra-i686, extra-x86_64 Added: thunderbird/repos/extra-i686/PKGBUILD (from rev 220890, thunderbird/trunk/PKGBUILD) thunderbird/repos/extra-i686/mozconfig (from rev 220890, thunderbird/trunk/mozconfig) thunderbird/repos/extra-i686/rhbz-966424.patch (from rev 220890, thunderbird/trunk/rhbz-966424.patch) thunderbird/repos/extra-i686/thunderbird-install-dir.patch (from rev 220890, thunderbird/trunk/thunderbird-install-dir.patch) thunderbird/repos/extra-i686/thunderbird.desktop (from rev 220890, thunderbird/trunk/thunderbird.desktop) thunderbird/repos/extra-i686/thunderbird.install (from rev 220890, thunderbird/trunk/thunderbird.install) thunderbird/repos/extra-i686/vendor.js (from rev 220890, thunderbird/trunk/vendor.js) thunderbird/repos/extra-x86_64/PKGBUILD (from rev 220890, thunderbird/trunk/PKGBUILD) thunderbird/repos/extra-x86_64/mozconfig (from rev 220890, thunderbird/trunk/mozconfig) thunderbird/repos/extra-x86_64/rhbz-966424.patch (from rev 220890, thunderbird/trunk/rhbz-966424.patch) thunderbird/repos/extra-x86_64/thunderbird-install-dir.patch (from rev 220890, thunderbird/trunk/thunderbird-install-dir.patch) thunderbird/repos/extra-x86_64/thunderbird.desktop (from rev 220890, thunderbird/trunk/thunderbird.desktop) thunderbird/repos/extra-x86_64/thunderbird.install (from rev 220890, thunderbird/trunk/thunderbird.install) thunderbird/repos/extra-x86_64/vendor.js (from rev 220890, thunderbird/trunk/vendor.js) Deleted: thunderbird/repos/extra-i686/PKGBUILD thunderbird/repos/extra-i686/mozconfig thunderbird/repos/extra-i686/thunderbird-install-dir.patch thunderbird/repos/extra-i686/thunderbird.desktop thunderbird/repos/extra-i686/thunderbird.install thunderbird/repos/extra-i686/vendor.js thunderbird/repos/extra-x86_64/PKGBUILD thunderbird/repos/extra-x86_64/mozconfig thunderbird/repos/extra-x86_64/thunderbird-install-dir.patch thunderbird/repos/extra-x86_64/thunderbird.desktop thunderbird/repos/extra-x86_64/thunderbird.install thunderbird/repos/extra-x86_64/vendor.js --------------------------------------------+ /PKGBUILD | 152 +++++++++++++++++++++++++++ /mozconfig | 84 ++++++++++++++ /thunderbird-install-dir.patch | 46 ++++++++ /thunderbird.desktop | 26 ++++ /thunderbird.install | 24 ++++ /vendor.js | 18 +++ extra-i686/PKGBUILD | 71 ------------ extra-i686/mozconfig | 42 ------- extra-i686/rhbz-966424.patch | 23 ++++ extra-i686/thunderbird-install-dir.patch | 23 ---- extra-i686/thunderbird.desktop | 13 -- extra-i686/thunderbird.install | 12 -- extra-i686/vendor.js | 9 - extra-x86_64/PKGBUILD | 71 ------------ extra-x86_64/mozconfig | 42 ------- extra-x86_64/rhbz-966424.patch | 23 ++++ extra-x86_64/thunderbird-install-dir.patch | 23 ---- extra-x86_64/thunderbird.desktop | 13 -- extra-x86_64/thunderbird.install | 12 -- extra-x86_64/vendor.js | 9 - 20 files changed, 396 insertions(+), 340 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-09-02 13:23:31 UTC (rev 220890) +++ extra-i686/PKGBUILD 2014-09-02 13:24:12 UTC (rev 220891) @@ -1,71 +0,0 @@ -# $Id$ -# Maintainer : 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=31.0 -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' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse') -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{,.asc} - mozconfig - thunderbird.desktop - thunderbird-install-dir.patch - vendor.js) -options=(!emptydirs) -sha256sums=('571f8cca980f077ae81999aea69a78153422a75e9e6c07ab74ec6659fe0d6ef4' - 'SKIP' - '7af6c21413ff48b5b30ca6987781b639deac2c3ea3f4b9261c8e71132daecd29' - 'd506b771e765e09e2e039b975e25befade8eec97e8950813a32463604955ab4e' - '9049ab3f9600a1592a54c41a166c76e046c393e1cfe7c4e769155b7317d197ee' - 'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed') - -prepare() { - cd comm-esr31 - patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" - - cp "$srcdir/mozconfig" .mozconfig - - # configure script misdetects the preprocessor without an optimization level - # https://bugs.archlinux.org/task/34644 - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure -} - -build() { - cd comm-esr31 - - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird" - export PYTHON="/usr/bin/python2" - - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" -} - -package() { - cd comm-esr31 - make -j1 -f client.mk DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js" - - 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" - done - - install -Dm644 "$srcdir/thunderbird.desktop" \ - "$pkgdir/usr/share/applications/thunderbird.desktop" - - 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" - - # We don't want the development stuff - rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel-*,share/idl} -} Copied: thunderbird/repos/extra-i686/PKGBUILD (from rev 220890, thunderbird/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-09-02 13:24:12 UTC (rev 220891) @@ -0,0 +1,76 @@ +# $Id$ +# Maintainer : 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=31.1.0 +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' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification') +makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse') +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{,.asc} + mozconfig + thunderbird.desktop + thunderbird-install-dir.patch + vendor.js + rhbz-966424.patch) +options=(!emptydirs) +sha256sums=('f6a8f2fce1958c692dce7351caf5a7d78433c7be30e2a89a414e0ef6727081ea' + 'SKIP' + '7af6c21413ff48b5b30ca6987781b639deac2c3ea3f4b9261c8e71132daecd29' + 'd506b771e765e09e2e039b975e25befade8eec97e8950813a32463604955ab4e' + '9049ab3f9600a1592a54c41a166c76e046c393e1cfe7c4e769155b7317d197ee' + 'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed' + '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a') + +prepare() { + cd comm-esr31 + patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" + + cp "$srcdir/mozconfig" .mozconfig + + # https://bugs.archlinux.org/task/41689 + patch -Np1 -d mozilla -i ../../rhbz-966424.patch + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure +} + +build() { + cd comm-esr31 + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd comm-esr31 + make -j1 -f client.mk DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js" + + 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" + done + + install -Dm644 "$srcdir/thunderbird.desktop" \ + "$pkgdir/usr/share/applications/thunderbird.desktop" + + 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" + + # We don't want the development stuff + rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel-*,share/idl} +} Deleted: extra-i686/mozconfig =================================================================== --- extra-i686/mozconfig 2014-09-02 13:23:31 UTC (rev 220890) +++ extra-i686/mozconfig 2014-09-02 13:24:12 UTC (rev 220891) @@ -1,42 +0,0 @@ -mk_add_options MOZ_CO_PROJECT=mail -ac_add_options --enable-application=mail - -ac_add_options --prefix=/usr -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 Copied: thunderbird/repos/extra-i686/mozconfig (from rev 220890, thunderbird/trunk/mozconfig) =================================================================== --- extra-i686/mozconfig (rev 0) +++ extra-i686/mozconfig 2014-09-02 13:24:12 UTC (rev 220891) @@ -0,0 +1,42 @@ +mk_add_options MOZ_CO_PROJECT=mail +ac_add_options --enable-application=mail + +ac_add_options --prefix=/usr +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 Copied: thunderbird/repos/extra-i686/rhbz-966424.patch (from rev 220890, thunderbird/trunk/rhbz-966424.patch) =================================================================== --- extra-i686/rhbz-966424.patch (rev 0) +++ extra-i686/rhbz-966424.patch 2014-09-02 13:24:12 UTC (rev 220891) @@ -0,0 +1,23 @@ +--- a/toolkit/modules/CertUtils.jsm ++++ b/toolkit/modules/CertUtils.jsm +@@ -170,17 +170,19 @@ this.checkCert = + issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3); + var tokenNames = issuerCert.getAllTokenNames({}); + + if (!tokenNames || !tokenNames.some(isBuiltinToken)) + throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT); + } + + function isBuiltinToken(tokenName) { +- return tokenName == "Builtin Object Token"; ++ return tokenName == "Builtin Object Token" || ++ tokenName == "Default Trust" || ++ tokenName == "System Trust"; + } + + /** + * This class implements nsIBadCertListener. Its job is to prevent "bad cert" + * security dialogs from being shown to the user. It is better to simply fail + * if the certificate is bad. See bug 304286. + * + * @param aAllowNonBuiltInCerts (optional) Deleted: extra-i686/thunderbird-install-dir.patch =================================================================== --- extra-i686/thunderbird-install-dir.patch 2014-09-02 13:23:31 UTC (rev 220890) +++ extra-i686/thunderbird-install-dir.patch 2014-09-02 13:24:12 UTC (rev 220891) @@ -1,23 +0,0 @@ -diff -upr comm-esr31.orig/config/baseconfig.mk comm-esr31/config/baseconfig.mk ---- comm-esr31.orig/config/baseconfig.mk 2014-07-22 09:44:23.000000000 +0300 -+++ comm-esr31/config/baseconfig.mk 2014-07-22 09:46:30.000000000 +0300 -@@ -1,6 +1,6 @@ - includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - MOZILLA_SRCDIR = $(topsrcdir)/mozilla - MOZDEPTH = $(DEPTH)/mozilla -diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk ---- comm-esr31.orig/mozilla/config/baseconfig.mk 2014-07-22 09:44:22.000000000 +0300 -+++ comm-esr31/mozilla/config/baseconfig.mk 2014-07-22 09:46:45.000000000 +0300 -@@ -4,7 +4,7 @@ - # whether a normal build is happening or whether the check is running. - includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - ifndef TOP_DIST - TOP_DIST = dist Copied: thunderbird/repos/extra-i686/thunderbird-install-dir.patch (from rev 220890, thunderbird/trunk/thunderbird-install-dir.patch) =================================================================== --- extra-i686/thunderbird-install-dir.patch (rev 0) +++ extra-i686/thunderbird-install-dir.patch 2014-09-02 13:24:12 UTC (rev 220891) @@ -0,0 +1,23 @@ +diff -upr comm-esr31.orig/config/baseconfig.mk comm-esr31/config/baseconfig.mk +--- comm-esr31.orig/config/baseconfig.mk 2014-07-22 09:44:23.000000000 +0300 ++++ comm-esr31/config/baseconfig.mk 2014-07-22 09:46:30.000000000 +0300 +@@ -1,6 +1,6 @@ + includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) + sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) + MOZILLA_SRCDIR = $(topsrcdir)/mozilla + MOZDEPTH = $(DEPTH)/mozilla +diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk +--- comm-esr31.orig/mozilla/config/baseconfig.mk 2014-07-22 09:44:22.000000000 +0300 ++++ comm-esr31/mozilla/config/baseconfig.mk 2014-07-22 09:46:45.000000000 +0300 +@@ -4,7 +4,7 @@ + # whether a normal build is happening or whether the check is running. + includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) + sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) + ifndef TOP_DIST + TOP_DIST = dist Deleted: extra-i686/thunderbird.desktop =================================================================== --- extra-i686/thunderbird.desktop 2014-09-02 13:23:31 UTC (rev 220890) +++ extra-i686/thunderbird.desktop 2014-09-02 13:24:12 UTC (rev 220891) @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Thunderbird -Comment=Mail & News Reader -GenericName=Mail Client & News Reader -Exec=thunderbird %u -TryExec=thunderbird -Icon=thunderbird -Terminal=false -Type=Application -Categories=Network;Email; -MimeType=message/rfc822;x-scheme-handler/mailto; -StartupNotify=true Copied: thunderbird/repos/extra-i686/thunderbird.desktop (from rev 220890, thunderbird/trunk/thunderbird.desktop) =================================================================== --- extra-i686/thunderbird.desktop (rev 0) +++ extra-i686/thunderbird.desktop 2014-09-02 13:24:12 UTC (rev 220891) @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=Thunderbird +Comment=Mail & News Reader +GenericName=Mail Client & News Reader +Exec=thunderbird %u +TryExec=thunderbird +Icon=thunderbird +Terminal=false +Type=Application +Categories=Network;Email; +MimeType=message/rfc822;x-scheme-handler/mailto; +StartupNotify=true Deleted: extra-i686/thunderbird.install =================================================================== --- extra-i686/thunderbird.install 2014-09-02 13:23:31 UTC (rev 220890) +++ extra-i686/thunderbird.install 2014-09-02 13:24:12 UTC (rev 220891) @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: thunderbird/repos/extra-i686/thunderbird.install (from rev 220890, thunderbird/trunk/thunderbird.install) =================================================================== --- extra-i686/thunderbird.install (rev 0) +++ extra-i686/thunderbird.install 2014-09-02 13:24:12 UTC (rev 220891) @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-i686/vendor.js =================================================================== --- extra-i686/vendor.js 2014-09-02 13:23:31 UTC (rev 220890) +++ extra-i686/vendor.js 2014-09-02 13:24:12 UTC (rev 220891) @@ -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); Copied: thunderbird/repos/extra-i686/vendor.js (from rev 220890, thunderbird/trunk/vendor.js) =================================================================== --- extra-i686/vendor.js (rev 0) +++ extra-i686/vendor.js 2014-09-02 13:24:12 UTC (rev 220891) @@ -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); Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-09-02 13:23:31 UTC (rev 220890) +++ extra-x86_64/PKGBUILD 2014-09-02 13:24:12 UTC (rev 220891) @@ -1,71 +0,0 @@ -# $Id$ -# Maintainer : 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=31.0 -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' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse') -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{,.asc} - mozconfig - thunderbird.desktop - thunderbird-install-dir.patch - vendor.js) -options=(!emptydirs) -sha256sums=('571f8cca980f077ae81999aea69a78153422a75e9e6c07ab74ec6659fe0d6ef4' - 'SKIP' - '7af6c21413ff48b5b30ca6987781b639deac2c3ea3f4b9261c8e71132daecd29' - 'd506b771e765e09e2e039b975e25befade8eec97e8950813a32463604955ab4e' - '9049ab3f9600a1592a54c41a166c76e046c393e1cfe7c4e769155b7317d197ee' - 'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed') - -prepare() { - cd comm-esr31 - patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" - - cp "$srcdir/mozconfig" .mozconfig - - # configure script misdetects the preprocessor without an optimization level - # https://bugs.archlinux.org/task/34644 - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure -} - -build() { - cd comm-esr31 - - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird" - export PYTHON="/usr/bin/python2" - - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" -} - -package() { - cd comm-esr31 - make -j1 -f client.mk DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js" - - 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" - done - - install -Dm644 "$srcdir/thunderbird.desktop" \ - "$pkgdir/usr/share/applications/thunderbird.desktop" - - 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" - - # We don't want the development stuff - rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel-*,share/idl} -} Copied: thunderbird/repos/extra-x86_64/PKGBUILD (from rev 220890, thunderbird/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-09-02 13:24:12 UTC (rev 220891) @@ -0,0 +1,76 @@ +# $Id$ +# Maintainer : 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=31.1.0 +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' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification') +makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse') +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{,.asc} + mozconfig + thunderbird.desktop + thunderbird-install-dir.patch + vendor.js + rhbz-966424.patch) +options=(!emptydirs) +sha256sums=('f6a8f2fce1958c692dce7351caf5a7d78433c7be30e2a89a414e0ef6727081ea' + 'SKIP' + '7af6c21413ff48b5b30ca6987781b639deac2c3ea3f4b9261c8e71132daecd29' + 'd506b771e765e09e2e039b975e25befade8eec97e8950813a32463604955ab4e' + '9049ab3f9600a1592a54c41a166c76e046c393e1cfe7c4e769155b7317d197ee' + 'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed' + '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a') + +prepare() { + cd comm-esr31 + patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" + + cp "$srcdir/mozconfig" .mozconfig + + # https://bugs.archlinux.org/task/41689 + patch -Np1 -d mozilla -i ../../rhbz-966424.patch + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure +} + +build() { + cd comm-esr31 + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd comm-esr31 + make -j1 -f client.mk DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js" + + 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" + done + + install -Dm644 "$srcdir/thunderbird.desktop" \ + "$pkgdir/usr/share/applications/thunderbird.desktop" + + 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" + + # We don't want the development stuff + rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel-*,share/idl} +} Deleted: extra-x86_64/mozconfig =================================================================== --- extra-x86_64/mozconfig 2014-09-02 13:23:31 UTC (rev 220890) +++ extra-x86_64/mozconfig 2014-09-02 13:24:12 UTC (rev 220891) @@ -1,42 +0,0 @@ -mk_add_options MOZ_CO_PROJECT=mail -ac_add_options --enable-application=mail - -ac_add_options --prefix=/usr -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 Copied: thunderbird/repos/extra-x86_64/mozconfig (from rev 220890, thunderbird/trunk/mozconfig) =================================================================== --- extra-x86_64/mozconfig (rev 0) +++ extra-x86_64/mozconfig 2014-09-02 13:24:12 UTC (rev 220891) @@ -0,0 +1,42 @@ +mk_add_options MOZ_CO_PROJECT=mail +ac_add_options --enable-application=mail + +ac_add_options --prefix=/usr +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 Copied: thunderbird/repos/extra-x86_64/rhbz-966424.patch (from rev 220890, thunderbird/trunk/rhbz-966424.patch) =================================================================== --- extra-x86_64/rhbz-966424.patch (rev 0) +++ extra-x86_64/rhbz-966424.patch 2014-09-02 13:24:12 UTC (rev 220891) @@ -0,0 +1,23 @@ +--- a/toolkit/modules/CertUtils.jsm ++++ b/toolkit/modules/CertUtils.jsm +@@ -170,17 +170,19 @@ this.checkCert = + issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3); + var tokenNames = issuerCert.getAllTokenNames({}); + + if (!tokenNames || !tokenNames.some(isBuiltinToken)) + throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT); + } + + function isBuiltinToken(tokenName) { +- return tokenName == "Builtin Object Token"; ++ return tokenName == "Builtin Object Token" || ++ tokenName == "Default Trust" || ++ tokenName == "System Trust"; + } + + /** + * This class implements nsIBadCertListener. Its job is to prevent "bad cert" + * security dialogs from being shown to the user. It is better to simply fail + * if the certificate is bad. See bug 304286. + * + * @param aAllowNonBuiltInCerts (optional) Deleted: extra-x86_64/thunderbird-install-dir.patch =================================================================== --- extra-x86_64/thunderbird-install-dir.patch 2014-09-02 13:23:31 UTC (rev 220890) +++ extra-x86_64/thunderbird-install-dir.patch 2014-09-02 13:24:12 UTC (rev 220891) @@ -1,23 +0,0 @@ -diff -upr comm-esr31.orig/config/baseconfig.mk comm-esr31/config/baseconfig.mk ---- comm-esr31.orig/config/baseconfig.mk 2014-07-22 09:44:23.000000000 +0300 -+++ comm-esr31/config/baseconfig.mk 2014-07-22 09:46:30.000000000 +0300 -@@ -1,6 +1,6 @@ - includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - MOZILLA_SRCDIR = $(topsrcdir)/mozilla - MOZDEPTH = $(DEPTH)/mozilla -diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk ---- comm-esr31.orig/mozilla/config/baseconfig.mk 2014-07-22 09:44:22.000000000 +0300 -+++ comm-esr31/mozilla/config/baseconfig.mk 2014-07-22 09:46:45.000000000 +0300 -@@ -4,7 +4,7 @@ - # whether a normal build is happening or whether the check is running. - includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - ifndef TOP_DIST - TOP_DIST = dist Copied: thunderbird/repos/extra-x86_64/thunderbird-install-dir.patch (from rev 220890, thunderbird/trunk/thunderbird-install-dir.patch) =================================================================== --- extra-x86_64/thunderbird-install-dir.patch (rev 0) +++ extra-x86_64/thunderbird-install-dir.patch 2014-09-02 13:24:12 UTC (rev 220891) @@ -0,0 +1,23 @@ +diff -upr comm-esr31.orig/config/baseconfig.mk comm-esr31/config/baseconfig.mk +--- comm-esr31.orig/config/baseconfig.mk 2014-07-22 09:44:23.000000000 +0300 ++++ comm-esr31/config/baseconfig.mk 2014-07-22 09:46:30.000000000 +0300 +@@ -1,6 +1,6 @@ + includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) + sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) + MOZILLA_SRCDIR = $(topsrcdir)/mozilla + MOZDEPTH = $(DEPTH)/mozilla +diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk +--- comm-esr31.orig/mozilla/config/baseconfig.mk 2014-07-22 09:44:22.000000000 +0300 ++++ comm-esr31/mozilla/config/baseconfig.mk 2014-07-22 09:46:45.000000000 +0300 +@@ -4,7 +4,7 @@ + # whether a normal build is happening or whether the check is running. + includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) + sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) + ifndef TOP_DIST + TOP_DIST = dist Deleted: extra-x86_64/thunderbird.desktop =================================================================== --- extra-x86_64/thunderbird.desktop 2014-09-02 13:23:31 UTC (rev 220890) +++ extra-x86_64/thunderbird.desktop 2014-09-02 13:24:12 UTC (rev 220891) @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Thunderbird -Comment=Mail & News Reader -GenericName=Mail Client & News Reader -Exec=thunderbird %u -TryExec=thunderbird -Icon=thunderbird -Terminal=false -Type=Application -Categories=Network;Email; -MimeType=message/rfc822;x-scheme-handler/mailto; -StartupNotify=true Copied: thunderbird/repos/extra-x86_64/thunderbird.desktop (from rev 220890, thunderbird/trunk/thunderbird.desktop) =================================================================== --- extra-x86_64/thunderbird.desktop (rev 0) +++ extra-x86_64/thunderbird.desktop 2014-09-02 13:24:12 UTC (rev 220891) @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=Thunderbird +Comment=Mail & News Reader +GenericName=Mail Client & News Reader +Exec=thunderbird %u +TryExec=thunderbird +Icon=thunderbird +Terminal=false +Type=Application +Categories=Network;Email; +MimeType=message/rfc822;x-scheme-handler/mailto; +StartupNotify=true Deleted: extra-x86_64/thunderbird.install =================================================================== --- extra-x86_64/thunderbird.install 2014-09-02 13:23:31 UTC (rev 220890) +++ extra-x86_64/thunderbird.install 2014-09-02 13:24:12 UTC (rev 220891) @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: thunderbird/repos/extra-x86_64/thunderbird.install (from rev 220890, thunderbird/trunk/thunderbird.install) =================================================================== --- extra-x86_64/thunderbird.install (rev 0) +++ extra-x86_64/thunderbird.install 2014-09-02 13:24:12 UTC (rev 220891) @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/vendor.js =================================================================== --- extra-x86_64/vendor.js 2014-09-02 13:23:31 UTC (rev 220890) +++ extra-x86_64/vendor.js 2014-09-02 13:24:12 UTC (rev 220891) @@ -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); Copied: thunderbird/repos/extra-x86_64/vendor.js (from rev 220890, thunderbird/trunk/vendor.js) =================================================================== --- extra-x86_64/vendor.js (rev 0) +++ extra-x86_64/vendor.js 2014-09-02 13:24:12 UTC (rev 220891) @@ -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);