From 01fc33c36a5c9f6f6dd7df4048a0b1e1d98838b8 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 18 Sep 2013 15:01:31 +0000
Subject: [PATCH] extra/thunderbird to 24.0-1

---
 extra/thunderbird/PKGBUILD  | 14 +++++++-------
 extra/thunderbird/mozconfig |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/extra/thunderbird/PKGBUILD b/extra/thunderbird/PKGBUILD
index e11122bba..cd8a6fb1d 100644
--- a/extra/thunderbird/PKGBUILD
+++ b/extra/thunderbird/PKGBUILD
@@ -11,7 +11,7 @@ buildarch=20
 highmem=1
 
 pkgname=thunderbird
-pkgver=17.0.8
+pkgver=24.0
 pkgrel=1
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
@@ -27,25 +27,25 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sourc
         thunderbird-install-dir.patch
         vendor.js)
 options=(!emptydirs)
-sha256sums=('f5d338c7a79111370a719bc3979dc11fab11ada0534c69530fe6fb42c1a358d7'
-            '02b3cf36887074ffcafc88ec80c787106bf8258ab1a661a09593bef7e9795d3f'
+sha256sums=('60a1abde987a61c8096e431f13df2ba2cf188a22fdbf1712aaec795b302a5ff5'
+            '1e5fad181194155f65e4496759ff94523de8bcbc9838d257d65c303a9c409292'
             'd506b771e765e09e2e039b975e25befade8eec97e8950813a32463604955ab4e'
             '929a7ceca0e90d0635a2099b7df24033e865fb5b5b8c5824468c4561c21c377d'
             'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed')
 
 prepare() {
-  cd comm-esr17
+  cd comm-esr24
   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
+  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
 }
 
 build() {
-  cd comm-esr17
+  cd comm-esr24
 
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird"
   export PYTHON="/usr/bin/python2"
@@ -54,7 +54,7 @@ build() {
 }
 
 package() {
-  cd comm-esr17
+  cd comm-esr24
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js"
diff --git a/extra/thunderbird/mozconfig b/extra/thunderbird/mozconfig
index 89ae522ec..01b9790f1 100644
--- a/extra/thunderbird/mozconfig
+++ b/extra/thunderbird/mozconfig
@@ -31,6 +31,7 @@ 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