wok rev 12352

thunderbird: fix error msg at startup
author Dominique Corbex <domcox@slitaz.org>
date Thu Apr 19 21:04:35 2012 +0200 (2012-04-19)
parents e7e64bbf2386
children 34720ca57001
files thunderbird/receipt thunderbird/stuff/autoconf.js thunderbird/stuff/thunderbird.cfg thunderbird/stuff/thunderbird.mozconfig.conf
line diff
     1.1 --- a/thunderbird/receipt	Thu Apr 19 21:02:13 2012 +0200
     1.2 +++ b/thunderbird/receipt	Thu Apr 19 21:04:35 2012 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="thunderbird"
     1.7 -VERSION="11.0"
     1.8 +VERSION="11.0.1"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Mozilla's Thunderbird email application."
    1.11  MAINTAINER="domcox@slitaz.org"
    1.12 @@ -15,13 +15,13 @@
    1.13  WEB_SITE="http://www.mozilla.org/"
    1.14  WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$TARBALL"
    1.15  TAGS="email pop imap smtp"
    1.16 -LANG="de es_ES fr en_GB pt_PT pt_BR ru"
    1.17 +TB_LOCALES="de es_ES fr en_GB pt_PT pt_BR ru"
    1.18  
    1.19  # Rules to configure and make the package.
    1.20  compile_rules()
    1.21  {
    1.22  	cat <<EOF
    1.23 -WARNING:  long compile time.
    1.24 +WARNING: long compile time.
    1.25  Requirements: 
    1.26  - 512MB RAM with lots of available swap space. Additional RAM will 
    1.27    significantly decrease build time. 
    1.28 @@ -30,11 +30,11 @@
    1.29  	# add config
    1.30      cp -a $stuff/thunderbird.mozconfig.conf $src/.mozconfig
    1.31  	# languages
    1.32 -	echo "# languages" >> $src/.mozconfig
    1.33 -	echo "mk_add_options MOZ_CO_LOCALES=\"$LANG\"" >> $src/.mozconfig
    1.34 +	echo -e "\n# languages" >> $src/.mozconfig
    1.35 +	echo "mk_add_options MOZ_CO_LOCALES=\"$TB_LOCALES\"" >> $src/.mozconfig
    1.36  	# for a quick build
    1.37 -	echo "# build quicker" >> $src/.mozconfig
    1.38 -	echo 'mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS"' >> $src/.mozconfig
    1.39 +	echo -e "\n# build quicker" >> $src/.mozconfig
    1.40 +	echo "mk_add_options MOZ_MAKE_FLAGS=$MAKEFLAGS" >> $src/.mozconfig
    1.41  	# build
    1.42  	cd $src
    1.43  	patch -Np1 -i $stuff/thunderbird-3.0-lang.patch
    1.44 @@ -51,9 +51,9 @@
    1.45  	# program
    1.46  	cp -a $_pkg/usr/lib/$PACKAGE $fs/usr/lib
    1.47  	cp -a $_pkg/usr/bin $fs/usr
    1.48 -	# adding mime-type (x-html)
    1.49 -	cp $stuff/mimeTypes.rdf $fs/usr/lib/$PACKAGE/defaults/profile
    1.50 +	# mcd
    1.51 +	cp $stuff/autoconf.js $fs/usr/lib/$PACKAGE/defaults/pref
    1.52 +	cp $stuff/thunderbird.cfg $fs/usr/lib/$PACKAGE
    1.53 +	# mimetypes
    1.54 +
    1.55  }
    1.56 -
    1.57 -
    1.58 -
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/thunderbird/stuff/autoconf.js	Thu Apr 19 21:04:35 2012 +0200
     2.3 @@ -0,0 +1,5 @@
     2.4 +// SliTaz 2012
     2.5 +//
     2.6 +
     2.7 +pref("general.config.obscure_value", 0); // for MCD .cfg files
     2.8 +pref('general.config.filename', 'thunderbird.cfg'); // for MCD .cfg files
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/thunderbird/stuff/thunderbird.cfg	Thu Apr 19 21:04:35 2012 +0200
     3.3 @@ -0,0 +1,8 @@
     3.4 +// SliTaz 2012
     3.5 +//
     3.6 +try {
     3.7 +	pref("network.protocol-handler.app.http", "/usr/bin/midori");
     3.8 +	pref("network.protocol-handler.app.https", "/usr/bin/midori");
     3.9 +} catch(e) {
    3.10 +  displayError("pref", e);
    3.11 +}
     4.1 --- a/thunderbird/stuff/thunderbird.mozconfig.conf	Thu Apr 19 21:02:13 2012 +0200
     4.2 +++ b/thunderbird/stuff/thunderbird.mozconfig.conf	Thu Apr 19 21:04:35 2012 +0200
     4.3 @@ -66,7 +66,7 @@
     4.4  
     4.5  # The pthreads option is only used when building nspr
     4.6  # Uncomment this if you build the included nspr.
     4.7 -#ac_add_options --with-pthreads
     4.8 +ac_add_options --with-pthreads
     4.9  
    4.10  # zlib is included in LFS. Do not comment this line.
    4.11  ac_add_options --with-system-zlib
    4.12 @@ -78,6 +78,7 @@
    4.13  ac_add_options --disable-accessibility
    4.14  
    4.15  # Uncomment this if you did not build curl.
    4.16 +# Use --disable-crashreporter to disable the crash reporter.
    4.17  ac_add_options --disable-crashreporter
    4.18  
    4.19  # Comment this if you have built dbus-glib.
    4.20 @@ -108,7 +109,7 @@
    4.21  # Thunderbird name embedded in them. Due to license restrictions, you
    4.22  # may not distribute binaries created using this option.  It also
    4.23  # means you get a popup EULA when you first run thunderbird.
    4.24 -#ac_add_options --disable-official-branding
    4.25 +ac_add_options --enable-official-branding
    4.26  
    4.27  # This option is used to enable source tree included LDAP support in
    4.28  # the Firefox binaries.  This used to be required for mozab support in
    4.29 @@ -121,7 +122,7 @@
    4.30  # this option if you may have a need to retain the debugging symbols
    4.31  # in the installed binaries (the resulting binaries will be about 7MB
    4.32  # bigger).
    4.33 -ac_add_options --enable-strip
    4.34 +#ac_add_options --enable-strip
    4.35  
    4.36  # Uncomment this option if you desire support for dual-monitor
    4.37  # display using the X-Window Xinerama libraries.
    4.38 @@ -137,10 +138,6 @@
    4.39  #ac_add_options --with-system-libxul
    4.40  #ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner-devel-1.9.2.8
    4.41  
    4.42 -# curl is required for the crash reporter.  
    4.43 -# Use --disable-crashreporter to disable the crash reporter.
    4.44 -ac_add_options --disable-crashreporter
    4.45 -
    4.46  # disable webm video format
    4.47  ac_add_options --disable-webm
    4.48  
    4.49 @@ -163,7 +160,7 @@
    4.50  ac_add_options --disable-feeds
    4.51  
    4.52  # disable mozStorage module and related components
    4.53 -ac_add_options --enable-storage
    4.54 +#ac_add_options --disable-storage
    4.55  
    4.56  # disable logging facilities
    4.57  ac_add_options --disable-logging
    4.58 @@ -172,5 +169,4 @@
    4.59  ac_add_options --with-system-libevent
    4.60  
    4.61  # disable java
    4.62 -ac_add_options --disable-javaxpcom
    4.63 -
    4.64 +#ac_add_options --disable-javaxpcom