Tue Mar 27 22:35:50 CEST 2012

commit 2b3e95c75448b974ccbb6fc60ae50acd8114bfc6
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Tue Mar 27 22:35:50 2012 +0200

    thunderbird: Florin please check if it starts what you commit.
    I changed date of updated field to force rebuild.
    Florin updated thunderbird but it crashes on start and quits.
    I fixed this broken update and now thunderbird does not crash and quits on start.
    I also have done similar optimizations which I made to firefox
    (removed non existing options, turned off remaining debug options and some other tweaks).
    Thunderbird now starts faster and runs faster and has quicker response.
---
 mail/thunderbird/BUILD     |   17 +++++++++++++----
 mail/thunderbird/DEPENDS   |    1 +
 mail/thunderbird/DETAILS   |    3 +--
 mail/thunderbird/mozconfig |   16 +++++-----------
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index 1d7590d..0d7d9ae 100644
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -19,14 +19,13 @@
   export BUILD_OFFICIAL=1  &&
   export MOZ_MAKE_FILES=$MAKES  &&
   export MOZ_THUNDERBIRD=1 &&
+  export MOZ_OPTIMIZE_FLAGS="$CFLAGS" &&
+  export MOZ_DEBUG_FLAGS="$CFLAGS" &&
 
   cp $SCRIPT_DIRECTORY/mozconfig .  &&
   export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"  &&
   mkdir -p ${MOZ_OBJDIR}  &&
 
-  echo "ac_add_options --disable-necko-wifi" >> mozconfig  &&
-  echo "ac_add_options --disable-system-sqlite" >> mozconfig  &&
-
   #Add DEPENDS options
 
   if in_depends $MODULE gnome-vfs ; then
@@ -47,6 +46,16 @@
     echo "ac_add_options --disable-dbus" >> mozconfig
   fi  &&
 
+  if in_depends $MODULE libffi ; then
+    echo "ac_add_options --enable-system-ffi" >> mozconfig
+  else
+    echo "ac_add_options --disable-system-ffi" >> mozconfig
+  fi  &&
+
+  if in_depends $MODULE sun-jdk ; then
+    echo "ac_add_options --with-java-bin-path=/usr/java/default/bin" >> mozconfig
+  fi  &&
+
   if in_depends $MODULE openldap ; then
     echo "ac_add_options --enable-ldap" >> mozconfig
   else
@@ -74,7 +83,7 @@
   # Now the .desktop file and icons
   install -Dm 644 {"$SCRIPT_DIRECTORY",/usr/share/applications}/thunderbird.desktop  &&
 
-  for s in 16 22 24 256 32 48 ; do
+  for s in 16 22 24 32 48 256 ; do
     install -Dm 644 mozilla/dist/thunderbird/chrome/icons/default/default${s}.png /usr/share/icons/hicolor/${s}x${s}/apps/thunderbird.png
   done  &&
   if [ -x /usr/bin/gtk-update-icon-cache -a -f /usr/share/icons/hicolor/index.theme ]; then
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index e7a2377..f9abd5a 100644
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -10,6 +10,7 @@ optional_depends "hunspell"         "--enable-system-hunspell"  "--disable-syste
 # $OPTS is ignored in this BUILD
 optional_depends "libevent"         ""  ""  "For event detection"
 optional_depends "dbus-glib"        ""  ""  "For dbus support"
+optional_depends "libffi" "" "" "Use system libffi instead of compiling the one in firefox"
 
 optional_depends "startup-notification"  "--enable-startup-notification"  ""  \
                  "To enable startup notification"
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 8402d77..79c2f9f 100644
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -9,9 +9,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/comm-release
       SOURCE_VFY=sha1:dce279de31e66940afc0d85756a7fd6da21a1dc1
         WEB_SITE=http://www.mozilla.org/projects/thunderbird
          ENTERED=20031021
-         UPDATED=20120314
+         UPDATED=20120326
            SHORT="A full-featured mail client"
-           PSAFE=no
 
 cat << EOF
 Thunderbird includes:
diff --git a/mail/thunderbird/mozconfig b/mail/thunderbird/mozconfig
index ee3e336..d73f05c 100644
--- a/mail/thunderbird/mozconfig
+++ b/mail/thunderbird/mozconfig
@@ -14,7 +14,6 @@ ac_add_options --enable-crypto
 ac_add_options --enable-strip
 ac_add_options --enable-system-cairo
 ac_add_options --enable-xterm-updates
-ac_add_options --enable-libxul
 ac_add_options --enable-official-branding
 ac_add_options --enable-jemalloc
 ac_add_options --disable-debug
@@ -23,21 +22,16 @@ ac_add_options --disable-installer
 ac_add_options --disable-pedantic
 ac_add_options --disable-logging
 ac_add_options --disable-accessibility
-ac_add_options --disable-oji
 ac_add_options --disable-updater
-# static build is required for mail
-#ac_add_options --enable-static
-#ac_add_options --enable-static-mail
 ac_add_options --disable-os2-high-mem
 ac_add_options --enable-gio
 ac_add_options --enable-raw
-ac_add_options --enable-splashscreen
+ac_add_options --with-system-libvpx
 ac_add_options --enable-shared-js
 ac_add_options --enable-system-pixman
-ac_add_options --enable-image-decoders=all
-ac_add_options --enable-image-encoders=all
 ac_add_options --enable-calendar
-ac_add_options --enable-functiontimer
-ac_add_options --enable-timeline
 ac_add_options --enable-tree-freetype
-ac_add_options --enable-faststart
+ac_add_options --enable-static-mail
+ac_add_options --disable-crashreporter
+ac_add_options --disable-necko-wifi
+ac_add_options --disable-system-sqlite
