[arch-commits] Commit in thunderbird/trunk (PKGBUILD mozconfig)

[Ionut Biru]

    Date: Thursday, December 9, 2010 @ 12:28:59
  Author: ibiru
Revision: 102657

upgpkg: thunderbird 3.1.7-1
update to 3.1.7, enable system hunspell(FS#21113)

Modified:
  thunderbird/trunk/PKGBUILD
  thunderbird/trunk/mozconfig

-----------+
 PKGBUILD  |   13 +++++++++----
 mozconfig |    1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-09 15:41:18 UTC (rev 102656)
+++ PKGBUILD	2010-12-09 17:28:59 UTC (rev 102657)
@@ -3,13 +3,13 @@
 # Contributor: Dale Blount <dale at archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom at home.se>
 pkgname=thunderbird
-pkgver=3.1.6
+pkgver=3.1.7
 pkgrel=1
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
 url="http://www.mozilla.org/projects/thunderbird"
-depends=('gtk2>=2.22.0' 'gcc-libs' 'mozilla-common' 'nss>=3.12.8' 'libxt' 'shared-mime-info' 'alsa-lib>=1.0.23' 'dbus-glib>=0.86')
+depends=('gtk2>=2.22.1' 'gcc-libs' 'mozilla-common' 'nss>=3.12.8' 'libxt' 'shared-mime-info' 'alsa-lib>=1.0.23' 'dbus-glib>=0.92' 'hunspell')
 makedepends=('zip' 'pkg-config' 'libgnomeui' 'python2' 'libidl2' 'wireless_tools' 'autoconf2.13')
 optdepends=('libcanberra: for sound support')
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2
@@ -21,8 +21,8 @@
         thunderbird-preferences.patch
         xulrunner-png14.patch
         python2.7.patch)
-md5sums=('d126a68e6610d8e3675909e0ba606b42'
-         'c6e48de923cb0297871da59904cdd28e'
+md5sums=('be64630152a2d5a824a76752594e7596'
+         'f09a3d19c6c50c747d5ec8574d18c5ff'
          '7a119d30341dca4eadecedd523404fdb'
          '25b6fe16ac24cd5c852213e5c1adb272'
          '48ffcdb877a69d383b7d354e330f7658'
@@ -49,6 +49,11 @@
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
   make -j1 DESTDIR="${pkgdir}" install
 
+  #Remove included dictionaries, add symlink to system myspell path.
+  #Note: this will cause file conflicts when users have installed dictionaries in the old location
+  rm -rf "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries"
+  ln -sf /usr/share/myspell "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries"
+
   rm -rf "${pkgdir}/usr/bin/defaults"
 
   install -m755 -d "${pkgdir}/usr/share/applications"

Modified: mozconfig
===================================================================
--- mozconfig	2010-12-09 15:41:18 UTC (rev 102656)
+++ mozconfig	2010-12-09 17:28:59 UTC (rev 102657)
@@ -7,6 +7,7 @@
 ac_add_options --with-system-zlib
 ac_add_options --with-system-png
 ac_add_options --with-system-mng
+ac_add_options --enable-system-hunspell
 ac_add_options --with-pthreads
 ac_add_options --disable-debug
 ac_add_options --disable-tests