Date: Tuesday, June 28, 2011 @ 17:35:09 Author: ibiru Revision: 129565
update to 5.0 Modified: thunderbird/trunk/PKGBUILD thunderbird/trunk/mozconfig thunderbird/trunk/thunderbird-appversion.patch Deleted: thunderbird/trunk/gcc46.patch thunderbird/trunk/mozilla-notify.patch thunderbird/trunk/python2.7.patch thunderbird/trunk/thunderbird-preferences.patch thunderbird/trunk/thunderbird-shared-error.patch thunderbird/trunk/xulrunner-png14.patch --------------------------------+ PKGBUILD | 63 ++++++++++++++------------------------- gcc46.patch | 12 ------- mozconfig | 12 +++---- mozilla-notify.patch | 12 ------- python2.7.patch | 11 ------ thunderbird-appversion.patch | 2 - thunderbird-preferences.patch | 30 ------------------ thunderbird-shared-error.patch | 15 --------- xulrunner-png14.patch | 11 ------ 9 files changed, 31 insertions(+), 137 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-06-28 21:31:50 UTC (rev 129564) +++ PKGBUILD 2011-06-28 21:35:09 UTC (rev 129565) @@ -3,73 +3,58 @@ # Contributor: Dale Blount <[email protected]> # Contributor: Anders Bostrom <[email protected]> pkgname=thunderbird -pkgver=3.1.11 +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') -makedepends=('zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'autoconf2.13') +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 - thunderbird-shared-error.patch - xulrunner-png14.patch - python2.7.patch - gcc46.patch) -md5sums=('25833b3f90925d96285630d22c85cd5c' - 'ac1edd41e214742421c7f917948a9ad6' + thunderbird-appversion.patch) +md5sums=('0bbacea54b4b8fc4ff20e73b3278c1ba' + 'b8fd97ab4bfb2e4538b1e1340d70f915' 'af3e5b344d2edf1c7d61bb0a5a96de9a' '25b6fe16ac24cd5c852213e5c1adb272' - '48ffcdb877a69d383b7d354e330f7658' - '3dca714ee8054634e6dfdb059464dc42' - '989b15f6bc9e2e9233fe4c6b23f412b1' - '78a4d0c920cbb8ec6a9a36974cd775ef' - 'a2bced1791fb8eca978d31b129f92a28') + 'be5f6aea50eeefae234bfc0f30e2f0ec') build() { - cd "${srcdir}/comm-1.9.2" + cd "${srcdir}/comm-miramar" patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch" patch -Np1 -i "${srcdir}/thunderbird-appversion.patch" - patch -Np1 -i "${srcdir}/thunderbird-shared-error.patch" - patch -Np1 -i "${srcdir}/gcc46.patch" - patch -Np0 -i "${srcdir}/xulrunner-png14.patch" - patch -Np0 -i "${srcdir}/python2.7.patch" cp "${srcdir}/mozconfig" .mozconfig - unset CXXFLAGS - unset CFLAGS export CXXFLAGS="-fpermissive" - export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-3.1" + 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}" + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" } package() { - cd "${srcdir}/comm-1.9.2" - make -j1 DESTDIR="${pkgdir}" install + cd "${srcdir}/comm-miramar" + make -j1 -f client.mk DESTDIR="${pkgdir}" install - #Remove included dictionaries, add symlink to system myspell path. - #Note: this will cause file conflicts when users have installed dictionaries in the old location - rm -rf "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries" - ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries" - - rm -rf "${pkgdir}/usr/bin/defaults" - - install -m755 -d "${pkgdir}/usr/share/applications" - for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -d "$pkgdir/usr/share/icons/hicolor/$i/apps" - cp other-licenses/branding/thunderbird/mailicon${i/x*/}.png "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png" + install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \ + "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png" done - install -m644 "${srcdir}/thunderbird.desktop" "${pkgdir}/usr/share/applications/" + install -Dm644 "${srcdir}/thunderbird.desktop" \ + "${pkgdir}/usr/share/applications/thunderbird.desktop" - rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc + 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} } + Deleted: gcc46.patch =================================================================== --- gcc46.patch 2011-06-28 21:31:50 UTC (rev 129564) +++ gcc46.patch 2011-06-28 21:35:09 UTC (rev 129565) @@ -1,12 +0,0 @@ -diff -Nur comm-1.9.2.orig//mozilla/gfx/ots/src/os2.cc comm-1.9.2/mozilla/gfx/ots/src/os2.cc ---- comm-1.9.2.orig//mozilla/gfx/ots/src/os2.cc 2011-04-14 11:37:21.000000000 -0700 -+++ comm-1.9.2/mozilla/gfx/ots/src/os2.cc 2011-04-29 09:10:23.635807433 -0700 -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include <cstddef> -+ - #include "os2.h" - - #include "head.h" Modified: mozconfig =================================================================== --- mozconfig 2011-06-28 21:31:50 UTC (rev 129564) +++ mozconfig 2011-06-28 21:35:09 UTC (rev 129565) @@ -1,6 +1,9 @@ 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 @@ -9,6 +12,8 @@ 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 @@ -16,20 +21,16 @@ 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-system-cairo ac_add_options --enable-svg ac_add_options --enable-canvas ac_add_options --enable-optimize -ac_add_options --prefix=/usr -#ac_add_options --with-branding=mail/branding/unofficial ac_add_options --enable-official-branding -ac_add_options --disable-pedantic - ac_add_options --enable-gio ac_add_options --disable-gnomevfs ac_add_options --enable-gconf @@ -41,4 +42,3 @@ mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 mk_add_options USE_SHORT_LIBNAME=1 - Deleted: mozilla-notify.patch =================================================================== --- mozilla-notify.patch 2011-06-28 21:31:50 UTC (rev 129564) +++ mozilla-notify.patch 2011-06-28 21:35:09 UTC (rev 129565) @@ -1,12 +0,0 @@ -diff -up comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp.libnotify comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp ---- comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp.libnotify 2010-10-27 09:05:36.000000000 +0200 -+++ comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp 2010-11-08 13:28:04.564002379 +0100 -@@ -204,7 +204,7 @@ nsAlertsIconListener::ShowAlert(GdkPixbu - { - NotifyNotification* notify = notify_notification_new(mAlertTitle.get(), - mAlertText.get(), -- NULL, NULL); -+ NULL); - if (!notify) - return NS_ERROR_OUT_OF_MEMORY; - Deleted: python2.7.patch =================================================================== --- python2.7.patch 2011-06-28 21:31:50 UTC (rev 129564) +++ python2.7.patch 2011-06-28 21:35:09 UTC (rev 129565) @@ -1,11 +0,0 @@ ---- configure.in 2010-10-13 08:37:29.000000000 -0700 -+++ configure.in~ 2010-10-19 10:32:06.360019362 -0700 -@@ -878,7 +878,7 @@ - AC_MSG_RESULT([yes]) - fi - --MOZ_PATH_PROGS(PYTHON, $PYTHON python2.6 python2.5 python2.4 python) -+MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python2.5 python2.4 python) - if test -z "$PYTHON"; then - AC_MSG_ERROR([python was not found in \$PATH]) - fi Modified: thunderbird-appversion.patch =================================================================== --- thunderbird-appversion.patch 2011-06-28 21:31:50 UTC (rev 129564) +++ thunderbird-appversion.patch 2011-06-28 21:35:09 UTC (rev 129565) @@ -5,7 +5,7 @@ include $(DEPTH)/config/autoconf.mk -+MOZ_APP_VERSION="3.1" ++MOZ_APP_VERSION="5.0" + include $(topsrcdir)/config/rules.mk Deleted: thunderbird-preferences.patch =================================================================== --- thunderbird-preferences.patch 2011-06-28 21:31:50 UTC (rev 129564) +++ thunderbird-preferences.patch 2011-06-28 21:35:09 UTC (rev 129565) @@ -1,30 +0,0 @@ -diff -Nur comm-1.9.2.orig/mail/app/profile/all-thunderbird.js comm-1.9.2/mail/app/profile/all-thunderbird.js ---- comm-1.9.2.orig/mail/app/profile/all-thunderbird.js 2010-06-23 20:43:08.000000000 +0300 -+++ comm-1.9.2/mail/app/profile/all-thunderbird.js 2010-06-25 00:37:36.518929684 +0300 -@@ -125,7 +125,7 @@ - pref("app.update.showInstalledUI", false); - - // Release notes URL --pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%";); -+pref("app.releaseNotesURL", "http://www.mozillamessaging.com/%APP%/%VERSION%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%";); - - // Base URL for web-based support pages. - pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/";); -diff -Nur comm-1.9.2.orig/mail/branding/nightly/thunderbird-branding.js comm-1.9.2/mail/branding/nightly/thunderbird-branding.js ---- comm-1.9.2.orig/mail/branding/nightly/thunderbird-branding.js 2010-06-23 20:43:08.000000000 +0300 -+++ comm-1.9.2/mail/branding/nightly/thunderbird-branding.js 2010-06-25 00:36:10.605569121 +0300 -@@ -1,11 +1,11 @@ - // Default start page --pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%";); -+pref("mailnews.start_page.url","https://www.mozillamessaging.com/%APP%/%VERSION%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%";); - - // first launch welcome page --pref("mailnews.start_page.welcome_url","https://live.mozillamessaging.com/%APP%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%";); -+pref("mailnews.start_page.welcome_url","https://www.mozillamessaging.com/%APP%/%VERSION%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%";); - - // start page override to load after an update --pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%";); -+pref("mailnews.start_page.override_url","https://www.mozillamessaging.com/%APP%/%VERSION%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%";); - - // Interval: Time between checks for a new version (in seconds) - // nightly=8 hours, official=24 hours Deleted: thunderbird-shared-error.patch =================================================================== --- thunderbird-shared-error.patch 2011-06-28 21:31:50 UTC (rev 129564) +++ thunderbird-shared-error.patch 2011-06-28 21:35:09 UTC (rev 129565) @@ -1,15 +0,0 @@ -diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/installer/Makefile.in ---- comm-central/mail/installer/Makefile.in.shared-error 2009-09-16 13:47:43.000000000 +0200 -+++ comm-central/mail/installer/Makefile.in 2009-09-16 13:48:25.000000000 +0200 -@@ -95,9 +95,11 @@ endif - # mozconfig instead. - ifndef MAIL_PKG_SHARED - ifndef BUILD_STATIC_LIBS -+ifeq (BUILD_STATIC_LIBS, 1) - $(error you need an "--enable-static" build to package a build) - endif - endif -+endif - - # On mozilla-central, packager.mk uses core_abspath to redefine DIST - # As the comm-central config.mk doesn't set it, do it ourselves instead Deleted: xulrunner-png14.patch =================================================================== --- xulrunner-png14.patch 2011-06-28 21:31:50 UTC (rev 129564) +++ xulrunner-png14.patch 2011-06-28 21:35:09 UTC (rev 129565) @@ -1,11 +0,0 @@ ---- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-01-17 00:15:53.979744638 +0100 -+++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-01-17 00:16:07.855993411 +0100 -@@ -135,7 +135,7 @@ - - // initialize - mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING, -- png_voidp_NULL, -+ NULL, - ErrorCallback, - ErrorCallback); - if (! mPNG)
