wok-4.x rev 11820

Up: thunderbird to 10.0.2.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat Feb 25 14:16:39 2012 -0500 (2012-02-25)
parents 74f549cde3eb
children 4458dff0ca4c
files thunderbird-langpack-de/receipt thunderbird-langpack-en_GB/receipt thunderbird-langpack-es_ES/receipt thunderbird-langpack-fr/receipt thunderbird-langpack-pt_BR/receipt thunderbird-langpack-pt_PT/receipt thunderbird-langpack-ru/receipt thunderbird/receipt thunderbird/stuff/thunderbird-3.0-lang.patch thunderbird/stuff/thunderbird-install-dir.patch thunderbird/stuff/thunderbird.mozconfig.conf
line diff
     1.1 --- a/thunderbird-langpack-de/receipt	Sat Feb 25 14:15:40 2012 -0500
     1.2 +++ b/thunderbird-langpack-de/receipt	Sat Feb 25 14:16:39 2012 -0500
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="thunderbird-langpack-de"
     1.7 -VERSION="3.1.10"
     1.8 +VERSION="10.0.2"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="locale for mozilla thunderbird"
    1.11  MAINTAINER="domcox@slitaz.org"
    1.12 @@ -15,7 +15,7 @@
    1.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.14  genpkg_rules()
    1.15  {
    1.16 -	EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR"
    1.17 +	EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR"
    1.18  	mkdir -p $EXTDIR
    1.19  	cp -a $src/* $EXTDIR
    1.20  }
     2.1 --- a/thunderbird-langpack-en_GB/receipt	Sat Feb 25 14:15:40 2012 -0500
     2.2 +++ b/thunderbird-langpack-en_GB/receipt	Sat Feb 25 14:16:39 2012 -0500
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="thunderbird-langpack-en_GB"
     2.7 -VERSION="3.1.10"
     2.8 +VERSION="10.0.2"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="locale for mozilla thunderbird"
    2.11  MAINTAINER="domcox@slitaz.org"
    2.12 @@ -15,7 +15,7 @@
    2.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.14  genpkg_rules()
    2.15  {
    2.16 -	EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR"
    2.17 +	EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR"
    2.18  	mkdir -p $EXTDIR
    2.19  	cp -a $src/* $EXTDIR
    2.20  }
    2.21 \ No newline at end of file
     3.1 --- a/thunderbird-langpack-es_ES/receipt	Sat Feb 25 14:15:40 2012 -0500
     3.2 +++ b/thunderbird-langpack-es_ES/receipt	Sat Feb 25 14:16:39 2012 -0500
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="thunderbird-langpack-es_ES"
     3.7 -VERSION="3.1.10"
     3.8 +VERSION="10.0.2"
     3.9  CATEGORY="network"
    3.10  SHORT_DESC="locale for mozilla thunderbird"
    3.11  MAINTAINER="domcox@slitaz.org"
    3.12 @@ -15,7 +15,7 @@
    3.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.14  genpkg_rules()
    3.15  {
    3.16 -	EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR"
    3.17 +	EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR"
    3.18  	mkdir -p $EXTDIR
    3.19  	cp -a $src/* $EXTDIR
    3.20  }
     4.1 --- a/thunderbird-langpack-fr/receipt	Sat Feb 25 14:15:40 2012 -0500
     4.2 +++ b/thunderbird-langpack-fr/receipt	Sat Feb 25 14:16:39 2012 -0500
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="thunderbird-langpack-fr"
     4.7 -VERSION="3.1.10"
     4.8 +VERSION="10.0.2"
     4.9  CATEGORY="network"
    4.10  SHORT_DESC="locale for mozilla thunderbird"
    4.11  MAINTAINER="domcox@slitaz.org"
    4.12 @@ -15,7 +15,7 @@
    4.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.14  genpkg_rules()
    4.15  {
    4.16 -	EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR"
    4.17 +	EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR"
    4.18  	mkdir -p $EXTDIR
    4.19  	cp -a $src/* $EXTDIR
    4.20  }
     5.1 --- a/thunderbird-langpack-pt_BR/receipt	Sat Feb 25 14:15:40 2012 -0500
     5.2 +++ b/thunderbird-langpack-pt_BR/receipt	Sat Feb 25 14:16:39 2012 -0500
     5.3 @@ -1,7 +1,7 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="thunderbird-langpack-pt_BR"
     5.7 -VERSION="3.1.10"
     5.8 +VERSION="10.0.2"
     5.9  CATEGORY="network"
    5.10  SHORT_DESC="locale for mozilla thunderbird"
    5.11  MAINTAINER="domcox@slitaz.org"
    5.12 @@ -15,7 +15,7 @@
    5.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.14  genpkg_rules()
    5.15  {
    5.16 -	EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR"
    5.17 +	EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR"
    5.18  	mkdir -p $EXTDIR
    5.19  	cp -a $src/* $EXTDIR
    5.20  }
     6.1 --- a/thunderbird-langpack-pt_PT/receipt	Sat Feb 25 14:15:40 2012 -0500
     6.2 +++ b/thunderbird-langpack-pt_PT/receipt	Sat Feb 25 14:16:39 2012 -0500
     6.3 @@ -1,7 +1,7 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="thunderbird-langpack-pt_PT"
     6.7 -VERSION="3.1.10"
     6.8 +VERSION="10.0.2"
     6.9  CATEGORY="network"
    6.10  SHORT_DESC="locale for mozilla thunderbird"
    6.11  MAINTAINER="domcox@slitaz.org"
    6.12 @@ -15,7 +15,7 @@
    6.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    6.14  genpkg_rules()
    6.15  {
    6.16 -	EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR"
    6.17 +	EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR"
    6.18  	mkdir -p $EXTDIR
    6.19  	cp -a $src/* $EXTDIR
    6.20  }
     7.1 --- a/thunderbird-langpack-ru/receipt	Sat Feb 25 14:15:40 2012 -0500
     7.2 +++ b/thunderbird-langpack-ru/receipt	Sat Feb 25 14:16:39 2012 -0500
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="thunderbird-langpack-ru"
     7.7 -VERSION="3.1.10"
     7.8 +VERSION="10.0.2"
     7.9  CATEGORY="network"
    7.10  SHORT_DESC="locale for mozilla thunderbird"
    7.11  MAINTAINER="domcox@slitaz.org"
    7.12 @@ -15,7 +15,7 @@
    7.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.14  genpkg_rules()
    7.15  {
    7.16 -	EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR"
    7.17 +	EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR"
    7.18  	mkdir -p $EXTDIR
    7.19  	cp -a $src/* $EXTDIR
    7.20  }
     8.1 --- a/thunderbird/receipt	Sat Feb 25 14:15:40 2012 -0500
     8.2 +++ b/thunderbird/receipt	Sat Feb 25 14:16:39 2012 -0500
     8.3 @@ -1,12 +1,16 @@
     8.4  # SliTaz package receipt.
     8.5  
     8.6  PACKAGE="thunderbird"
     8.7 -VERSION="3.1.10"
     8.8 +VERSION="10.0.2"
     8.9  CATEGORY="network"
    8.10  SHORT_DESC="Mozilla's Thunderbird email application."
    8.11  MAINTAINER="domcox@slitaz.org"
    8.12 -DEPENDS="alsa-lib gtk+ dbus dbus-glib glib jpeg nss sqlite xorg-libX11 xorg-libXdamage xorg-libXt"
    8.13 -BUILD_DEPENDS="alsa-lib-dev bzip2 dbus-dev dbus-glib-dev freetype fontconfig gtk+-dev libIDL libnotify-dev make nss-dev perl pkg-config python sqlite-dev tar wireless_tools-dev xorg-dev xorg-libXt-dev zip"
    8.14 +DEPENDS="alsa-lib gtk+ dbus dbus-glib glib jpeg nss sqlite xorg-libX11 xorg-libXdamage \
    8.15 +xorg-libXt libnotify libevent libvpx"
    8.16 +BUILD_DEPENDS="alsa-lib-dev bzip2 dbus-dev dbus-glib-dev freetype-dev fontconfig-dev \
    8.17 +gtk+-dev libIDL libnotify-dev libvpx-dev nss-dev perl python-dev sqlite-dev \
    8.18 +tar wireless_tools-dev libevent-dev xorg-dev xorg-libXt-dev zip \
    8.19 +wireless_tools-dev yasm mesa-dev"
    8.20  TARBALL="$PACKAGE-$VERSION.source.tar.bz2"
    8.21  WEB_SITE="http://www.mozillamessaging.com/"
    8.22  WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$TARBALL"
    8.23 @@ -22,48 +26,35 @@
    8.24  	#   significantly decrease build time. 
    8.25  	# - At least 2.5 GB of disk space.
    8.26  
    8.27 -    # Move the mozilla source tree to $PACKAGE-$VERSION to keep variables
    8.28 -    # and to have a nice clean.
    8.29 -	cd $WOK/$PACKAGE
    8.30 -	echo -n "Checking source"
    8.31 -    [ -d comm-* ] && mv comm-* $PACKAGE-$VERSION 2>/dev/null
    8.32 -	[ -d $PACKAGE-$VERSION ] || (echo "src not found, exiting" ; return 1)
    8.33 -	status
    8.34  	# add config
    8.35 -    cp -a stuff/thunderbird.mozconfig.conf $src/.mozconfig
    8.36 +	cp -a $stuff/thunderbird.mozconfig.conf $src/.mozconfig
    8.37  	# languages
    8.38  	echo "# languages" >> $src/.mozconfig
    8.39 -	echo "mk_ad_options MOZ_CO_LOCALES=\"$LANG\"" >> $src/.mozconfig
    8.40 +	echo "mk_add_options MOZ_CO_LOCALES=\"$LANG\"" >> $src/.mozconfig
    8.41  	# for a quick build
    8.42  	echo "# build quicker" >> $src/.mozconfig
    8.43  	echo 'mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS"' >> $src/.mozconfig
    8.44  	# build
    8.45  	cd $src
    8.46 +	patch -Np1 -i $stuff/thunderbird-3.0-lang.patch
    8.47 +	patch -Np1 -i $stuff/thunderbird-install-dir.patch
    8.48  	./configure $CONFIGURE_ARGS &&
    8.49  	make &&
    8.50 -	make DESTDIR=$PWD/_pkg install
    8.51 +	make DESTDIR=$DESTDIR install
    8.52  }
    8.53  
    8.54  # Rules to gen a SliTaz package suitable for Tazpkg.
    8.55  genpkg_rules()
    8.56  {
    8.57 -	mkdir -p $fs/usr
    8.58 +	mkdir -p $fs/usr/lib
    8.59  	# program
    8.60 -	cp -a $_pkg/usr/lib $fs/usr
    8.61 +	cp -a $_pkg/usr/lib/$PACKAGE $fs/usr/lib
    8.62  	cp -a $_pkg/usr/bin $fs/usr
    8.63  	# adding mime-type (x-html)
    8.64 -	cp stuff/mimeTypes.rdf $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile
    8.65 +	cp $stuff/mimeTypes.rdf $fs/usr/lib/$PACKAGE/defaults/profile
    8.66  	# icons and desktop file
    8.67  	mkdir -p $fs/usr/share/applications
    8.68 -	cp -a stuff/thunderbird.desktop $fs/usr/share/applications
    8.69 +	cp -a $stuff/thunderbird.desktop $fs/usr/share/applications
    8.70  	mkdir -p $fs/usr/share/pixmaps
    8.71 -	cp -a stuff/thunderbird-icon.png $fs/usr/share/pixmaps
    8.72 +	cp -a $stuff/thunderbird-icon.png $fs/usr/share/pixmaps
    8.73  }
    8.74 -
    8.75 -clean_wok()
    8.76 -{
    8.77 -	rm -rf $WOK/$PACKAGE-*/taz
    8.78 -	rm -rf $WOK/$PACKAGE-*/process.log
    8.79 -}
    8.80 -
    8.81 -
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/thunderbird/stuff/thunderbird-3.0-lang.patch	Sat Feb 25 14:16:39 2012 -0500
     9.3 @@ -0,0 +1,11 @@
     9.4 +--- comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-10-11 02:12:44.000000000 +0200
     9.5 ++++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-09-16 02:56:45.000000000 +0200
     9.6 +@@ -890,7 +890,7 @@
     9.7 + pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
     9.8 + pref("intl.charset.default",                "chrome://global-platform/locale/intl.properties");
     9.9 + pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
    9.10 +-pref("intl.locale.matchOS",                 false);
    9.11 ++pref("intl.locale.matchOS",                 true);
    9.12 + // fallback charset list for Unicode conversion (converting from Unicode)
    9.13 + // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
    9.14 + // for ISO-8859-1
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/thunderbird/stuff/thunderbird-install-dir.patch	Sat Feb 25 14:16:39 2012 -0500
    10.3 @@ -0,0 +1,42 @@
    10.4 +diff -Nur comm-beta.orig/config/autoconf.mk.in comm-beta/config/autoconf.mk.in
    10.5 +--- comm-beta.orig/config/autoconf.mk.in	2011-11-06 14:39:51.064983780 +0000
    10.6 ++++ comm-beta/config/autoconf.mk.in	2011-11-06 14:42:57.216735333 +0000
    10.7 +@@ -65,8 +65,8 @@
    10.8 + mandir		= @mandir@
    10.9 + idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
   10.10 +
   10.11 +-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
   10.12 +-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
   10.13 ++installdir	= $(libdir)/$(MOZ_APP_NAME)
   10.14 ++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
   10.15 +
   10.16 + MOZDEPTH	= $(DEPTH)/mozilla
   10.17 + DIST		= $(MOZDEPTH)/dist
   10.18 +diff -Nur comm-beta.orig/mozilla/config/autoconf.mk.in comm-beta/mozilla/config/autoconf.mk.in
   10.19 +--- comm-beta.orig/mozilla/config/autoconf.mk.in	2011-11-06 14:39:41.771562967 +0000
   10.20 ++++ comm-beta/mozilla/config/autoconf.mk.in	2011-11-06 14:44:18.404165515 +0000
   10.21 +@@ -68,8 +68,8 @@
   10.22 + mandir		= @mandir@
   10.23 + idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
   10.24 +
   10.25 +-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
   10.26 +-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
   10.27 ++installdir	= $(libdir)/$(MOZ_APP_NAME)
   10.28 ++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
   10.29 +
   10.30 + DIST		= $(DEPTH)/dist
   10.31 + LIBXUL_SDK      = @LIBXUL_SDK@
   10.32 +diff -Nur comm-beta.orig/mozilla/js/src/config/autoconf.mk.in comm-beta/mozilla/js/src/config/autoconf.mk.in
   10.33 +--- comm-beta.orig/mozilla/js/src/config/autoconf.mk.in	2011-11-06 14:39:48.014955070 +0000
   10.34 ++++ comm-beta/mozilla/js/src/config/autoconf.mk.in	2011-11-06 14:44:32.977635875 +0000
   10.35 +@@ -61,8 +61,8 @@
   10.36 + datadir		= @datadir@
   10.37 + mandir		= @mandir@
   10.38 +
   10.39 +-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
   10.40 +-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
   10.41 ++installdir	= $(libdir)/$(MOZ_APP_NAME)
   10.42 ++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
   10.43 +
   10.44 + TOP_DIST	= @TOP_DIST@
   10.45 + ifneq (,$(filter /%,$(TOP_DIST)))
    11.1 --- a/thunderbird/stuff/thunderbird.mozconfig.conf	Sat Feb 25 14:15:40 2012 -0500
    11.2 +++ b/thunderbird/stuff/thunderbird.mozconfig.conf	Sat Feb 25 14:16:39 2012 -0500
    11.3 @@ -29,6 +29,7 @@
    11.4  # installed in a different prefix, modify the line below to fit
    11.5  # your needs (the config will always be written to /etc/gre.d)
    11.6  ac_add_options --prefix=/usr
    11.7 +ac_add_options --libdir=/usr/lib
    11.8  
    11.9  # apply a minimal level of optimization (-O)
   11.10  ac_add_options --enable-optimize
   11.11 @@ -62,7 +63,7 @@
   11.12  ac_add_options --with-system-nss
   11.13  
   11.14  # Comment this if you have not built png with the apng patch.
   11.15 -# ac_add_options --with-system-png
   11.16 +#ac_add_options --with-system-png
   11.17  
   11.18  # The pthreads option is only used when building nspr
   11.19  # Uncomment this if you build the included nspr.
   11.20 @@ -93,7 +94,8 @@
   11.21  
   11.22  # Enable the build of static internal libs (this is currently required, until
   11.23  # Thunderbird 3.1, DO NOT COMMENT, see note below about XulRunner).
   11.24 -ac_add_options --enable-static
   11.25 +#ac_add_options --enable-static
   11.26 +ac_add_options --enable-libxul
   11.27  
   11.28  # This option is added so that test libraries and programs are not
   11.29  # built. These would only be required for debugging purposes.
   11.30 @@ -135,6 +137,12 @@
   11.31  #ac_add_options --with-system-libxul
   11.32  #ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner-devel-1.9.2.8
   11.33  
   11.34 +# Use system libevent
   11.35 +ac_add_options --with-system-libevent
   11.36 +
   11.37 +# Use system libvpx
   11.38 +ac_add_options --with-system-libvpx
   11.39 +
   11.40  # curl is required for the crash reporter.  
   11.41  # Use --disable-crashreporter to disable the crash reporter.
   11.42  ac_add_options --disable-crashreporter