Date: Tuesday, August 16, 2011 @ 13:19:40 Author: ibiru Revision: 135625
archrelease: copy trunk to extra-i686 Added: thunderbird/repos/extra-i686/PKGBUILD (from rev 135623, thunderbird/trunk/PKGBUILD) thunderbird/repos/extra-i686/mozconfig (from rev 135624, thunderbird/trunk/mozconfig) thunderbird/repos/extra-i686/thunderbird-3.0-lang.patch (from rev 135624, thunderbird/trunk/thunderbird-3.0-lang.patch) thunderbird/repos/extra-i686/thunderbird.desktop (from rev 135624, thunderbird/trunk/thunderbird.desktop) thunderbird/repos/extra-i686/thunderbird.install (from rev 135624, thunderbird/trunk/thunderbird.install) Deleted: thunderbird/repos/extra-i686/PKGBUILD thunderbird/repos/extra-i686/mozconfig thunderbird/repos/extra-i686/thunderbird-3.0-lang.patch thunderbird/repos/extra-i686/thunderbird-appversion.patch thunderbird/repos/extra-i686/thunderbird.desktop thunderbird/repos/extra-i686/thunderbird.install ------------------------------+ PKGBUILD | 116 +++++++++++++++++++---------------------- mozconfig | 88 +++++++++++++++---------------- thunderbird-3.0-lang.patch | 22 +++---- thunderbird-appversion.patch | 12 ---- thunderbird.desktop | 26 ++++----- thunderbird.install | 24 ++++---- 6 files changed, 136 insertions(+), 152 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2011-08-16 17:18:57 UTC (rev 135624) +++ PKGBUILD 2011-08-16 17:19:40 UTC (rev 135625) @@ -1,60 +0,0 @@ -# $Id$ -# Contributor: Alexander Baldeck <alexan...@archlinux.org> -# Contributor: Dale Blount <d...@archlinux.org> -# Contributor: Anders Bostrom <anders.bost...@home.se> -pkgname=thunderbird -pkgver=5.0 -pkgrel=1 -pkgdesc="Standalone Mail/News reader" -arch=('i686' 'x86_64') -license=('MPL' 'GPL') -url="http://www.mozilla.org/projects/thunderbird" -depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3>=3.7.4' 'desktop-file-utils' 'libnotify' 'libevent') -makedepends=('zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'gconf' 'yasm' 'mesa') -optdepends=('libcanberra: for sound support') -options=(!buildflags) -install=thunderbird.install -source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2 - mozconfig - thunderbird.desktop - thunderbird-3.0-lang.patch - thunderbird-appversion.patch) -md5sums=('0bbacea54b4b8fc4ff20e73b3278c1ba' - 'b8fd97ab4bfb2e4538b1e1340d70f915' - 'af3e5b344d2edf1c7d61bb0a5a96de9a' - '25b6fe16ac24cd5c852213e5c1adb272' - 'be5f6aea50eeefae234bfc0f30e2f0ec') - -build() { - cd "${srcdir}/comm-miramar" - patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch" - patch -Np1 -i "${srcdir}/thunderbird-appversion.patch" - - cp "${srcdir}/mozconfig" .mozconfig - - export CXXFLAGS="-fpermissive" - export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-5.0 -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed" - export PYTHON="/usr/bin/python2" - - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" -} - -package() { - cd "${srcdir}/comm-miramar" - make -j1 -f client.mk DESTDIR="${pkgdir}" install - - for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \ - "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png" - done - - install -Dm644 "${srcdir}/thunderbird.desktop" \ - "${pkgdir}/usr/share/applications/thunderbird.desktop" - - rm -rf "${pkgdir}/usr/lib/thunderbird-5.0/dictionaries" - ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/thunderbird-5.0/dictionaries" - - # We don't want the development stuff - rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel-$pkgver,share/idl} -} - Copied: thunderbird/repos/extra-i686/PKGBUILD (from rev 135623, thunderbird/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2011-08-16 17:19:40 UTC (rev 135625) @@ -0,0 +1,56 @@ +# $Id$ +# Contributor: Alexander Baldeck <alexan...@archlinux.org> +# Contributor: Dale Blount <d...@archlinux.org> +# Contributor: Anders Bostrom <anders.bost...@home.se> +pkgname=thunderbird +pkgver=6.0 +pkgrel=1 +pkgdesc="Standalone Mail/News reader" +arch=('i686' 'x86_64') +license=('MPL' 'GPL') +url="http://www.mozilla.org/thunderbird/" +depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3>=3.7.4' 'desktop-file-utils' 'libnotify' 'libevent') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'gconf' 'yasm' 'mesa') +optdepends=('libcanberra: for sound support') +options=(!buildflags) +install=thunderbird.install +source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2 + mozconfig + thunderbird.desktop + thunderbird-3.0-lang.patch) +md5sums=('9ac741d238e95790cdeb5222e9b23ae8' + 'b8fd97ab4bfb2e4538b1e1340d70f915' + 'af3e5b344d2edf1c7d61bb0a5a96de9a' + '25b6fe16ac24cd5c852213e5c1adb272') + +build() { + cd "${srcdir}/comm-release" + patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch" + + cp "${srcdir}/mozconfig" .mozconfig + + export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-5.0 -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd "${srcdir}/comm-release" + make -j1 -f client.mk DESTDIR="${pkgdir}" install + + for i in 16x16 22x22 24x24 32x32 48x48 256x256; do + install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \ + "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png" + done + + install -Dm644 "${srcdir}/thunderbird.desktop" \ + "${pkgdir}/usr/share/applications/thunderbird.desktop" + + rm -rf "${pkgdir}/usr/lib/thunderbird-${pkgver}/dictionaries" + ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/thunderbird-${pkgver}/dictionaries" + + # We don't want the development stuff + rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel-$pkgver,share/idl} +} + Deleted: mozconfig =================================================================== --- mozconfig 2011-08-16 17:18:57 UTC (rev 135624) +++ mozconfig 2011-08-16 17:19:40 UTC (rev 135625) @@ -1,44 +0,0 @@ -mk_add_options MOZ_CO_PROJECT=mail -ac_add_options --enable-application=mail - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-png -ac_add_options --with-system-mng -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --with-system-libevent -ac_add_options --enable-system-cairo -ac_add_options --with-pthreads -ac_add_options --disable-debug -ac_add_options --disable-tests -ac_add_options --disable-installer -ac_add_options --disable-updater -ac_add_options --disable-crashreporter -ac_add_options --disable-xprint -ac_add_options --disable-pedantic -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --enable-strip -ac_add_options --enable-pango -ac_add_options --enable-xft -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --enable-optimize -ac_add_options --enable-official-branding - -ac_add_options --enable-gio -ac_add_options --disable-gnomevfs -ac_add_options --enable-gconf -ac_add_options --enable-libnotify - -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -export USE_SHORT_LIBNAME=1 -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 -mk_add_options USE_SHORT_LIBNAME=1 Copied: thunderbird/repos/extra-i686/mozconfig (from rev 135624, thunderbird/trunk/mozconfig) =================================================================== --- mozconfig (rev 0) +++ mozconfig 2011-08-16 17:19:40 UTC (rev 135625) @@ -0,0 +1,44 @@ +mk_add_options MOZ_CO_PROJECT=mail +ac_add_options --enable-application=mail + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-png +ac_add_options --with-system-mng +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --with-system-libevent +ac_add_options --enable-system-cairo +ac_add_options --with-pthreads +ac_add_options --disable-debug +ac_add_options --disable-tests +ac_add_options --disable-installer +ac_add_options --disable-updater +ac_add_options --disable-crashreporter +ac_add_options --disable-xprint +ac_add_options --disable-pedantic +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-strip +ac_add_options --enable-pango +ac_add_options --enable-xft +ac_add_options --enable-svg +ac_add_options --enable-canvas +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +ac_add_options --enable-gio +ac_add_options --disable-gnomevfs +ac_add_options --enable-gconf +ac_add_options --enable-libnotify + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +export USE_SHORT_LIBNAME=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options USE_SHORT_LIBNAME=1 Deleted: thunderbird-3.0-lang.patch =================================================================== --- thunderbird-3.0-lang.patch 2011-08-16 17:18:57 UTC (rev 135624) +++ thunderbird-3.0-lang.patch 2011-08-16 17:19:40 UTC (rev 135625) @@ -1,11 +0,0 @@ ---- 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 Copied: thunderbird/repos/extra-i686/thunderbird-3.0-lang.patch (from rev 135624, thunderbird/trunk/thunderbird-3.0-lang.patch) =================================================================== --- thunderbird-3.0-lang.patch (rev 0) +++ thunderbird-3.0-lang.patch 2011-08-16 17:19:40 UTC (rev 135625) @@ -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 Deleted: thunderbird-appversion.patch =================================================================== --- thunderbird-appversion.patch 2011-08-16 17:18:57 UTC (rev 135624) +++ thunderbird-appversion.patch 2011-08-16 17:19:40 UTC (rev 135625) @@ -1,12 +0,0 @@ -diff -Nru comm-1.9.2.orig/mail/installer/Makefile.in comm-1.9.2/mail/installer/Makefile.in ---- comm-1.9.2.orig/mail/installer/Makefile.in 2010-04-30 22:41:37.000000000 +0300 -+++ comm-1.9.2/mail/installer/Makefile.in 2010-05-05 20:20:29.551660469 +0300 -@@ -42,6 +42,8 @@ - - include $(DEPTH)/config/autoconf.mk - -+MOZ_APP_VERSION="5.0" -+ - include $(topsrcdir)/config/rules.mk - - MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in Deleted: thunderbird.desktop =================================================================== --- thunderbird.desktop 2011-08-16 17:18:57 UTC (rev 135624) +++ thunderbird.desktop 2011-08-16 17:19:40 UTC (rev 135625) @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Thunderbird -Comment=Mail & News Reader -GenericName=Mail Client & News Reader -Exec=thunderbird %u -TryExec=thunderbird -Icon=thunderbird -Terminal=false -Type=Application -Categories=Network;Email; -MimeType=message/rfc822;x-scheme-handler/mailto; -StartupNotify=true Copied: thunderbird/repos/extra-i686/thunderbird.desktop (from rev 135624, thunderbird/trunk/thunderbird.desktop) =================================================================== --- thunderbird.desktop (rev 0) +++ thunderbird.desktop 2011-08-16 17:19:40 UTC (rev 135625) @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=Thunderbird +Comment=Mail & News Reader +GenericName=Mail Client & News Reader +Exec=thunderbird %u +TryExec=thunderbird +Icon=thunderbird +Terminal=false +Type=Application +Categories=Network;Email; +MimeType=message/rfc822;x-scheme-handler/mailto; +StartupNotify=true Deleted: thunderbird.install =================================================================== --- thunderbird.install 2011-08-16 17:18:57 UTC (rev 135624) +++ thunderbird.install 2011-08-16 17:19:40 UTC (rev 135625) @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: thunderbird/repos/extra-i686/thunderbird.install (from rev 135624, thunderbird/trunk/thunderbird.install) =================================================================== --- thunderbird.install (rev 0) +++ thunderbird.install 2011-08-16 17:19:40 UTC (rev 135625) @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}