# HG changeset patch # User Christopher Rogers # Date 1330197399 18000 # Node ID 74f603c507d4f49ea548b81dac570e6194f7d419 # Parent 74f549cde3ebfe07ef4d900a97963fd30d96ab36 Up: thunderbird to 10.0.2. diff -r 74f549cde3eb -r 74f603c507d4 thunderbird-langpack-de/receipt --- a/thunderbird-langpack-de/receipt Sat Feb 25 14:15:40 2012 -0500 +++ b/thunderbird-langpack-de/receipt Sat Feb 25 14:16:39 2012 -0500 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="thunderbird-langpack-de" -VERSION="3.1.10" +VERSION="10.0.2" CATEGORY="network" SHORT_DESC="locale for mozilla thunderbird" MAINTAINER="domcox@slitaz.org" @@ -15,7 +15,7 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR" + EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR" mkdir -p $EXTDIR cp -a $src/* $EXTDIR } diff -r 74f549cde3eb -r 74f603c507d4 thunderbird-langpack-en_GB/receipt --- a/thunderbird-langpack-en_GB/receipt Sat Feb 25 14:15:40 2012 -0500 +++ b/thunderbird-langpack-en_GB/receipt Sat Feb 25 14:16:39 2012 -0500 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="thunderbird-langpack-en_GB" -VERSION="3.1.10" +VERSION="10.0.2" CATEGORY="network" SHORT_DESC="locale for mozilla thunderbird" MAINTAINER="domcox@slitaz.org" @@ -15,7 +15,7 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR" + EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR" mkdir -p $EXTDIR cp -a $src/* $EXTDIR } \ No newline at end of file diff -r 74f549cde3eb -r 74f603c507d4 thunderbird-langpack-es_ES/receipt --- a/thunderbird-langpack-es_ES/receipt Sat Feb 25 14:15:40 2012 -0500 +++ b/thunderbird-langpack-es_ES/receipt Sat Feb 25 14:16:39 2012 -0500 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="thunderbird-langpack-es_ES" -VERSION="3.1.10" +VERSION="10.0.2" CATEGORY="network" SHORT_DESC="locale for mozilla thunderbird" MAINTAINER="domcox@slitaz.org" @@ -15,7 +15,7 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR" + EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR" mkdir -p $EXTDIR cp -a $src/* $EXTDIR } diff -r 74f549cde3eb -r 74f603c507d4 thunderbird-langpack-fr/receipt --- a/thunderbird-langpack-fr/receipt Sat Feb 25 14:15:40 2012 -0500 +++ b/thunderbird-langpack-fr/receipt Sat Feb 25 14:16:39 2012 -0500 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="thunderbird-langpack-fr" -VERSION="3.1.10" +VERSION="10.0.2" CATEGORY="network" SHORT_DESC="locale for mozilla thunderbird" MAINTAINER="domcox@slitaz.org" @@ -15,7 +15,7 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR" + EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR" mkdir -p $EXTDIR cp -a $src/* $EXTDIR } diff -r 74f549cde3eb -r 74f603c507d4 thunderbird-langpack-pt_BR/receipt --- a/thunderbird-langpack-pt_BR/receipt Sat Feb 25 14:15:40 2012 -0500 +++ b/thunderbird-langpack-pt_BR/receipt Sat Feb 25 14:16:39 2012 -0500 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="thunderbird-langpack-pt_BR" -VERSION="3.1.10" +VERSION="10.0.2" CATEGORY="network" SHORT_DESC="locale for mozilla thunderbird" MAINTAINER="domcox@slitaz.org" @@ -15,7 +15,7 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR" + EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR" mkdir -p $EXTDIR cp -a $src/* $EXTDIR } diff -r 74f549cde3eb -r 74f603c507d4 thunderbird-langpack-pt_PT/receipt --- a/thunderbird-langpack-pt_PT/receipt Sat Feb 25 14:15:40 2012 -0500 +++ b/thunderbird-langpack-pt_PT/receipt Sat Feb 25 14:16:39 2012 -0500 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="thunderbird-langpack-pt_PT" -VERSION="3.1.10" +VERSION="10.0.2" CATEGORY="network" SHORT_DESC="locale for mozilla thunderbird" MAINTAINER="domcox@slitaz.org" @@ -15,7 +15,7 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR" + EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR" mkdir -p $EXTDIR cp -a $src/* $EXTDIR } diff -r 74f549cde3eb -r 74f603c507d4 thunderbird-langpack-ru/receipt --- a/thunderbird-langpack-ru/receipt Sat Feb 25 14:15:40 2012 -0500 +++ b/thunderbird-langpack-ru/receipt Sat Feb 25 14:16:39 2012 -0500 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="thunderbird-langpack-ru" -VERSION="3.1.10" +VERSION="10.0.2" CATEGORY="network" SHORT_DESC="locale for mozilla thunderbird" MAINTAINER="domcox@slitaz.org" @@ -15,7 +15,7 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTDIR="$fs/usr/lib/thunderbird-$VERSION/extensions/$LANG_DIR" + EXTDIR="$fs/usr/lib/thunderbird/extensions/$LANG_DIR" mkdir -p $EXTDIR cp -a $src/* $EXTDIR } diff -r 74f549cde3eb -r 74f603c507d4 thunderbird/receipt --- a/thunderbird/receipt Sat Feb 25 14:15:40 2012 -0500 +++ b/thunderbird/receipt Sat Feb 25 14:16:39 2012 -0500 @@ -1,12 +1,16 @@ # SliTaz package receipt. PACKAGE="thunderbird" -VERSION="3.1.10" +VERSION="10.0.2" CATEGORY="network" SHORT_DESC="Mozilla's Thunderbird email application." MAINTAINER="domcox@slitaz.org" -DEPENDS="alsa-lib gtk+ dbus dbus-glib glib jpeg nss sqlite xorg-libX11 xorg-libXdamage xorg-libXt" -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" +DEPENDS="alsa-lib gtk+ dbus dbus-glib glib jpeg nss sqlite xorg-libX11 xorg-libXdamage \ +xorg-libXt libnotify libevent libvpx" +BUILD_DEPENDS="alsa-lib-dev bzip2 dbus-dev dbus-glib-dev freetype-dev fontconfig-dev \ +gtk+-dev libIDL libnotify-dev libvpx-dev nss-dev perl python-dev sqlite-dev \ +tar wireless_tools-dev libevent-dev xorg-dev xorg-libXt-dev zip \ +wireless_tools-dev yasm mesa-dev" TARBALL="$PACKAGE-$VERSION.source.tar.bz2" WEB_SITE="http://www.mozillamessaging.com/" WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$TARBALL" @@ -22,48 +26,35 @@ # significantly decrease build time. # - At least 2.5 GB of disk space. - # Move the mozilla source tree to $PACKAGE-$VERSION to keep variables - # and to have a nice clean. - cd $WOK/$PACKAGE - echo -n "Checking source" - [ -d comm-* ] && mv comm-* $PACKAGE-$VERSION 2>/dev/null - [ -d $PACKAGE-$VERSION ] || (echo "src not found, exiting" ; return 1) - status # add config - cp -a stuff/thunderbird.mozconfig.conf $src/.mozconfig + cp -a $stuff/thunderbird.mozconfig.conf $src/.mozconfig # languages echo "# languages" >> $src/.mozconfig - echo "mk_ad_options MOZ_CO_LOCALES=\"$LANG\"" >> $src/.mozconfig + echo "mk_add_options MOZ_CO_LOCALES=\"$LANG\"" >> $src/.mozconfig # for a quick build echo "# build quicker" >> $src/.mozconfig echo 'mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS"' >> $src/.mozconfig # build cd $src + patch -Np1 -i $stuff/thunderbird-3.0-lang.patch + patch -Np1 -i $stuff/thunderbird-install-dir.patch ./configure $CONFIGURE_ARGS && make && - make DESTDIR=$PWD/_pkg install + make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr + mkdir -p $fs/usr/lib # program - cp -a $_pkg/usr/lib $fs/usr + cp -a $_pkg/usr/lib/$PACKAGE $fs/usr/lib cp -a $_pkg/usr/bin $fs/usr # adding mime-type (x-html) - cp stuff/mimeTypes.rdf $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile + cp $stuff/mimeTypes.rdf $fs/usr/lib/$PACKAGE/defaults/profile # icons and desktop file mkdir -p $fs/usr/share/applications - cp -a stuff/thunderbird.desktop $fs/usr/share/applications + cp -a $stuff/thunderbird.desktop $fs/usr/share/applications mkdir -p $fs/usr/share/pixmaps - cp -a stuff/thunderbird-icon.png $fs/usr/share/pixmaps + cp -a $stuff/thunderbird-icon.png $fs/usr/share/pixmaps } - -clean_wok() -{ - rm -rf $WOK/$PACKAGE-*/taz - rm -rf $WOK/$PACKAGE-*/process.log -} - - diff -r 74f549cde3eb -r 74f603c507d4 thunderbird/stuff/thunderbird-3.0-lang.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thunderbird/stuff/thunderbird-3.0-lang.patch Sat Feb 25 14:16:39 2012 -0500 @@ -0,0 +1,11 @@ +--- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200 ++++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200 +@@ -890,7 +890,7 @@ + pref("intl.charset.detector", "chrome://global/locale/intl.properties"); + pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); + pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); +-pref("intl.locale.matchOS", false); ++pref("intl.locale.matchOS", true); + // fallback charset list for Unicode conversion (converting from Unicode) + // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) + // for ISO-8859-1 diff -r 74f549cde3eb -r 74f603c507d4 thunderbird/stuff/thunderbird-install-dir.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thunderbird/stuff/thunderbird-install-dir.patch Sat Feb 25 14:16:39 2012 -0500 @@ -0,0 +1,42 @@ +diff -Nur comm-beta.orig/config/autoconf.mk.in comm-beta/config/autoconf.mk.in +--- comm-beta.orig/config/autoconf.mk.in 2011-11-06 14:39:51.064983780 +0000 ++++ comm-beta/config/autoconf.mk.in 2011-11-06 14:42:57.216735333 +0000 +@@ -65,8 +65,8 @@ + mandir = @mandir@ + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + MOZDEPTH = $(DEPTH)/mozilla + DIST = $(MOZDEPTH)/dist +diff -Nur comm-beta.orig/mozilla/config/autoconf.mk.in comm-beta/mozilla/config/autoconf.mk.in +--- comm-beta.orig/mozilla/config/autoconf.mk.in 2011-11-06 14:39:41.771562967 +0000 ++++ comm-beta/mozilla/config/autoconf.mk.in 2011-11-06 14:44:18.404165515 +0000 +@@ -68,8 +68,8 @@ + mandir = @mandir@ + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@ +diff -Nur comm-beta.orig/mozilla/js/src/config/autoconf.mk.in comm-beta/mozilla/js/src/config/autoconf.mk.in +--- comm-beta.orig/mozilla/js/src/config/autoconf.mk.in 2011-11-06 14:39:48.014955070 +0000 ++++ comm-beta/mozilla/js/src/config/autoconf.mk.in 2011-11-06 14:44:32.977635875 +0000 +@@ -61,8 +61,8 @@ + datadir = @datadir@ + mandir = @mandir@ + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + TOP_DIST = @TOP_DIST@ + ifneq (,$(filter /%,$(TOP_DIST))) diff -r 74f549cde3eb -r 74f603c507d4 thunderbird/stuff/thunderbird.mozconfig.conf --- a/thunderbird/stuff/thunderbird.mozconfig.conf Sat Feb 25 14:15:40 2012 -0500 +++ b/thunderbird/stuff/thunderbird.mozconfig.conf Sat Feb 25 14:16:39 2012 -0500 @@ -29,6 +29,7 @@ # installed in a different prefix, modify the line below to fit # your needs (the config will always be written to /etc/gre.d) ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib # apply a minimal level of optimization (-O) ac_add_options --enable-optimize @@ -62,7 +63,7 @@ ac_add_options --with-system-nss # Comment this if you have not built png with the apng patch. -# ac_add_options --with-system-png +#ac_add_options --with-system-png # The pthreads option is only used when building nspr # Uncomment this if you build the included nspr. @@ -93,7 +94,8 @@ # Enable the build of static internal libs (this is currently required, until # Thunderbird 3.1, DO NOT COMMENT, see note below about XulRunner). -ac_add_options --enable-static +#ac_add_options --enable-static +ac_add_options --enable-libxul # This option is added so that test libraries and programs are not # built. These would only be required for debugging purposes. @@ -135,6 +137,12 @@ #ac_add_options --with-system-libxul #ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner-devel-1.9.2.8 +# Use system libevent +ac_add_options --with-system-libevent + +# Use system libvpx +ac_add_options --with-system-libvpx + # curl is required for the crash reporter. # Use --disable-crashreporter to disable the crash reporter. ac_add_options --disable-crashreporter