libre/thunderbird-libre-8.0-1

Fixed issue204

1 files changed, 38 insertions, 45 deletions

diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD
index 7e3f9b587..a018b87a6 100644
--- a/libre/thunderbird-libre/PKGBUILD
+++ b/libre/thunderbird-libre/PKGBUILD
@@ -3,72 +3,65 @@
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom@home.se>
 pkgname=thunderbird-libre
-pkgver=3.1.10
-pkgrel=3
-pkgdesc="Standalone Mail/News reader, with GNUZilla addons"
+pkgver=8.0
+pkgrel=1
+pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
-url="http://www.mozilla.org/projects/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')
-makedepends=('zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'autoconf2.13')
+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' 'sqlite3' 'startup-notification')
+makedepends=('p7zip-libre' 'zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'yasm' 'mesa')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
 conflicts=('thunderbird')
 provides=("thunderbird=$pkgver")
 install=thunderbird.install
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2
+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
-        thunderbird-shared-error.patch
-        xulrunner-png14.patch
-        python2.7.patch
-        gcc46.patch
-        gnuzilla-addons.patch)
+        thunderbird-install-dir.patch
+        channel-prefs.js)
+md5sums=('332f60036aebdce7dec6ee2b1af4941d'
+         'ca98c2bf1017b33e19dae22fdcef2e73'
+         'af3e5b344d2edf1c7d61bb0a5a96de9a'
+         '25b6fe16ac24cd5c852213e5c1adb272'
+         'aea906acf72c43dd82ead2fabcc1c6db'
+         '476ec205162340fb0679f522c9d31c3b')
 
 build() {
-  cd "${srcdir}/comm-1.9.2"
-  patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch"
-  patch -Np1 -i "${srcdir}/thunderbird-appversion.patch"
-  patch -Np1 -i "${srcdir}/thunderbird-shared-error.patch"
-  patch -Np1 -i "${srcdir}/gcc46.patch"
-  patch -Np0 -i "${srcdir}/xulrunner-png14.patch"
-  patch -Np0 -i "${srcdir}/python2.7.patch"
+  cd "$srcdir/comm-release"
+  patch -Np1 -i "$srcdir/thunderbird-3.0-lang.patch"
+  patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
 
-  pushd mail/app/profile >/dev/null
-  patch -Np0 -i "${srcdir}/gnuzilla-addons.patch"
-  popd >/dev/null
+  cp "$srcdir/mozconfig" .mozconfig
 
-  cp "${srcdir}/mozconfig" .mozconfig
-  unset CXXFLAGS
-  unset CFLAGS
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird"
+  export PYTHON="/usr/bin/python2"
 
-  export CXXFLAGS="-fpermissive"
-  export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-3.1"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
+  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
 }
 
 package() {
-  cd "${srcdir}/comm-1.9.2"
-  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/dicts "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries"
-
-  rm -rf "${pkgdir}/usr/bin/defaults"
-
-  install -m755 -d "${pkgdir}/usr/share/applications"
+  cd "$srcdir/comm-release"
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -d "$pkgdir/usr/share/icons/hicolor/$i/apps"
-      cp other-licenses/branding/thunderbird/mailicon${i/x*/}.png "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
+      install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
+          "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
   done
 
-  install -m644 "${srcdir}/thunderbird.desktop" "${pkgdir}/usr/share/applications/"
+  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}
 
-  rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc
+# Recommend free addons
+  cp --remove-destination "${srcdir}/channel-prefs.js" \
+     "${pkgdir}/usr/lib/thunderbird/defaults/pref/channel-prefs.js"
 }