[Lunar-commits] <moonbase> thunderbird: updated to 3.0

Zbigniew Luszpinski zbiggy at lunar-linux.org
Sat Dec 26 21:38:25 CET 2009 

commit 0103f3d29325d08df5858c5bb297141dd09718dc
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat Dec 26 21:38:25 2009 +0100

    thunderbird: updated to 3.0
---
 mail/thunderbird/BUILD               |  141 +++++++++++++++++-----------------
 mail/thunderbird/CONFIGURE           |    1 +
 mail/thunderbird/DEPENDS             |    8 +-
 mail/thunderbird/DETAILS             |   17 ++---
 mail/thunderbird/POST_INSTALL        |    7 +-
 mail/thunderbird/PRE_BUILD           |    5 +
 mail/thunderbird/mozconfig           |   42 ++++++++++
 mail/thunderbird/thunderbird.desktop |   11 +++
 8 files changed, 141 insertions(+), 91 deletions(-)

diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index e643788..1b71510 100644
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -1,94 +1,91 @@
 (
+
+  #Really? You go and call fprintf and don't #include <cstdio>?
+  #How exactly did you plan on doing that?!?!
+  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' comm-1.9.1/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
+  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' comm-1.9.1/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
+  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' comm-1.9.1/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
+
   if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
         set_module_config OLD_VER "`installed_version $MODULE`"
   fi &&
 
-  MOZILLA_HOME=/usr/lib/$MODULE-$VERSION 
-  MOZ_EXTENSIONS="wallet,spellcheck,xmlextras,webservices"
-  NECKO_PROT="http,file,jar,viewsource,res,data"
+  export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
+  export MOZ_CO_PROJECT=mail
+  export MOZILLA_OFFICIAL=1
+  export BUILD_OFFICIAL=1
+  export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
+  export MOZ_THUNDERBIRD=1
+
+  cp $SCRIPT_DIRECTORY/mozconfig comm-1.9.1/  &&
+
+  export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"
+  mkdir -p ${MOZ_OBJDIR}  &&
+
+  cd comm-1.9.1 &&
+
+  #Add DEPENDS options
 
-  if in_depends heimdal ; then
-        MOZ_EXTENSIONS="${MOZ_EXTENSIONS},negotiateauth"
+  if in_depends $MODULE dbus ; then
+    echo "ac_add_options --enable-dbus" >> mozconfig
   else
-        MOZ_EXTENSIONS="${MOZ_EXTENSIONS},-negotiateauth"
-  fi &&
+    echo "ac_add_options --disable-dbus" >> mozconfig
+  fi  &&
 
-  # This hack added to fix a gtk+-2/pango/atk update that broke firefox. This should be removed in the future.
-  sedit "s/(MOZ_GTK2_LIBS)/(MOZ_GTK2_LIBS) -lX11 -lXrender/" layout/build/Makefile.in &&
+  if in_depends $MODULE sqlite ; then
+    echo "ac_add_options --enable-system-sqlite" >> mozconfig
+  fi  &&
 
-  export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-  export MOZ_THUNDERBIRD=1
-  export MOZILLA_OFFICIAL=1
-  export BUILD_OFFICIAL=1
+  if in_depends $MODULE "xulrunner" ; then
+    XUL=`module_version xulrunner`
+    echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL" >> mozconfig
+  fi  &&
 
-  ./configure           \
-    --prefix=/usr       \
-    --with-x            \
-    --with-pthreads     \
-    --with-default-mozilla-five-home=$MOZILLA_HOME \
-    --with-user-appdir=".thunderbird"       \
-    --with-system-zlib  \
-    --with-system-png   \
-    --with-system-jpeg  \
-    --enable-extensions=${MOZ_EXTENSIONS}       \
-    --enable-single-profile        \
-    --enable-application=mail      \
-    --enable-default-toolkit=gtk2  \
-    --enable-optimize="$CFLAGS"    \
-    --enable-xft        \
-    --enable-reorder    \
-    --enable-cpp-rtti   \
-    --enable-cpp-exceptions \
-    --enable-crypto     \
-    --enable-strip      \
-    --enable-strip-libs \
-    --enable-xterm-updates      \
-    --enable-official-branding  \
-    --enable-image-decoders=default,-xbm        \
-    --enable-necko-protocols=${NECKO_PROT}      \
-    --disable-debug     \
-    --disable-tests     \
-    --disable-oji       \
-    --disable-svg       \
-    --disable-plugins   \
-    --disable-necko-disk-cache  \
-    --disable-installer \
-    --disable-pedantic  \
-    --disable-logging   \
-    --disable-accessibility     \
-    --disable-freetype2 \
-    --disable-profilesharing    \
-    --disable-mathml    \
-    $OPTS               &&
+  if in_depends $MODULE gnome-vfs ; then
+    echo "ac_add_options --enable-gnomevfs" >> mozconfig
+  else
+    echo "ac_add_options --disable-gnomevfs" >> mozconfig
+  fi  &&
+
+  if in_depends $MODULE openldap ; then
+    echo "ac_add_options --enable-ldap" >> mozconfig
+  else
+    echo "ac_add_options --disable-ldap" >> mozconfig
+  fi  &&
 
   setterm -bfreq -blength &&
 
-  default_make        &&
+  #Finally, the build!
+  if [ "$PGO" == "y" ] ; then
+    #CCache breaks the pgo build
+    export CCACHE_DISABLE=1
+    echo "ac_add_options --enable-profile-guided-optimization" >> mozconfig  &&
+    echo "mk_add_options PROFILE_GEN_SCRIPT='python $MOZ_OBJDIR/_profile/pgo/profileserver.py'" >> mozconfig  &&
+    make -f client.mk profiledbuild
+  else
+    make -f client.mk build
+  fi  &&
 
-    # Enigmail support disabled since it doesn't work anylonger
-    # Blame the thunderbird developers
-    #if module_installed gnupg ; then
-    #  build/autoconf/make-makefile extensions/ipc \
-    #            extensions/enigmail
-    #  make -C extensions/ipc
-    #  make -C extensions/enigmail
-    #  make -C extensions/ipc install 
-    #  make -C extensions/enigmail install
-    #fi
+  cd ${MOZ_OBJDIR}  &&
+  prepare_install   &&
+  make install      &&
 
-    # Needed for rss support
-    install -d $MOZILLA_HOME/defaults/isp/US &&
-    install -m644 $SOURCE_DIRECTORY/mail/extensions/newsblog/rss.rdf $MOZILLA_HOME/defaults/isp &&
-    install -m644 $SOURCE_DIRECTORY/mail/extensions/newsblog/rss.rdf $MOZILLA_HOME/defaults/isp/US &&
+  # Make thunderbird use its own icon
+  mkdir -p $MOZILLA_HOME/chrome/icons/default  &&
 
-    # Put some important headers in place
-    mkdir -p /usr/include/$MODULE-$VERSION/nss &&
-    cp -Lf dist/private/nss/*.h dist/public/nss/*.h /usr/include/$MODULE-$VERSION/nss &&
+  for icon in `ls $MOZILLA_HOME/icons`; do
+   `ln -sf $MOZILLA_HOME/icons/$icon \
+           $MOZILLA_HOME/chrome/icons/default/$icon`
+  done
 
     # Now the .desktop file and the icon
     mkdir -p /usr/share/applications /usr/share/pixmaps &&
-    install -m644 $SOURCE_CACHE/$SOURCE2 /usr/share/applications &&
+    install -m644 $SCRIPT_DIRECTORY/thunderbird.desktop /usr/share/applications &&
+    # please, dont just let the lin fail because /usr/share/pixmaps/thunderbird.xpm is an existing symlink...
     rm -f /usr/share/pixmaps/thunderbird.xpm &&
-    install -m644 $MOZILLA_HOME/icons/mozicon50.xpm /usr/share/pixmaps
+    cp $SOURCE_DIRECTORY/comm-1.9.1/other-licenses/branding/thunderbird/content/icon64.png $SOURCE_DIRECTORY/comm-1.9.1/other-licenses/branding/thunderbird/mailicon64.png &&
+    cp -f $SOURCE_DIRECTORY/comm-1.9.1/other-licenses/branding/thunderbird/content/icon48.png $SOURCE_DIRECTORY/comm-1.9.1/other-licenses/branding/thunderbird/mailicon48.png &&
+    install -m644 $SOURCE_DIRECTORY/comm-1.9.1/other-licenses/branding/thunderbird/mailicon*.png /usr/share/pixmaps
 
 ) > $C_FIFO 2>&1
+
diff --git a/mail/thunderbird/CONFIGURE b/mail/thunderbird/CONFIGURE
new file mode 100644
index 0000000..bb3eff0
--- /dev/null
+++ b/mail/thunderbird/CONFIGURE
@@ -0,0 +1 @@
+mquery PGO "Build with Profile Guided Optimization?"  y  "--enable-profile-guided-optimization"  ""
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index a1069f7..2bc94cc 100644
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -3,7 +3,7 @@ depends zip
 depends unzip
 depends expat
 depends gtk+-2
-optional_depends "gnupg" "" "" "for encrypted email"
-optional_depends "gnome-vfs" "" "--disable-gnome --disable-gnomevfs" "for Gnome VFS support"
-optional_depends heimdal "--with-gssapi=/usr/include/heimdal" "" "Heimdal GSSAPI Support"
-optional_depends openldap "--enable-ldap" "--disable-ldap" "for LDAP address book support"
+optional_depends "gnome-vfs" "" "" "for Gnome VFS support"
+optional_depends "openldap" "" "" "for LDAP address book support"
+optional_depends "Python" "" "" "Needed to do a Profile Guided Optimization build"
+
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 73a6341..c31aa1f 100644
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,18 +1,15 @@
           MODULE=thunderbird
-         VERSION=2.0.0.23
-          SOURCE=thunderbird-$VERSION-source.tar.bz2
-         SOURCE2=thunderbird.desktop
+         VERSION=3.0
+          SOURCE=thunderbird-$VERSION.source.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
    SOURCE_URL[0]=ftp://mozilla.isc.org/pub/mozilla.org/$MODULE/releases/$VERSION/source/
-   SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/source/
-   SOURCE_URL[2]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/$MODULE/releases/$VERSION/source/
-   SOURCE_URL[3]=http://archive.progeny.com/mozilla.org/$MODULE/releases/$VERSION/source/
-      SOURCE_VFY=sha1:a237bfb92ec9c4b2bed7ea744e95d01ec43e07f1
-     SOURCE2_URL=$PATCH_URL
-     SOURCE2_VFY=sha1:88f83d8dda242f34d0f1bb58c4a0b98d353ef7e1
+   SOURCE_URL[1]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/$MODULE/releases/$VERSION/source/
+   SOURCE_URL[2]=http://archive.progeny.com/mozilla.org/$MODULE/releases/$VERSION/source/
+   SOURCE_URL[3]=ftp://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/source/
+      SOURCE_VFY=sha1:7a8a08f011901b4c0b737de2d7a226242935543d
         WEB_SITE=http://www.mozilla.org/projects/thunderbird
          ENTERED=20031021
-         UPDATED=20090820
+         UPDATED=20091225
            SHORT="A full-featured mail client"
            PSAFE=no
 cat << EOF
diff --git a/mail/thunderbird/POST_INSTALL b/mail/thunderbird/POST_INSTALL
index 0b72f93..3fc416c 100644
--- a/mail/thunderbird/POST_INSTALL
+++ b/mail/thunderbird/POST_INSTALL
@@ -13,8 +13,5 @@ export LD_LIBRARY_PATH="$TBIRD_HOME/lib/$TBIRD_LIBDIR:$TBIRD_HOME/lib/$TBIRD_LIB
 export MOZILLA_FIVE_HOME="$TBIRD_HOME/lib/$TBIRD_LIBDIR"
 ldconfig
 
-echo "skin,install,select,classic/1.0" >> $TBIRD_HOME/lib/$TBIRD_LIBDIR/chrome/installed-chrome.txt
-echo "locale,install,select,en-US" >> $TBIRD_HOME/lib/$TBIRD_LIBDIR/chrome/installed-chrome.txt
-
-cd $TBIRD_HOME/lib/$TBIRD_LIBDIR
-./regxpcom
+#echo "skin,install,select,classic/1.0" >> $TBIRD_HOME/lib/$TBIRD_LIBDIR/chrome/installed-chrome.txt
+#echo "locale,install,select,en-US" >> $TBIRD_HOME/lib/$TBIRD_LIBDIR/chrome/installed-chrome.txt
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
new file mode 100644
index 0000000..cc901d0
--- /dev/null
+++ b/mail/thunderbird/PRE_BUILD
@@ -0,0 +1,5 @@
+validate_source_dir &&
+mk_source_dir &&
+
+cd $SOURCE_DIRECTORY &&
+unpack $SOURCE
diff --git a/mail/thunderbird/mozconfig b/mail/thunderbird/mozconfig
new file mode 100644
index 0000000..dd5cbff
--- /dev/null
+++ b/mail/thunderbird/mozconfig
@@ -0,0 +1,42 @@
+ac_add_options --prefix=/usr
+ac_add_options --with-x
+ac_add_options --with-pthreads
+ac_add_options --with-default-mozilla-five-home=$MOZILLA_HOME
+ac_add_options --with-user-appdir=".thunderbird"
+ac_add_options --with-system-zlib
+#ac_add_options --with-system-png
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-bz2
+ac_add_options --enable-system-cairo
+ac_add_options --enable-application=mail
+ac_add_options --enable-default-toolkit=cairo-gtk2 #cairo-qt
+ac_add_options --enable-optimize="$CFLAGS"
+ac_add_options --enable-cpp-rtti
+ac_add_options --enable-cpp-exceptions
+ac_add_options --enable-crypto
+ac_add_options --enable-strip
+ac_add_options --enable-xterm-updates
+ac_add_options --enable-official-branding
+ac_add_options --enable-jemalloc
+ac_add_options --enable-calendar
+ac_add_options --enable-startup-notification
+ac_add_options --disable-pedantic
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+ac_add_options --disable-logging
+ac_add_options --disable-accessibility
+ac_add_options --disable-installer
+ac_add_options --disable-oji
+ac_add_options --disable-plugins
+# static build is required for mail
+ac_add_options --enable-static
+# wifi breaks build due to incompatibile header files
+ac_add_options --disable-necko-wifi
+#--with-system-nspr
+#--with-system-nss
+#--enable-system-hunspell
+#--enable-ui-locale
+#--enable-native-uconv
+#--enable-tree-freetype
+#--enable-xpcom-lea
+
diff --git a/mail/thunderbird/thunderbird.desktop b/mail/thunderbird/thunderbird.desktop
new file mode 100644
index 0000000..ae94b6d
--- /dev/null
+++ b/mail/thunderbird/thunderbird.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Thunderbird Mail
+Name[pl]=Poczta Thunderbird
+Comment=Thunderbird Mail Client
+Exec=thunderbird
+Icon=mailicon48.png
+Terminal=false
+Type=Application
+Categories=Application;Network;
+Comment[pl]=Thunderbird - klient poczty

More information about the Lunar-commits mailing list