Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

5 files changed, 12 insertions, 15 deletions

diff --git a/extra/thunderbird/.md5sum.i686 b/extra/thunderbird/.md5sum.i686
index 9245819c2..50a82ac26 100644
--- a/extra/thunderbird/.md5sum.i686
+++ b/extra/thunderbird/.md5sum.i686
@@ -1,5 +1,5 @@
-9ed1d0c768c9fe062edfe9eefb826a50  fr.xpi
-b8fd97ab4bfb2e4538b1e1340d70f915  mozconfig
+ae7bfa30cf979e577a6c1cfbd2f5193a  fr.xpi
+1041bf5e1b984f1a7f339058b3592da3  mozconfig
 25b6fe16ac24cd5c852213e5c1adb272  thunderbird-3.0-lang.patch
 0bbacea54b4b8fc4ff20e73b3278c1ba  thunderbird-5.0.source.tar.bz2
 be5f6aea50eeefae234bfc0f30e2f0ec  thunderbird-appversion.patch
diff --git a/extra/thunderbird/.md5sum.x86_64 b/extra/thunderbird/.md5sum.x86_64
index 9245819c2..50a82ac26 100644
--- a/extra/thunderbird/.md5sum.x86_64
+++ b/extra/thunderbird/.md5sum.x86_64
@@ -1,5 +1,5 @@
-9ed1d0c768c9fe062edfe9eefb826a50  fr.xpi
-b8fd97ab4bfb2e4538b1e1340d70f915  mozconfig
+ae7bfa30cf979e577a6c1cfbd2f5193a  fr.xpi
+1041bf5e1b984f1a7f339058b3592da3  mozconfig
 25b6fe16ac24cd5c852213e5c1adb272  thunderbird-3.0-lang.patch
 0bbacea54b4b8fc4ff20e73b3278c1ba  thunderbird-5.0.source.tar.bz2
 be5f6aea50eeefae234bfc0f30e2f0ec  thunderbird-appversion.patch
diff --git a/extra/thunderbird/Pkgfile b/extra/thunderbird/Pkgfile
index 179d8cab0..36cd8eeb4 100755
--- a/extra/thunderbird/Pkgfile
+++ b/extra/thunderbird/Pkgfile
@@ -2,21 +2,16 @@
 # URL: http://www.mozilla-europe.org/fr/products/thunderbird/
 # Maintainer: NuTyX core team
 # Packager: lesibel at free dot fr
-# Depends on: alsa-lib,gtk,libidl,nss,xorg-libxt,shared-mime-info,dbus-glib,sqlite3,desktop-file-utils,libnotify,libevent,hunspell
-# Run on: alsa-lib,gtk,libidl,nss,xorg-libxt,shared-mime-info,dbus-glib,sqlite3,desktop-file-utils,libnotify,libevent,hunspell
+# Depends on: yasm,alsa-lib,gtk,libidl,nss,xorg-libxt,shared-mime-info,dbus-glib,sqlite3,desktop-file-utils,libnotify,libevent,hunspell,gconf,mesa3d
+# Run on: alsa-lib,gtk,libidl,nss,xorg-libxt,shared-mime-info,dbus-glib,sqlite3,desktop-file-utils,libnotify,libevent,hunspell,gconf,mesa3d
 
 
 name=thunderbird
 version=5.0
-release=1
-
-source=( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$version/source/thunderbird-$version.source.tar.bz2 
-	 http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/$version/linux-i686/xpi/fr.xpi
-	 mozconfig
-         thunderbird-3.0-lang.patch
-         thunderbird-appversion.patch
-	 thunderbird.desktop \
-	 thunderbird.png)
+release=2
+
+source=( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$version/source/thunderbird-$version.source.tar.bz2 \
+	 fr.xpi mozconfig thunderbird-3.0-lang.patch thunderbird-appversion.patch thunderbird.desktop thunderbird.png)
 
 build() {
 	cd $SRC/comm-miramar
diff --git a/extra/thunderbird/fr.xpi b/extra/thunderbird/fr.xpi
new file mode 100644
index 000000000..77339ff1d
--- /dev/null
+++ b/extra/thunderbird/fr.xpi
diff --git a/extra/thunderbird/mozconfig b/extra/thunderbird/mozconfig
index 1bb406aa0..dd3bd8e87 100644
--- a/extra/thunderbird/mozconfig
+++ b/extra/thunderbird/mozconfig
@@ -36,6 +36,8 @@ ac_add_options --disable-gnomevfs
 ac_add_options --enable-gconf
 ac_add_options --enable-libnotify
 
+ac_add_options --disable-necko-wifi
+
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 export USE_SHORT_LIBNAME=1