Date: Wednesday, April 10, 2013 @ 15:31:59 Author: foutrelis Revision: 182419
archrelease: copy trunk to extra-i686, extra-x86_64 Added: thunderbird/repos/extra-i686/PKGBUILD (from rev 182417, thunderbird/trunk/PKGBUILD) thunderbird/repos/extra-i686/mozconfig (from rev 182417, thunderbird/trunk/mozconfig) thunderbird/repos/extra-i686/thunderbird-install-dir.patch (from rev 182417, thunderbird/trunk/thunderbird-install-dir.patch) thunderbird/repos/extra-i686/thunderbird.desktop (from rev 182417, thunderbird/trunk/thunderbird.desktop) thunderbird/repos/extra-i686/thunderbird.install (from rev 182417, thunderbird/trunk/thunderbird.install) thunderbird/repos/extra-i686/vendor.js (from rev 182417, thunderbird/trunk/vendor.js) thunderbird/repos/extra-x86_64/PKGBUILD (from rev 182418, thunderbird/trunk/PKGBUILD) thunderbird/repos/extra-x86_64/mozconfig (from rev 182418, thunderbird/trunk/mozconfig) thunderbird/repos/extra-x86_64/thunderbird-install-dir.patch (from rev 182418, thunderbird/trunk/thunderbird-install-dir.patch) thunderbird/repos/extra-x86_64/thunderbird.desktop (from rev 182418, thunderbird/trunk/thunderbird.desktop) thunderbird/repos/extra-x86_64/thunderbird.install (from rev 182418, thunderbird/trunk/thunderbird.install) thunderbird/repos/extra-x86_64/vendor.js (from rev 182418, 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 | 140 +++++++++++++++++++++++++++ /mozconfig | 80 +++++++++++++++ /thunderbird-install-dir.patch | 94 ++++++++++++++++++ /thunderbird.desktop | 26 +++++ /thunderbird.install | 24 ++++ /vendor.js | 18 +++ extra-i686/PKGBUILD | 62 ----------- extra-i686/mozconfig | 40 ------- extra-i686/thunderbird-install-dir.patch | 47 --------- extra-i686/thunderbird.desktop | 13 -- extra-i686/thunderbird.install | 12 -- extra-i686/vendor.js | 9 - extra-x86_64/PKGBUILD | 62 ----------- extra-x86_64/mozconfig | 40 ------- extra-x86_64/thunderbird-install-dir.patch | 47 --------- extra-x86_64/thunderbird.desktop | 13 -- extra-x86_64/thunderbird.install | 12 -- extra-x86_64/vendor.js | 9 - 18 files changed, 382 insertions(+), 366 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-04-10 13:31:47 UTC (rev 182418) +++ extra-i686/PKGBUILD 2013-04-10 13:31:59 UTC (rev 182419) @@ -1,62 +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=17.0.5 -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' 'sqlite' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') -optdepends=('libcanberra: for sound support') -install=thunderbird.install -source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2 - mozconfig - thunderbird.desktop - thunderbird-install-dir.patch - vendor.js) -options=(!emptydirs) -md5sums=('609a11ce7bb246cebf67d993a035ca52' - '41511a6bcdd04cf56706218e4670e631' - 'af3e5b344d2edf1c7d61bb0a5a96de9a' - '1c6f47b315a5d7830f8e901b1f723cfc' - '5a53179d14ae9631b7afe5e4d0fc0b25') - -build() { - cd comm-esr17 - patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" - - cp "$srcdir/mozconfig" .mozconfig - - 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-esr17 - 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 182417, thunderbird/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-04-10 13:31:59 UTC (rev 182419) @@ -0,0 +1,70 @@ +# $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=17.0.5 +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' 'sqlite' 'startup-notification') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') +optdepends=('libcanberra: for sound support') +install=thunderbird.install +source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2 + mozconfig + thunderbird.desktop + thunderbird-install-dir.patch + vendor.js) +options=(!emptydirs) +md5sums=('609a11ce7bb246cebf67d993a035ca52' + '41511a6bcdd04cf56706218e4670e631' + 'af3e5b344d2edf1c7d61bb0a5a96de9a' + '1c6f47b315a5d7830f8e901b1f723cfc' + '5a53179d14ae9631b7afe5e4d0fc0b25') + +prepare() { + cd comm-esr17 + 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/' configure +} + +build() { + cd comm-esr17 + + 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-esr17 + 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 2013-04-10 13:31:47 UTC (rev 182418) +++ extra-i686/mozconfig 2013-04-10 13:31:59 UTC (rev 182419) @@ -1,40 +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-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 - -# Optimization -ac_add_options --enable-optimize - -export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 Copied: thunderbird/repos/extra-i686/mozconfig (from rev 182417, thunderbird/trunk/mozconfig) =================================================================== --- extra-i686/mozconfig (rev 0) +++ extra-i686/mozconfig 2013-04-10 13:31:59 UTC (rev 182419) @@ -0,0 +1,40 @@ +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-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 + +# Optimization +ac_add_options --enable-optimize + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 Deleted: extra-i686/thunderbird-install-dir.patch =================================================================== --- extra-i686/thunderbird-install-dir.patch 2013-04-10 13:31:47 UTC (rev 182418) +++ extra-i686/thunderbird-install-dir.patch 2013-04-10 13:31:59 UTC (rev 182419) @@ -1,47 +0,0 @@ -diff -upr comm-release.orig/config/baseconfig.mk comm-release/config/baseconfig.mk ---- comm-release.orig/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 -+++ comm-release/config/baseconfig.mk 2012-11-21 03:20:35.000000000 +0200 -@@ -1,9 +1,9 @@ - INCLUDED_AUTOCONF_MK = 1 - --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) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+includedir := $(includedir)/$(MOZ_APP_NAME) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - MOZILLA_SRCDIR = $(topsrcdir)/mozilla - MOZDEPTH = $(DEPTH)/mozilla - DIST = $(MOZDEPTH)/dist -diff -upr comm-release.orig/mozilla/config/baseconfig.mk comm-release/mozilla/config/baseconfig.mk ---- comm-release.orig/mozilla/config/baseconfig.mk 2012-11-21 03:19:16.000000000 +0200 -+++ comm-release/mozilla/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 -@@ -1,9 +1,9 @@ - INCLUDED_AUTOCONF_MK = 1 - --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) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+includedir := $(includedir)/$(MOZ_APP_NAME) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - DIST = $(DEPTH)/dist - - # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't -diff -upr comm-release.orig/mozilla/js/src/config/baseconfig.mk comm-release/mozilla/js/src/config/baseconfig.mk ---- comm-release.orig/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 -+++ comm-release/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 -@@ -1,7 +1,7 @@ - INCLUDED_AUTOCONF_MK = 1 - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - - ifneq (,$(filter /%,$(TOP_DIST))) - DIST = $(TOP_DIST) Copied: thunderbird/repos/extra-i686/thunderbird-install-dir.patch (from rev 182417, thunderbird/trunk/thunderbird-install-dir.patch) =================================================================== --- extra-i686/thunderbird-install-dir.patch (rev 0) +++ extra-i686/thunderbird-install-dir.patch 2013-04-10 13:31:59 UTC (rev 182419) @@ -0,0 +1,47 @@ +diff -upr comm-release.orig/config/baseconfig.mk comm-release/config/baseconfig.mk +--- comm-release.orig/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 ++++ comm-release/config/baseconfig.mk 2012-11-21 03:20:35.000000000 +0200 +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-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) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/$(MOZ_APP_NAME) ++idldir = $(datadir)/idl/$(MOZ_APP_NAME) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + MOZILLA_SRCDIR = $(topsrcdir)/mozilla + MOZDEPTH = $(DEPTH)/mozilla + DIST = $(MOZDEPTH)/dist +diff -upr comm-release.orig/mozilla/config/baseconfig.mk comm-release/mozilla/config/baseconfig.mk +--- comm-release.orig/mozilla/config/baseconfig.mk 2012-11-21 03:19:16.000000000 +0200 ++++ comm-release/mozilla/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-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) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/$(MOZ_APP_NAME) ++idldir = $(datadir)/idl/$(MOZ_APP_NAME) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + DIST = $(DEPTH)/dist + + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't +diff -upr comm-release.orig/mozilla/js/src/config/baseconfig.mk comm-release/mozilla/js/src/config/baseconfig.mk +--- comm-release.orig/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 ++++ comm-release/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 +@@ -1,7 +1,7 @@ + INCLUDED_AUTOCONF_MK = 1 + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + ifneq (,$(filter /%,$(TOP_DIST))) + DIST = $(TOP_DIST) Deleted: extra-i686/thunderbird.desktop =================================================================== --- extra-i686/thunderbird.desktop 2013-04-10 13:31:47 UTC (rev 182418) +++ extra-i686/thunderbird.desktop 2013-04-10 13:31:59 UTC (rev 182419) @@ -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 182417, thunderbird/trunk/thunderbird.desktop) =================================================================== --- extra-i686/thunderbird.desktop (rev 0) +++ extra-i686/thunderbird.desktop 2013-04-10 13:31:59 UTC (rev 182419) @@ -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 2013-04-10 13:31:47 UTC (rev 182418) +++ extra-i686/thunderbird.install 2013-04-10 13:31:59 UTC (rev 182419) @@ -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 182417, thunderbird/trunk/thunderbird.install) =================================================================== --- extra-i686/thunderbird.install (rev 0) +++ extra-i686/thunderbird.install 2013-04-10 13:31:59 UTC (rev 182419) @@ -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 2013-04-10 13:31:47 UTC (rev 182418) +++ extra-i686/vendor.js 2013-04-10 13:31:59 UTC (rev 182419) @@ -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 182417, thunderbird/trunk/vendor.js) =================================================================== --- extra-i686/vendor.js (rev 0) +++ extra-i686/vendor.js 2013-04-10 13:31:59 UTC (rev 182419) @@ -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 2013-04-10 13:31:47 UTC (rev 182418) +++ extra-x86_64/PKGBUILD 2013-04-10 13:31:59 UTC (rev 182419) @@ -1,62 +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=17.0.5 -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' 'sqlite' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') -optdepends=('libcanberra: for sound support') -install=thunderbird.install -source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2 - mozconfig - thunderbird.desktop - thunderbird-install-dir.patch - vendor.js) -options=(!emptydirs) -md5sums=('609a11ce7bb246cebf67d993a035ca52' - '41511a6bcdd04cf56706218e4670e631' - 'af3e5b344d2edf1c7d61bb0a5a96de9a' - '1c6f47b315a5d7830f8e901b1f723cfc' - '5a53179d14ae9631b7afe5e4d0fc0b25') - -build() { - cd comm-esr17 - patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" - - cp "$srcdir/mozconfig" .mozconfig - - 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-esr17 - 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 182418, thunderbird/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-04-10 13:31:59 UTC (rev 182419) @@ -0,0 +1,70 @@ +# $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=17.0.5 +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' 'sqlite' 'startup-notification') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') +optdepends=('libcanberra: for sound support') +install=thunderbird.install +source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2 + mozconfig + thunderbird.desktop + thunderbird-install-dir.patch + vendor.js) +options=(!emptydirs) +md5sums=('609a11ce7bb246cebf67d993a035ca52' + '41511a6bcdd04cf56706218e4670e631' + 'af3e5b344d2edf1c7d61bb0a5a96de9a' + '1c6f47b315a5d7830f8e901b1f723cfc' + '5a53179d14ae9631b7afe5e4d0fc0b25') + +prepare() { + cd comm-esr17 + 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/' configure +} + +build() { + cd comm-esr17 + + 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-esr17 + 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 2013-04-10 13:31:47 UTC (rev 182418) +++ extra-x86_64/mozconfig 2013-04-10 13:31:59 UTC (rev 182419) @@ -1,40 +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-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 - -# 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 182418, thunderbird/trunk/mozconfig) =================================================================== --- extra-x86_64/mozconfig (rev 0) +++ extra-x86_64/mozconfig 2013-04-10 13:31:59 UTC (rev 182419) @@ -0,0 +1,40 @@ +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-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 + +# Optimization +ac_add_options --enable-optimize + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 Deleted: extra-x86_64/thunderbird-install-dir.patch =================================================================== --- extra-x86_64/thunderbird-install-dir.patch 2013-04-10 13:31:47 UTC (rev 182418) +++ extra-x86_64/thunderbird-install-dir.patch 2013-04-10 13:31:59 UTC (rev 182419) @@ -1,47 +0,0 @@ -diff -upr comm-release.orig/config/baseconfig.mk comm-release/config/baseconfig.mk ---- comm-release.orig/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 -+++ comm-release/config/baseconfig.mk 2012-11-21 03:20:35.000000000 +0200 -@@ -1,9 +1,9 @@ - INCLUDED_AUTOCONF_MK = 1 - --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) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+includedir := $(includedir)/$(MOZ_APP_NAME) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - MOZILLA_SRCDIR = $(topsrcdir)/mozilla - MOZDEPTH = $(DEPTH)/mozilla - DIST = $(MOZDEPTH)/dist -diff -upr comm-release.orig/mozilla/config/baseconfig.mk comm-release/mozilla/config/baseconfig.mk ---- comm-release.orig/mozilla/config/baseconfig.mk 2012-11-21 03:19:16.000000000 +0200 -+++ comm-release/mozilla/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 -@@ -1,9 +1,9 @@ - INCLUDED_AUTOCONF_MK = 1 - --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) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+includedir := $(includedir)/$(MOZ_APP_NAME) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - DIST = $(DEPTH)/dist - - # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't -diff -upr comm-release.orig/mozilla/js/src/config/baseconfig.mk comm-release/mozilla/js/src/config/baseconfig.mk ---- comm-release.orig/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 -+++ comm-release/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 -@@ -1,7 +1,7 @@ - INCLUDED_AUTOCONF_MK = 1 - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - - ifneq (,$(filter /%,$(TOP_DIST))) - DIST = $(TOP_DIST) Copied: thunderbird/repos/extra-x86_64/thunderbird-install-dir.patch (from rev 182418, thunderbird/trunk/thunderbird-install-dir.patch) =================================================================== --- extra-x86_64/thunderbird-install-dir.patch (rev 0) +++ extra-x86_64/thunderbird-install-dir.patch 2013-04-10 13:31:59 UTC (rev 182419) @@ -0,0 +1,47 @@ +diff -upr comm-release.orig/config/baseconfig.mk comm-release/config/baseconfig.mk +--- comm-release.orig/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 ++++ comm-release/config/baseconfig.mk 2012-11-21 03:20:35.000000000 +0200 +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-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) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/$(MOZ_APP_NAME) ++idldir = $(datadir)/idl/$(MOZ_APP_NAME) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + MOZILLA_SRCDIR = $(topsrcdir)/mozilla + MOZDEPTH = $(DEPTH)/mozilla + DIST = $(MOZDEPTH)/dist +diff -upr comm-release.orig/mozilla/config/baseconfig.mk comm-release/mozilla/config/baseconfig.mk +--- comm-release.orig/mozilla/config/baseconfig.mk 2012-11-21 03:19:16.000000000 +0200 ++++ comm-release/mozilla/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-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) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/$(MOZ_APP_NAME) ++idldir = $(datadir)/idl/$(MOZ_APP_NAME) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + DIST = $(DEPTH)/dist + + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't +diff -upr comm-release.orig/mozilla/js/src/config/baseconfig.mk comm-release/mozilla/js/src/config/baseconfig.mk +--- comm-release.orig/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 ++++ comm-release/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 +@@ -1,7 +1,7 @@ + INCLUDED_AUTOCONF_MK = 1 + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + ifneq (,$(filter /%,$(TOP_DIST))) + DIST = $(TOP_DIST) Deleted: extra-x86_64/thunderbird.desktop =================================================================== --- extra-x86_64/thunderbird.desktop 2013-04-10 13:31:47 UTC (rev 182418) +++ extra-x86_64/thunderbird.desktop 2013-04-10 13:31:59 UTC (rev 182419) @@ -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 182418, thunderbird/trunk/thunderbird.desktop) =================================================================== --- extra-x86_64/thunderbird.desktop (rev 0) +++ extra-x86_64/thunderbird.desktop 2013-04-10 13:31:59 UTC (rev 182419) @@ -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 2013-04-10 13:31:47 UTC (rev 182418) +++ extra-x86_64/thunderbird.install 2013-04-10 13:31:59 UTC (rev 182419) @@ -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 182418, thunderbird/trunk/thunderbird.install) =================================================================== --- extra-x86_64/thunderbird.install (rev 0) +++ extra-x86_64/thunderbird.install 2013-04-10 13:31:59 UTC (rev 182419) @@ -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 2013-04-10 13:31:47 UTC (rev 182418) +++ extra-x86_64/vendor.js 2013-04-10 13:31:59 UTC (rev 182419) @@ -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 182418, thunderbird/trunk/vendor.js) =================================================================== --- extra-x86_64/vendor.js (rev 0) +++ extra-x86_64/vendor.js 2013-04-10 13:31:59 UTC (rev 182419) @@ -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);