From af4d329b015f45f609090f4b22a83abe818e0273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Tue, 7 Jun 2011 00:38:43 -0300 Subject: thunderbird-libre-3.1.10-3 --- libre/thunderbird-libre/PKGBUILD | 33 +++++++++-------------- libre/thunderbird-libre/gcc46.patch | 12 +++++++++ libre/thunderbird-libre/mozconfig | 13 +++++++--- libre/thunderbird-libre/mozilla-notify.patch | 12 +++++++++ libre/thunderbird-libre/rePKGBUILD | 39 +++++++++++++--------------- libre/thunderbird-libre/thunderbird.desktop | 2 +- libre/thunderbird-libre/thunderbird.install | 1 + 7 files changed, 66 insertions(+), 46 deletions(-) create mode 100644 libre/thunderbird-libre/gcc46.patch create mode 100644 libre/thunderbird-libre/mozilla-notify.patch (limited to 'libre/thunderbird-libre') diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD index d5f546e3d..7e3f9b587 100644 --- a/libre/thunderbird-libre/PKGBUILD +++ b/libre/thunderbird-libre/PKGBUILD @@ -3,14 +3,14 @@ # Contributor: Dale Blount # Contributor: Anders Bostrom pkgname=thunderbird-libre -pkgver=3.1.9 -pkgrel=1 +pkgver=3.1.10 +pkgrel=3 pkgdesc="Standalone Mail/News reader, with GNUZilla addons" 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') -makedepends=('zip' 'pkg-config' 'libgnomeui' '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') +makedepends=('zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'autoconf2.13') optdepends=('libcanberra: for sound support') replaces=('thunderbird') conflicts=('thunderbird') @@ -22,27 +22,17 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/sou thunderbird-3.0-lang.patch thunderbird-appversion.patch thunderbird-shared-error.patch - thunderbird-preferences.patch xulrunner-png14.patch python2.7.patch + gcc46.patch gnuzilla-addons.patch) -md5sums=('e6917c419d3aaa8083a1d4b53fb80d8c' - 'c1551d308480d241247c5662d8bebbcb' - '37457073c7f6feeb86c053701d23197f' - '25b6fe16ac24cd5c852213e5c1adb272' - '48ffcdb877a69d383b7d354e330f7658' - '3dca714ee8054634e6dfdb059464dc42' - '1d4f9978e8228ace523b18a09cf41e4e' - '989b15f6bc9e2e9233fe4c6b23f412b1' - '78a4d0c920cbb8ec6a9a36974cd775ef' - 'f272e37db4bcaef993b58a87a7db3bf5') build() { cd "${srcdir}/comm-1.9.2" 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}/thunderbird-preferences.patch" + patch -Np1 -i "${srcdir}/gcc46.patch" patch -Np0 -i "${srcdir}/xulrunner-png14.patch" patch -Np0 -i "${srcdir}/python2.7.patch" @@ -54,6 +44,7 @@ build() { unset CXXFLAGS unset CFLAGS + export CXXFLAGS="-fpermissive" export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-3.1" make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" @@ -71,13 +62,13 @@ package() { rm -rf "${pkgdir}/usr/bin/defaults" install -m755 -d "${pkgdir}/usr/share/applications" - install -m755 -d "${pkgdir}/usr/share/pixmaps" - install -m644 mail/branding/unofficial/mailicon48.png \ - "${pkgdir}/usr/share/pixmaps/thunderbird.png" + 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" + done - install -m644 "${srcdir}/thunderbird.desktop" \ - "${pkgdir}/usr/share/applications/" + install -m644 "${srcdir}/thunderbird.desktop" "${pkgdir}/usr/share/applications/" rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc } diff --git a/libre/thunderbird-libre/gcc46.patch b/libre/thunderbird-libre/gcc46.patch new file mode 100644 index 000000000..71a3686ea --- /dev/null +++ b/libre/thunderbird-libre/gcc46.patch @@ -0,0 +1,12 @@ +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 ++ + #include "os2.h" + + #include "head.h" diff --git a/libre/thunderbird-libre/mozconfig b/libre/thunderbird-libre/mozconfig index 4281bffa1..9cdf366f5 100644 --- a/libre/thunderbird-libre/mozconfig +++ b/libre/thunderbird-libre/mozconfig @@ -21,13 +21,20 @@ ac_add_options --enable-default-toolkit=cairo-gtk2 ac_add_options --enable-strip ac_add_options --enable-pango ac_add_options --enable-xft -#disabled because of bugs with cairo 1.10 -#ac_add_options --enable-system-cairo +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 --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 +ac_add_options --enable-libnotify export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 diff --git a/libre/thunderbird-libre/mozilla-notify.patch b/libre/thunderbird-libre/mozilla-notify.patch new file mode 100644 index 000000000..952567b0e --- /dev/null +++ b/libre/thunderbird-libre/mozilla-notify.patch @@ -0,0 +1,12 @@ +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; + diff --git a/libre/thunderbird-libre/rePKGBUILD b/libre/thunderbird-libre/rePKGBUILD index ef2de693e..215f893a1 100644 --- a/libre/thunderbird-libre/rePKGBUILD +++ b/libre/thunderbird-libre/rePKGBUILD @@ -1,33 +1,30 @@ -# Maintainer: Joshua Haase -_pkgbase=thunderbird -pkgname=thunderbird-libre -_pkgver=3.1 -pkgver=3.1.9 -_pkgrel=2 -pkgrel=$_pkgrel.1 -pkgdesc="Standalone Mail/News reader, with GNUZilla addons" -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') -makedepends=() -optdepends=('libcanberra: for sound support') -replaces=('thunderbird') -conflicts=('thunderbird') -provides=("thunderbird=$pkgver") -install=thunderbird.install -source=(http://mirrors.kernel.org/archlinux/extra/os/$CARCH/$_pkgbase-$pkgver-$_pkgrel-$CARCH.pkg.tar.xz +# This is an example rePKGBUILD file. Use this as a start to creating your own, +# and remove these comments. For more information, see 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. + +# Maintainer: Nicolas Reynolds +source PKGBUILD +CARCH=x86_64 +unset build package md5sums source +_repo=extra +options=(!strip) +source=(PKGBUILD + http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT + # files for pkg modifications gnuzilla-addons.patch) build() { cd "${srcdir}/" - rm .{INSTALL,PKGINFO} $_pkgbase-$pkgver-$_pkgrel-$CARCH.pkg.tar.xz - pushd usr/lib/${_pkgbase}-${_pkgver}/defaults/pref/ >/dev/null + rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT + + pushd usr/lib/${pkgname%-libre}-3.1/defaults/pref/ >/dev/null patch -Np0 -i "${srcdir}/gnuzilla-addons.patch" popd >/dev/null rm "${srcdir}/gnuzilla-addons.patch" } package() { + cd ${srcdir} cp -a ./* ${pkgdir} } diff --git a/libre/thunderbird-libre/thunderbird.desktop b/libre/thunderbird-libre/thunderbird.desktop index 93ffead78..a626e52ba 100644 --- a/libre/thunderbird-libre/thunderbird.desktop +++ b/libre/thunderbird-libre/thunderbird.desktop @@ -3,7 +3,7 @@ Version=1.0 Name=Thunderbird Comment=Mail & News Reader GenericName=Mail Client & News Reader -Exec=thunderbird +Exec=thunderbird %u TryExec=thunderbird Icon=thunderbird Terminal=false diff --git a/libre/thunderbird-libre/thunderbird.install b/libre/thunderbird-libre/thunderbird.install index 660593cf5..4d4a283db 100644 --- a/libre/thunderbird-libre/thunderbird.install +++ b/libre/thunderbird-libre/thunderbird.install @@ -1,5 +1,6 @@ post_install() { update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { -- cgit v1.2.3-2-g168b