[Lunar-commits] <moonbase> thunderbird: updated to 3.1 Fixed and cleaned up build script

[Zbigniew Luszpinski]

commit 190066c7aa37724af84edc793a5ac492cd60ff38
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sun Jul 18 15:18:00 2010 +0200

    thunderbird: updated to 3.1
    Fixed and cleaned up build script
---
 mail/thunderbird/BUILD   |   29 +++++++++++++++--------------
 mail/thunderbird/DETAILS |    6 +++---
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index 41e2aa5..5869723 100644
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -1,10 +1,6 @@
 (
 
-  #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
+  COMM_VER=comm-1.9.2
 
   if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
         set_module_config OLD_VER "`installed_version $MODULE`"
@@ -14,15 +10,20 @@
   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
+  # I have no idea how Mozilla compiles binaries if source code is not compilable without these fixes:
+  sedit '160s/^protected/public/' $COMM_VER/mozilla/layout/generic/nsFrame.h &&
+  export MOZILLA_SRCDIR=$SOURCE_DIRECTORY/$COMM_VER/mozilla
+  export BUILD_TOOLS=$MOZILLA_SRCDIR/build/unix
+  export MOZILLA_DIR=$MOZILLA_SRCDIR
 
-  cp $SCRIPT_DIRECTORY/mozconfig comm-1.9.1/  &&
+  . /etc/profile.d/pkgconfig.rc &&
+  cp $SCRIPT_DIRECTORY/mozconfig $COMM_VER &&
 
   export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"
   mkdir -p ${MOZ_OBJDIR}  &&
 
-  cd comm-1.9.1 &&
+  cd $COMM_VER &&
 
   #Add DEPENDS options
 
@@ -59,9 +60,9 @@
   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 build &&
+    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 build
     make -f client.mk profiledbuild
   else
     make -f client.mk build
@@ -84,9 +85,9 @@
     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 &&
-    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
+    cp $SOURCE_DIRECTORY/$COMM_VER/other-licenses/branding/thunderbird/content/icon64.png $SOURCE_DIRECTORY/$COMM_VER/other-licenses/branding/thunderbird/mailicon64.png &&
+    cp -f $SOURCE_DIRECTORY/$COMM_VER/other-licenses/branding/thunderbird/content/icon48.png $SOURCE_DIRECTORY/$COMM_VER/other-licenses/branding/thunderbird/mailicon48.png &&
+    install -m644 $SOURCE_DIRECTORY/$COMM_VER/other-licenses/branding/thunderbird/mailicon*.png /usr/share/pixmaps
 
 ) > $C_FIFO 2>&1
 
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 9e1959c..318a22e 100644
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,15 +1,15 @@
           MODULE=thunderbird
-         VERSION=3.0.5
+         VERSION=3.1
           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.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:c51b6c6a9357578beb7440e4d3cf4594a61fd6a7
+      SOURCE_VFY=sha1:89e9d8099a5437ce401577fc4d526eb0dd9e51da
         WEB_SITE=http://www.mozilla.org/projects/thunderbird
          ENTERED=20031021
-         UPDATED=20100618
+         UPDATED=20100626
            SHORT="A full-featured mail client"
            PSAFE=no