Date: Tuesday, January 31, 2012 @ 14:52:07 Author: ibiru Revision: 148428
archrelease: copy trunk to testing-i686, testing-x86_64 Added: thunderbird/repos/testing-i686/PKGBUILD (from rev 148427, thunderbird/trunk/PKGBUILD) thunderbird/repos/testing-i686/mozconfig (from rev 148427, thunderbird/trunk/mozconfig) thunderbird/repos/testing-i686/thunderbird-install-dir.patch (from rev 148427, thunderbird/trunk/thunderbird-install-dir.patch) thunderbird/repos/testing-i686/thunderbird.desktop (from rev 148427, thunderbird/trunk/thunderbird.desktop) thunderbird/repos/testing-i686/thunderbird.install (from rev 148427, thunderbird/trunk/thunderbird.install) thunderbird/repos/testing-i686/vendor.js (from rev 148427, thunderbird/trunk/vendor.js) thunderbird/repos/testing-x86_64/PKGBUILD (from rev 148427, thunderbird/trunk/PKGBUILD) thunderbird/repos/testing-x86_64/mozconfig (from rev 148427, thunderbird/trunk/mozconfig) thunderbird/repos/testing-x86_64/thunderbird-install-dir.patch (from rev 148427, thunderbird/trunk/thunderbird-install-dir.patch) thunderbird/repos/testing-x86_64/thunderbird.desktop (from rev 148427, thunderbird/trunk/thunderbird.desktop) thunderbird/repos/testing-x86_64/thunderbird.install (from rev 148427, thunderbird/trunk/thunderbird.install) thunderbird/repos/testing-x86_64/vendor.js (from rev 148427, thunderbird/trunk/vendor.js) Deleted: thunderbird/repos/testing-i686/PKGBUILD thunderbird/repos/testing-i686/libpng15.patch thunderbird/repos/testing-i686/mozconfig thunderbird/repos/testing-i686/thunderbird-install-dir.patch thunderbird/repos/testing-i686/thunderbird.desktop thunderbird/repos/testing-i686/thunderbird.install thunderbird/repos/testing-i686/vendor.js thunderbird/repos/testing-x86_64/PKGBUILD thunderbird/repos/testing-x86_64/libpng15.patch thunderbird/repos/testing-x86_64/mozconfig thunderbird/repos/testing-x86_64/thunderbird-install-dir.patch thunderbird/repos/testing-x86_64/thunderbird.desktop thunderbird/repos/testing-x86_64/thunderbird.install thunderbird/repos/testing-x86_64/vendor.js ----------------------------------------------+ testing-i686/PKGBUILD | 123 ++++++++++++------------- testing-i686/libpng15.patch | 52 ---------- testing-i686/mozconfig | 80 ++++++++-------- testing-i686/thunderbird-install-dir.patch | 84 ++++++++--------- testing-i686/thunderbird.desktop | 26 ++--- testing-i686/thunderbird.install | 24 ++-- testing-i686/vendor.js | 18 +-- testing-x86_64/PKGBUILD | 123 ++++++++++++------------- testing-x86_64/libpng15.patch | 52 ---------- testing-x86_64/mozconfig | 80 ++++++++-------- testing-x86_64/thunderbird-install-dir.patch | 84 ++++++++--------- testing-x86_64/thunderbird.desktop | 26 ++--- testing-x86_64/thunderbird.install | 24 ++-- testing-x86_64/vendor.js | 18 +-- 14 files changed, 352 insertions(+), 462 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-i686/PKGBUILD 2012-01-31 19:52:07 UTC (rev 148428) @@ -1,63 +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=9.0.1 -pkgrel=2 -pkgdesc="Standalone Mail/News reader" -arch=('i686' 'x86_64') -license=('MPL' 'GPL') -url="http://www.mozilla.org/thunderbird/" -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa') -optdepends=('libcanberra: for sound support') -install=thunderbird.install -source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2 - mozconfig - thunderbird.desktop - thunderbird-install-dir.patch - vendor.js - libpng15.patch) -md5sums=('a5904751dbd33074682b438b732fdbab' - 'ca98c2bf1017b33e19dae22fdcef2e73' - 'af3e5b344d2edf1c7d61bb0a5a96de9a' - 'aea906acf72c43dd82ead2fabcc1c6db' - '5a53179d14ae9631b7afe5e4d0fc0b25' - 'dc77000ddcbb6d9e17220c759fdcb94e') - -build() { - cd "$srcdir/comm-release" - patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" - patch -Np1 -i "$srcdir/libpng15.patch" - - cp "$srcdir/mozconfig" .mozconfig - - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird" - 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 - - install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/pref/" - - 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/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation" - - # We don't want the development stuff - rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl} -} Copied: thunderbird/repos/testing-i686/PKGBUILD (from rev 148427, thunderbird/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2012-01-31 19:52:07 UTC (rev 148428) @@ -0,0 +1,60 @@ +# $Id$ +# Contributor: Alexander Baldeck <alexan...@archlinux.org> +# Contributor: Dale Blount <d...@archlinux.org> +# Contributor: Anders Bostrom <anders.bost...@home.se> + +pkgname=thunderbird +pkgver=10.0 +pkgrel=1 +pkgdesc="Standalone Mail/News reader" +arch=('i686' 'x86_64') +license=('MPL' 'GPL') +url="http://www.mozilla.org/thunderbird/" +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa') +optdepends=('libcanberra: for sound support') +install=thunderbird.install +source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver-real/source/thunderbird-$pkgver.source.tar.bz2 + mozconfig + thunderbird.desktop + thunderbird-install-dir.patch + vendor.js) +md5sums=('6f76f25894ba746a2e33614d3dd8dbab' + 'ca98c2bf1017b33e19dae22fdcef2e73' + 'af3e5b344d2edf1c7d61bb0a5a96de9a' + 'aea906acf72c43dd82ead2fabcc1c6db' + '5a53179d14ae9631b7afe5e4d0fc0b25') + +build() { + cd "$srcdir/comm-release" + patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" + + cp "$srcdir/mozconfig" .mozconfig + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird" + 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 + + install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/pref/" + + 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/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation" + + # We don't want the development stuff + rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl} +} Deleted: testing-i686/libpng15.patch =================================================================== --- testing-i686/libpng15.patch 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-i686/libpng15.patch 2012-01-31 19:52:07 UTC (rev 148428) @@ -1,52 +0,0 @@ -diff -Nur comm-release.orig/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp comm-release/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp ---- comm-release.orig/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp 2012-01-29 19:29:28.121217854 +0000 -+++ comm-release/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp 2012-01-29 19:32:05.489944419 +0000 -@@ -385,8 +385,7 @@ - - // Raymond Chen says that 32bpp only are valid PNG ICOs - // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx -- if (static_cast<nsPNGDecoder*>(mContainedDecoder.get())->HasValidInfo() && -- static_cast<nsPNGDecoder*>(mContainedDecoder.get())->GetPixelDepth() != 32) { -+ if (!static_cast<nsPNGDecoder*>(mContainedDecoder.get())->IsValidICO()) { - PostDataError(); - } - return; -diff -Nur comm-release.orig/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h comm-release/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h ---- comm-release.orig/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h 2012-01-29 19:29:28.121217854 +0000 -+++ comm-release/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h 2012-01-29 19:32:05.489944419 +0000 -@@ -73,19 +73,25 @@ - - void EndImageFrame(); - -- // Checks if the info header contains valid information -- bool HasValidInfo() const -+ // Check if PNG is valid ICO (32bpp RGBA) -+ // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx -+ bool IsValidICO() const - { -- return mInfo && mInfo->valid; -- } -+ png_uint_32 -+ png_width, // Unused -+ png_height; // Unused - -- // Obtain the pixel depth if available or 0 otherwise -- PRInt32 GetPixelDepth() const -- { -- if (!mInfo) { -- return 0; -+ int png_bit_depth, -+ png_color_type; -+ -+ if (png_get_IHDR(mPNG, mInfo, &png_width, &png_height, &png_bit_depth, -+ &png_color_type, NULL, NULL, NULL)) { -+ -+ return (png_color_type == PNG_COLOR_TYPE_RGB_ALPHA && -+ png_bit_depth == 8); -+ } else { -+ return false; - } -- return mInfo->pixel_depth; - } - - public: Deleted: testing-i686/mozconfig =================================================================== --- testing-i686/mozconfig 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-i686/mozconfig 2012-01-31 19:52:07 UTC (rev 148428) @@ -1,40 +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 - -# System libraries -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-bz2 -ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-ffi -ac_add_options --enable-system-cairo -ac_add_options --enable-system-pixman -ac_add_options --with-pthreads - -# Features -ac_add_options --enable-official-branding -ac_add_options --enable-safe-browsing -ac_add_options --enable-startup-notification -ac_add_options --enable-gio - -ac_add_options --disable-gnomevfs -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer - -# Optimization -ac_add_options --enable-optimize - -export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 Copied: thunderbird/repos/testing-i686/mozconfig (from rev 148427, thunderbird/trunk/mozconfig) =================================================================== --- testing-i686/mozconfig (rev 0) +++ testing-i686/mozconfig 2012-01-31 19:52:07 UTC (rev 148428) @@ -0,0 +1,40 @@ +mk_add_options MOZ_CO_PROJECT=mail +ac_add_options --enable-application=mail + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +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-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-official-branding +ac_add_options --enable-safe-browsing +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 Deleted: testing-i686/thunderbird-install-dir.patch =================================================================== --- testing-i686/thunderbird-install-dir.patch 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-i686/thunderbird-install-dir.patch 2012-01-31 19:52:07 UTC (rev 148428) @@ -1,42 +0,0 @@ -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))) Copied: thunderbird/repos/testing-i686/thunderbird-install-dir.patch (from rev 148427, thunderbird/trunk/thunderbird-install-dir.patch) =================================================================== --- testing-i686/thunderbird-install-dir.patch (rev 0) +++ testing-i686/thunderbird-install-dir.patch 2012-01-31 19:52:07 UTC (rev 148428) @@ -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))) Deleted: testing-i686/thunderbird.desktop =================================================================== --- testing-i686/thunderbird.desktop 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-i686/thunderbird.desktop 2012-01-31 19:52:07 UTC (rev 148428) @@ -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/testing-i686/thunderbird.desktop (from rev 148427, thunderbird/trunk/thunderbird.desktop) =================================================================== --- testing-i686/thunderbird.desktop (rev 0) +++ testing-i686/thunderbird.desktop 2012-01-31 19:52:07 UTC (rev 148428) @@ -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: testing-i686/thunderbird.install =================================================================== --- testing-i686/thunderbird.install 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-i686/thunderbird.install 2012-01-31 19:52:07 UTC (rev 148428) @@ -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/testing-i686/thunderbird.install (from rev 148427, thunderbird/trunk/thunderbird.install) =================================================================== --- testing-i686/thunderbird.install (rev 0) +++ testing-i686/thunderbird.install 2012-01-31 19:52:07 UTC (rev 148428) @@ -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 +} Deleted: testing-i686/vendor.js =================================================================== --- testing-i686/vendor.js 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-i686/vendor.js 2012-01-31 19:52:07 UTC (rev 148428) @@ -1,9 +0,0 @@ -// Use LANG environment variable to choose locale -pref("intl.locale.matchOS", true); - -// Disable default mailer checking. -pref("mail.shell.checkDefaultMail", false); - -// Don't disable our bundled extensions in the application directory -pref("extensions.autoDisableScopes", 11); -pref("extensions.shownSelectionUI", true); Copied: thunderbird/repos/testing-i686/vendor.js (from rev 148427, thunderbird/trunk/vendor.js) =================================================================== --- testing-i686/vendor.js (rev 0) +++ testing-i686/vendor.js 2012-01-31 19:52:07 UTC (rev 148428) @@ -0,0 +1,9 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default mailer checking. +pref("mail.shell.checkDefaultMail", false); + +// Don't disable our bundled extensions in the application directory +pref("extensions.autoDisableScopes", 11); +pref("extensions.shownSelectionUI", true); Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-x86_64/PKGBUILD 2012-01-31 19:52:07 UTC (rev 148428) @@ -1,63 +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=9.0.1 -pkgrel=2 -pkgdesc="Standalone Mail/News reader" -arch=('i686' 'x86_64') -license=('MPL' 'GPL') -url="http://www.mozilla.org/thunderbird/" -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa') -optdepends=('libcanberra: for sound support') -install=thunderbird.install -source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2 - mozconfig - thunderbird.desktop - thunderbird-install-dir.patch - vendor.js - libpng15.patch) -md5sums=('a5904751dbd33074682b438b732fdbab' - 'ca98c2bf1017b33e19dae22fdcef2e73' - 'af3e5b344d2edf1c7d61bb0a5a96de9a' - 'aea906acf72c43dd82ead2fabcc1c6db' - '5a53179d14ae9631b7afe5e4d0fc0b25' - 'dc77000ddcbb6d9e17220c759fdcb94e') - -build() { - cd "$srcdir/comm-release" - patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" - patch -Np1 -i "$srcdir/libpng15.patch" - - cp "$srcdir/mozconfig" .mozconfig - - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird" - 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 - - install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/pref/" - - 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/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation" - - # We don't want the development stuff - rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl} -} Copied: thunderbird/repos/testing-x86_64/PKGBUILD (from rev 148427, thunderbird/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2012-01-31 19:52:07 UTC (rev 148428) @@ -0,0 +1,60 @@ +# $Id$ +# Contributor: Alexander Baldeck <alexan...@archlinux.org> +# Contributor: Dale Blount <d...@archlinux.org> +# Contributor: Anders Bostrom <anders.bost...@home.se> + +pkgname=thunderbird +pkgver=10.0 +pkgrel=1 +pkgdesc="Standalone Mail/News reader" +arch=('i686' 'x86_64') +license=('MPL' 'GPL') +url="http://www.mozilla.org/thunderbird/" +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa') +optdepends=('libcanberra: for sound support') +install=thunderbird.install +source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver-real/source/thunderbird-$pkgver.source.tar.bz2 + mozconfig + thunderbird.desktop + thunderbird-install-dir.patch + vendor.js) +md5sums=('6f76f25894ba746a2e33614d3dd8dbab' + 'ca98c2bf1017b33e19dae22fdcef2e73' + 'af3e5b344d2edf1c7d61bb0a5a96de9a' + 'aea906acf72c43dd82ead2fabcc1c6db' + '5a53179d14ae9631b7afe5e4d0fc0b25') + +build() { + cd "$srcdir/comm-release" + patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" + + cp "$srcdir/mozconfig" .mozconfig + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird" + 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 + + install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/pref/" + + 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/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation" + + # We don't want the development stuff + rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl} +} Deleted: testing-x86_64/libpng15.patch =================================================================== --- testing-x86_64/libpng15.patch 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-x86_64/libpng15.patch 2012-01-31 19:52:07 UTC (rev 148428) @@ -1,52 +0,0 @@ -diff -Nur comm-release.orig/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp comm-release/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp ---- comm-release.orig/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp 2012-01-29 19:29:28.121217854 +0000 -+++ comm-release/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp 2012-01-29 19:32:05.489944419 +0000 -@@ -385,8 +385,7 @@ - - // Raymond Chen says that 32bpp only are valid PNG ICOs - // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx -- if (static_cast<nsPNGDecoder*>(mContainedDecoder.get())->HasValidInfo() && -- static_cast<nsPNGDecoder*>(mContainedDecoder.get())->GetPixelDepth() != 32) { -+ if (!static_cast<nsPNGDecoder*>(mContainedDecoder.get())->IsValidICO()) { - PostDataError(); - } - return; -diff -Nur comm-release.orig/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h comm-release/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h ---- comm-release.orig/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h 2012-01-29 19:29:28.121217854 +0000 -+++ comm-release/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h 2012-01-29 19:32:05.489944419 +0000 -@@ -73,19 +73,25 @@ - - void EndImageFrame(); - -- // Checks if the info header contains valid information -- bool HasValidInfo() const -+ // Check if PNG is valid ICO (32bpp RGBA) -+ // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx -+ bool IsValidICO() const - { -- return mInfo && mInfo->valid; -- } -+ png_uint_32 -+ png_width, // Unused -+ png_height; // Unused - -- // Obtain the pixel depth if available or 0 otherwise -- PRInt32 GetPixelDepth() const -- { -- if (!mInfo) { -- return 0; -+ int png_bit_depth, -+ png_color_type; -+ -+ if (png_get_IHDR(mPNG, mInfo, &png_width, &png_height, &png_bit_depth, -+ &png_color_type, NULL, NULL, NULL)) { -+ -+ return (png_color_type == PNG_COLOR_TYPE_RGB_ALPHA && -+ png_bit_depth == 8); -+ } else { -+ return false; - } -- return mInfo->pixel_depth; - } - - public: Deleted: testing-x86_64/mozconfig =================================================================== --- testing-x86_64/mozconfig 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-x86_64/mozconfig 2012-01-31 19:52:07 UTC (rev 148428) @@ -1,40 +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 - -# System libraries -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-bz2 -ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-ffi -ac_add_options --enable-system-cairo -ac_add_options --enable-system-pixman -ac_add_options --with-pthreads - -# Features -ac_add_options --enable-official-branding -ac_add_options --enable-safe-browsing -ac_add_options --enable-startup-notification -ac_add_options --enable-gio - -ac_add_options --disable-gnomevfs -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer - -# Optimization -ac_add_options --enable-optimize - -export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 Copied: thunderbird/repos/testing-x86_64/mozconfig (from rev 148427, thunderbird/trunk/mozconfig) =================================================================== --- testing-x86_64/mozconfig (rev 0) +++ testing-x86_64/mozconfig 2012-01-31 19:52:07 UTC (rev 148428) @@ -0,0 +1,40 @@ +mk_add_options MOZ_CO_PROJECT=mail +ac_add_options --enable-application=mail + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +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-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-official-branding +ac_add_options --enable-safe-browsing +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 Deleted: testing-x86_64/thunderbird-install-dir.patch =================================================================== --- testing-x86_64/thunderbird-install-dir.patch 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-x86_64/thunderbird-install-dir.patch 2012-01-31 19:52:07 UTC (rev 148428) @@ -1,42 +0,0 @@ -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))) Copied: thunderbird/repos/testing-x86_64/thunderbird-install-dir.patch (from rev 148427, thunderbird/trunk/thunderbird-install-dir.patch) =================================================================== --- testing-x86_64/thunderbird-install-dir.patch (rev 0) +++ testing-x86_64/thunderbird-install-dir.patch 2012-01-31 19:52:07 UTC (rev 148428) @@ -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))) Deleted: testing-x86_64/thunderbird.desktop =================================================================== --- testing-x86_64/thunderbird.desktop 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-x86_64/thunderbird.desktop 2012-01-31 19:52:07 UTC (rev 148428) @@ -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/testing-x86_64/thunderbird.desktop (from rev 148427, thunderbird/trunk/thunderbird.desktop) =================================================================== --- testing-x86_64/thunderbird.desktop (rev 0) +++ testing-x86_64/thunderbird.desktop 2012-01-31 19:52:07 UTC (rev 148428) @@ -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: testing-x86_64/thunderbird.install =================================================================== --- testing-x86_64/thunderbird.install 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-x86_64/thunderbird.install 2012-01-31 19:52:07 UTC (rev 148428) @@ -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/testing-x86_64/thunderbird.install (from rev 148427, thunderbird/trunk/thunderbird.install) =================================================================== --- testing-x86_64/thunderbird.install (rev 0) +++ testing-x86_64/thunderbird.install 2012-01-31 19:52:07 UTC (rev 148428) @@ -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 +} Deleted: testing-x86_64/vendor.js =================================================================== --- testing-x86_64/vendor.js 2012-01-31 19:34:04 UTC (rev 148427) +++ testing-x86_64/vendor.js 2012-01-31 19:52:07 UTC (rev 148428) @@ -1,9 +0,0 @@ -// Use LANG environment variable to choose locale -pref("intl.locale.matchOS", true); - -// Disable default mailer checking. -pref("mail.shell.checkDefaultMail", false); - -// Don't disable our bundled extensions in the application directory -pref("extensions.autoDisableScopes", 11); -pref("extensions.shownSelectionUI", true); Copied: thunderbird/repos/testing-x86_64/vendor.js (from rev 148427, thunderbird/trunk/vendor.js) =================================================================== --- testing-x86_64/vendor.js (rev 0) +++ testing-x86_64/vendor.js 2012-01-31 19:52:07 UTC (rev 148428) @@ -0,0 +1,9 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default mailer checking. +pref("mail.shell.checkDefaultMail", false); + +// Don't disable our bundled extensions in the application directory +pref("extensions.autoDisableScopes", 11); +pref("extensions.shownSelectionUI", true);