Date: Tuesday, August 16, 2011 @ 13:15:20 Author: ibiru Revision: 135622
update to 6.0 Modified: thunderbird/trunk/PKGBUILD Deleted: thunderbird/trunk/thunderbird-appversion.patch ------------------------------+ PKGBUILD | 24 ++++++++++-------------- thunderbird-appversion.patch | 12 ------------ 2 files changed, 10 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-08-16 17:03:57 UTC (rev 135621) +++ PKGBUILD 2011-08-16 17:15:20 UTC (rev 135622) @@ -3,36 +3,32 @@ # Contributor: Dale Blount <d...@archlinux.org> # Contributor: Anders Bostrom <anders.bost...@home.se> pkgname=thunderbird -pkgver=5.0 +pkgver=6.0 pkgrel=1 pkgdesc="Standalone Mail/News reader" arch=('i686' 'x86_64') license=('MPL' 'GPL') -url="http://www.mozilla.org/projects/thunderbird" +url="http://www.mozilla.org/thunderbird/" depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3>=3.7.4' 'desktop-file-utils' 'libnotify' 'libevent') -makedepends=('zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'gconf' 'yasm' 'mesa') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'gconf' 'yasm' 'mesa') optdepends=('libcanberra: for sound support') options=(!buildflags) install=thunderbird.install source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2 mozconfig thunderbird.desktop - thunderbird-3.0-lang.patch - thunderbird-appversion.patch) -md5sums=('0bbacea54b4b8fc4ff20e73b3278c1ba' + thunderbird-3.0-lang.patch) +md5sums=('9ac741d238e95790cdeb5222e9b23ae8' 'b8fd97ab4bfb2e4538b1e1340d70f915' 'af3e5b344d2edf1c7d61bb0a5a96de9a' - '25b6fe16ac24cd5c852213e5c1adb272' - 'be5f6aea50eeefae234bfc0f30e2f0ec') + '25b6fe16ac24cd5c852213e5c1adb272') build() { - cd "${srcdir}/comm-miramar" + cd "${srcdir}/comm-release" patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch" - patch -Np1 -i "${srcdir}/thunderbird-appversion.patch" cp "${srcdir}/mozconfig" .mozconfig - export CXXFLAGS="-fpermissive" export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-5.0 -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed" export PYTHON="/usr/bin/python2" @@ -40,7 +36,7 @@ } package() { - cd "${srcdir}/comm-miramar" + cd "${srcdir}/comm-release" make -j1 -f client.mk DESTDIR="${pkgdir}" install for i in 16x16 22x22 24x24 32x32 48x48 256x256; do @@ -51,8 +47,8 @@ install -Dm644 "${srcdir}/thunderbird.desktop" \ "${pkgdir}/usr/share/applications/thunderbird.desktop" - rm -rf "${pkgdir}/usr/lib/thunderbird-5.0/dictionaries" - ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/thunderbird-5.0/dictionaries" + rm -rf "${pkgdir}/usr/lib/thunderbird-${pkgver}/dictionaries" + ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/thunderbird-${pkgver}/dictionaries" # We don't want the development stuff rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel-$pkgver,share/idl} Deleted: thunderbird-appversion.patch =================================================================== --- thunderbird-appversion.patch 2011-08-16 17:03:57 UTC (rev 135621) +++ thunderbird-appversion.patch 2011-08-16 17:15:20 UTC (rev 135622) @@ -1,12 +0,0 @@ -diff -Nru comm-1.9.2.orig/mail/installer/Makefile.in comm-1.9.2/mail/installer/Makefile.in ---- comm-1.9.2.orig/mail/installer/Makefile.in 2010-04-30 22:41:37.000000000 +0300 -+++ comm-1.9.2/mail/installer/Makefile.in 2010-05-05 20:20:29.551660469 +0300 -@@ -42,6 +42,8 @@ - - include $(DEPTH)/config/autoconf.mk - -+MOZ_APP_VERSION="5.0" -+ - include $(topsrcdir)/config/rules.mk - - MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in