[Lunar-commits] <moonbase> thunderbird: updated to 6.0.1
Zbigniew Luszpinski
zbiggy at lunar-linux.org
Fri Sep 2 21:40:17 CEST 2011
commit 39581282dd98edeb539c3de2397d2d82f94ec0bc
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date: Fri Sep 2 21:40:17 2011 +0200
thunderbird: updated to 6.0.1
---
mail/thunderbird/BUILD | 90 +++++++++++++--------------------
mail/thunderbird/CONFLICTS | 2 +-
mail/thunderbird/DEPENDS | 30 +++++++++--
mail/thunderbird/DETAILS | 16 +++---
mail/thunderbird/POST_INSTALL | 18 +++---
mail/thunderbird/POST_REMOVE | 3 -
mail/thunderbird/PRE_BUILD | 10 ++--
mail/thunderbird/mozconfig | 42 ++++++++--------
mail/thunderbird/thunderbird.desktop | 3 +-
9 files changed, 108 insertions(+), 106 deletions(-)
diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index 403df3e..04a0ea9 100644
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -1,51 +1,41 @@
(
- COMM_VER=comm-1.9.2
-
if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
set_module_config OLD_VER "`installed_version $MODULE`"
- fi &&
-
- export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
- export MOZ_CO_PROJECT=mail
- export MOZILLA_OFFICIAL=1
- export BUILD_OFFICIAL=1
- 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
-
- . /etc/profile.d/pkgconfig.rc &&
- cp $SCRIPT_DIRECTORY/mozconfig $COMM_VER &&
-
- export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"
+ fi &&
+
+ export MOZ_CO_PROJECT=mail &&
+ export MOZILLA_HOME=/usr/lib/thunderbird-$VERSION &&
+ export MOZILLA_OFFICIAL=1 &&
+ export BUILD_OFFICIAL=1 &&
+ export MOZ_THUNDERBIRD=1 &&
+
+ cp $SCRIPT_DIRECTORY/mozconfig . &&
+
+ export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla" &&
mkdir -p ${MOZ_OBJDIR} &&
- cd $COMM_VER &&
+ echo "ac_add_options --disable-necko-wifi" >> mozconfig &&
+ echo "ac_add_options --disable-system-sqlite" >> mozconfig &&
#Add DEPENDS options
- if in_depends $MODULE dbus ; then
- echo "ac_add_options --enable-dbus" >> mozconfig
+ if in_depends $MODULE gnome-vfs ; then
+ echo "ac_add_options --enable-gnomevfs" >> mozconfig
else
- echo "ac_add_options --disable-dbus" >> mozconfig
- fi &&
-
- if in_depends $MODULE sqlite ; then
- echo "ac_add_options --enable-system-sqlite" >> mozconfig
+ echo "ac_add_options --disable-gnomevfs" >> mozconfig
fi &&
- if in_depends $MODULE "xulrunner" ; then
- XUL=`module_version xulrunner`
- echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL" >> mozconfig
+ if in_depends $MODULE libevent ; then
+ echo "ac_add_options --with-system-libevent" >> mozconfig
+ else
+ echo "ac_add_options --without-system-libevent" >> mozconfig
fi &&
- if in_depends $MODULE gnome-vfs ; then
- echo "ac_add_options --enable-gnomevfs" >> mozconfig
+ if in_depends $MODULE dbus-glib ; then
+ echo "ac_add_options --enable-dbus" >> mozconfig
else
- echo "ac_add_options --disable-gnomevfs" >> mozconfig
+ echo "ac_add_options --disable-dbus" >> mozconfig
fi &&
if in_depends $MODULE openldap ; then
@@ -59,10 +49,10 @@
#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 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 &&
make -f client.mk profiledbuild
else
make -f client.mk build
@@ -70,24 +60,16 @@
cd ${MOZ_OBJDIR} &&
prepare_install &&
- make install &&
+ make install || exit 1
- # Make thunderbird use its own icon
- mkdir -p $MOZILLA_HOME/chrome/icons/default &&
+ # Now the .desktop file and icons
+ install -Dm 644 {"$SCRIPT_DIRECTORY",/usr/share/applications}/thunderbird.desktop &&
- 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 $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_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
+ for s in 16 22 24 256 32 48 ; 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
+ gtk-update-icon-cache -f /usr/share/icons/hicolor
+ fi
) > $C_FIFO 2>&1
-
diff --git a/mail/thunderbird/CONFLICTS b/mail/thunderbird/CONFLICTS
index 6fe7cea..1802bb5 100644
--- a/mail/thunderbird/CONFLICTS
+++ b/mail/thunderbird/CONFLICTS
@@ -1 +1 @@
-conflicts thunderbird5
+conflicts thunderbird3
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index f6e20fd..b462695 100644
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -1,12 +1,30 @@
depends ORBit2
depends zip
depends unzip
-depends expat
depends gtk+-2
-depends startup-notification
-depends libnotify
-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"
+optional_depends "Python" "" "" "Needed to do a Profile Guided Optimization build"
+optional_depends "gnome-vfs" "" "" "For Gnome VFS support"
+optional_depends "hunspell" "--enable-system-hunspell" "--disable-system-hunspell" "For spelling support"
+# $OPTS is ignored in this BUILD
+optional_depends "libevent" "" "" "For event detection"
+optional_depends "dbus-glib" "" "" "For dbus support"
+
+optional_depends "startup-notification" "--enable-startup-notification" "" \
+ "To enable startup notification"
+
+optional_depends "libnotify" "--enable-libnotify" "--disable-libnotify" \
+ "To enable libnotify support"
+
+optional_depends "openldap" "--enable-ldap" "--disable-ldap" \
+ "To enable ldap support"
+
+optional_depends "xulrunner" "--with-system-libxul --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL" "" \
+ "To use system xulrunner"
+
+optional_depends "nspr" "--with-system-nspr" "" \
+ "To use system nspr"
+
+optional_depends "nss" "--with-system-nss" "" \
+ "To use system nss"
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 4a92db0..46926c6 100644
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,15 +1,15 @@
MODULE=thunderbird
- VERSION=3.1.12
+ VERSION=6.0.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:b2fbc9b95c4b43bd2f79a3232f556108471a4df3
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/comm-release
+ SOURCE_URL[1]=ftp://mozilla.isc.org/pub/mozilla.org/thunderbird/releases/$VERSION/source
+ SOURCE_URL[0]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/thunderbird/releases/$VERSION/source
+ SOURCE_URL[2]=http://archive.progeny.com/mozilla.org/thunderbird/releases/$VERSION/source
+ SOURCE_URL[3]=ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source
+ SOURCE_VFY=sha1:b32775400b6605ce0bfa5facaa6deebc53aa9950
WEB_SITE=http://www.mozilla.org/projects/thunderbird
ENTERED=20031021
- UPDATED=20110820
+ UPDATED=20110831
SHORT="A full-featured mail client"
PSAFE=no
diff --git a/mail/thunderbird/POST_INSTALL b/mail/thunderbird/POST_INSTALL
index 3fc416c..9ff84b1 100644
--- a/mail/thunderbird/POST_INSTALL
+++ b/mail/thunderbird/POST_INSTALL
@@ -1,17 +1,17 @@
-OLD_VER="$(get_module_config OLD_VER)"
-TBIRD_HOME=/usr
+OLD_VER="`get_module_config OLD_VER`"
TBIRD_LIBDIR=thunderbird-$VERSION
if [ ! -z $OLD_VER ]; then
rm -rf /usr/lib/thunderbird-$OLD_VER
+ rm -rf /usr/include/thunderbird-$OLD_VER
+ rm -rf /usr/share/idl/thunderbird-$OLD_VER
fi
-
unset_module_config OLD_VER
-# No more linking workarounds
-export LD_LIBRARY_PATH="$TBIRD_HOME/lib/$TBIRD_LIBDIR:$TBIRD_HOME/lib/$TBIRD_LIBDIR/plugins:$TBIRD_HOME/lib/$TBIRD_LIBDIR/components"
-export MOZILLA_FIVE_HOME="$TBIRD_HOME/lib/$TBIRD_LIBDIR"
-ldconfig
+rm -rf /usr/lib/thunderbird-1*
+rm -rf /usr/lib/thunderbird-2*
+rm -rf /usr/lib/thunderbird-3*
-#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
+export LD_LIBRARY_PATH="/usr/lib/$TBIRD_LIBDIR:/usr/lib/$TBIRD_LIBDIR/components"
+export MOZILLA_FIVE_HOME="/usr/lib/$TBIRD_LIBDIR"
+ldconfig
diff --git a/mail/thunderbird/POST_REMOVE b/mail/thunderbird/POST_REMOVE
deleted file mode 100644
index c9d5ec6..0000000
--- a/mail/thunderbird/POST_REMOVE
+++ /dev/null
@@ -1,3 +0,0 @@
-rm -f /usr/share/pixmaps/mozicon50.xpm
-rm -rf /usr/include/thunderbird-$VERSION
-rm -rf /usr/lib/thunderbird-$VERSION
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index cc901d0..9574723 100644
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -1,5 +1,7 @@
-validate_source_dir &&
-mk_source_dir &&
+if [ ! -e /usr/include/cairo/cairo-tee.h ] ; then
+ message "${PROBLEM_COLOR}Run: ${MODULE_COLOR}lin -c cairo"
+ message "${MESSAGE_COLOR}To recompile cairo with tee support, which is required by Seamonkey2.1.${DEFAULT_COLOR}"
+ exit 1
+fi
-cd $SOURCE_DIRECTORY &&
-unpack $SOURCE
+default_pre_build
diff --git a/mail/thunderbird/mozconfig b/mail/thunderbird/mozconfig
index 0af1644..ee3e336 100644
--- a/mail/thunderbird/mozconfig
+++ b/mail/thunderbird/mozconfig
@@ -4,38 +4,40 @@ 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-storage
ac_add_options --enable-application=mail
-ac_add_options --enable-default-toolkit=cairo-gtk2 #cairo-qt
+ac_add_options --enable-default-toolkit=cairo-gtk2
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-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 --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-installer
+ac_add_options --disable-pedantic
ac_add_options --disable-logging
ac_add_options --disable-accessibility
-ac_add_options --disable-installer
ac_add_options --disable-oji
+ac_add_options --disable-updater
# 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
-
+#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 --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
diff --git a/mail/thunderbird/thunderbird.desktop b/mail/thunderbird/thunderbird.desktop
index 3cc7194..9228460 100644
--- a/mail/thunderbird/thunderbird.desktop
+++ b/mail/thunderbird/thunderbird.desktop
@@ -4,9 +4,10 @@ Name=Thunderbird Mail
Name[pl]=Poczta Thunderbird
Comment=Thunderbird Mail Client
Exec=thunderbird
-Icon=mailicon48.png
+Icon=thunderbird
Terminal=false
Type=Application
Categories=Application;Network;
Comment[pl]=Thunderbird - klient poczty
+X-KDE-StartupNotify=true
StartupNotify=true
More information about the Lunar-commits
mailing list