$ cat tb3_diff_agains_prev.patch
diff -ur thunderbird3.old/PKGBUILD thunderbird3/PKGBUILD
--- thunderbird3.old/PKGBUILD	2009-08-03 04:46:08.000000000 +0200
+++ thunderbird3/PKGBUILD	2009-09-23 20:16:53.000000000 +0200
@@ -1,18 +1,17 @@
 # Contributor: Andreas Schönfelder <passtschu@freenet.de>
 pkgname=thunderbird3
 _lang=en-US
-pkgver=3.0b3
+pkgver=3.0b4
 pkgrel=1
 pkgdesc="Standalone Mail/News reader (installs besides thunderbird2)"
 arch=('i686')
 url="http://www.mozilla.org/projects/thunderbird"
 license=('GPL')
 depends=('gtk2>=2.10.0'  'libidl2' 'mozilla-common' 'nss>=3.11.4' 'libxt')
-makedepends=('imagemagick')
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/linux-i686/$_lang/thunderbird-$pkgver.tar.bz2
         thunderbird3.desktop)
-md5sums=('b858514a23b2b8db55b576b9b29c34da'
-         'a5648e652d6f989f7b9e45c83f707910')
+md5sums=('51a3e1f82936b8e486ebcafb7ab2dd00'
+         '1040978316a7ceedd1c9591ca1fb95f4')
 
 build() {
   install -d $startdir/pkg/opt/mozilla \
@@ -21,13 +20,8 @@
 
   cp -r $startdir/src/thunderbird $startdir/pkg/opt/mozilla/thunderbird3
   
-  # Remove common mozilla aclocal stuff, XULRunner has it
-  rm -rf $startdir/pkg/opt/mozilla/thunderbird3/share
-  rm -rf $startdir/pkg/opt/mozilla/thunderbird3/include
-  rm -rf $startdir/pkg/opt/mozilla/thunderbird3/pkgconfig
-
   ln -sf /opt/mozilla/thunderbird3/thunderbird $startdir/pkg/usr/bin/thunderbird3
   
-  convert $startdir/src/thunderbird/icons/mozicon50.xpm $startdir/pkg/usr/share/pixmaps/thunderbird3.png
+  convert $startdir/src/thunderbird/chrome/icons/default/default256.png $startdir/pkg/usr/share/pixmaps/thunderbird3.png
   install -m644 $startdir/src/thunderbird3.desktop $startdir/pkg/usr/share/applications/
 }
diff -ur thunderbird3.old/thunderbird3.desktop thunderbird3/thunderbird3.desktop
--- thunderbird3.old/thunderbird3.desktop	2008-05-14 19:29:44.000000000 +0200
+++ thunderbird3/thunderbird3.desktop	2009-09-23 20:13:18.000000000 +0200
@@ -3,7 +3,7 @@
 Name=Thunderbird 3
 Comment=Mail & News Reader
 Exec=thunderbird3
-Icon=thunderbird3
+Icon=thunderbird3.png
 Terminal=false
 Type=Application
 Categories=Network

$ cat tb3_diff_full.patch
diff -ur thunderbird3.old/PKGBUILD thunderbird3/PKGBUILD
--- thunderbird3.old/PKGBUILD	2009-09-24 19:21:01.000000000 +0200
+++ thunderbird3/PKGBUILD	2009-09-23 20:16:53.000000000 +0200
@@ -0,0 +1,27 @@
+# Contributor: Andreas Schönfelder <passtschu@freenet.de>
+pkgname=thunderbird3
+_lang=en-US
+pkgver=3.0b4
+pkgrel=1
+pkgdesc="Standalone Mail/News reader (installs besides thunderbird2)"
+arch=('i686')
+url="http://www.mozilla.org/projects/thunderbird"
+license=('GPL')
+depends=('gtk2>=2.10.0'  'libidl2' 'mozilla-common' 'nss>=3.11.4' 'libxt')
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/linux-i686/$_lang/thunderbird-$pkgver.tar.bz2
+        thunderbird3.desktop)
+md5sums=('51a3e1f82936b8e486ebcafb7ab2dd00'
+         '1040978316a7ceedd1c9591ca1fb95f4')
+
+build() {
+  install -d $startdir/pkg/opt/mozilla \
+             $startdir/pkg/usr/bin \
+             $startdir/pkg/usr/share/{applications,pixmaps}
+
+  cp -r $startdir/src/thunderbird $startdir/pkg/opt/mozilla/thunderbird3
+  
+  ln -sf /opt/mozilla/thunderbird3/thunderbird $startdir/pkg/usr/bin/thunderbird3
+  
+  convert $startdir/src/thunderbird/chrome/icons/default/default256.png $startdir/pkg/usr/share/pixmaps/thunderbird3.png
+  install -m644 $startdir/src/thunderbird3.desktop $startdir/pkg/usr/share/applications/
+}
diff -ur thunderbird3.old/thunderbird3.desktop thunderbird3/thunderbird3.desktop
--- thunderbird3.old/thunderbird3.desktop	2009-09-24 19:21:07.000000000 +0200
+++ thunderbird3/thunderbird3.desktop	2009-09-23 20:13:18.000000000 +0200
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Thunderbird 3
+Comment=Mail & News Reader
+Exec=thunderbird3
+Icon=thunderbird3.png
+Terminal=false
+Type=Application
+Categories=Network
+StartupNotify=true
+