Tue Jun 7 22:47:46 UTC 2011

1 files changed, 12 insertions, 21 deletions

diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD
index d5f546e3d..7e3f9b587 100644
--- a/libre/thunderbird-libre/PKGBUILD
+++ b/libre/thunderbird-libre/PKGBUILD
@@ -3,14 +3,14 @@
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom@home.se>
 pkgname=thunderbird-libre
-pkgver=3.1.9
-pkgrel=1
+pkgver=3.1.10
+pkgrel=3
 pkgdesc="Standalone Mail/News reader, with GNUZilla addons"
 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')
-makedepends=('zip' 'pkg-config' 'libgnomeui' 'python2' 'libidl2' 'wireless_tools' 'autoconf2.13')
+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')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
 conflicts=('thunderbird')
@@ -22,27 +22,17 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/sou
         thunderbird-3.0-lang.patch
         thunderbird-appversion.patch
         thunderbird-shared-error.patch
-        thunderbird-preferences.patch
         xulrunner-png14.patch
         python2.7.patch
+        gcc46.patch
         gnuzilla-addons.patch)
-md5sums=('e6917c419d3aaa8083a1d4b53fb80d8c'
-         'c1551d308480d241247c5662d8bebbcb'
-         '37457073c7f6feeb86c053701d23197f'
-         '25b6fe16ac24cd5c852213e5c1adb272'
-         '48ffcdb877a69d383b7d354e330f7658'
-         '3dca714ee8054634e6dfdb059464dc42'
-         '1d4f9978e8228ace523b18a09cf41e4e'
-         '989b15f6bc9e2e9233fe4c6b23f412b1'
-         '78a4d0c920cbb8ec6a9a36974cd775ef'
-         'f272e37db4bcaef993b58a87a7db3bf5')
 
 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}/thunderbird-preferences.patch"
+  patch -Np1 -i "${srcdir}/gcc46.patch"
   patch -Np0 -i "${srcdir}/xulrunner-png14.patch"
   patch -Np0 -i "${srcdir}/python2.7.patch"
 
@@ -54,6 +44,7 @@ build() {
   unset CXXFLAGS
   unset CFLAGS
 
+  export CXXFLAGS="-fpermissive"
   export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-3.1"
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
@@ -71,13 +62,13 @@ package() {
   rm -rf "${pkgdir}/usr/bin/defaults"
 
   install -m755 -d "${pkgdir}/usr/share/applications"
-  install -m755 -d "${pkgdir}/usr/share/pixmaps"
 
-  install -m644 mail/branding/unofficial/mailicon48.png \
-  	"${pkgdir}/usr/share/pixmaps/thunderbird.png"
+  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"
+  done
 
-  install -m644 "${srcdir}/thunderbird.desktop" \
-      "${pkgdir}/usr/share/applications/"
+  install -m644 "${srcdir}/thunderbird.desktop" "${pkgdir}/usr/share/applications/"
 
   rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc
 }