[arch-commits] Commit in thunderbird/trunk (4 files)

[Ionut Biru]

    Date: Friday, April 29, 2011 @ 12:46:22
  Author: ibiru
Revision: 121234

update to 3.1.10

Added:
  thunderbird/trunk/gcc46.patch
Modified:
  thunderbird/trunk/PKGBUILD
  thunderbird/trunk/mozconfig
  thunderbird/trunk/thunderbird.install

---------------------+
 PKGBUILD            |   32 +++++++++++++++-----------------
 gcc46.patch         |   12 ++++++++++++
 mozconfig           |   13 ++++++++++---
 thunderbird.install |    1 +
 4 files changed, 38 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-29 16:46:13 UTC (rev 121233)
+++ PKGBUILD	2011-04-29 16:46:22 UTC (rev 121234)
@@ -3,14 +3,14 @@
 # Contributor: Dale Blount <dale at archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom at home.se>
 pkgname=thunderbird
-pkgver=3.1.9
-pkgrel=2
+pkgver=3.1.10
+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')
-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')
 install=thunderbird.install
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2
@@ -19,35 +19,33 @@
         thunderbird-3.0-lang.patch
         thunderbird-appversion.patch
         thunderbird-shared-error.patch
-        thunderbird-preferences.patch
         xulrunner-png14.patch
         python2.7.patch
-        mozilla-notify.patch)
-md5sums=('e6917c419d3aaa8083a1d4b53fb80d8c'
-         'c1551d308480d241247c5662d8bebbcb'
+        gcc46.patch)
+md5sums=('2a81f3ee7ea7acff0ee2eaee6574ea11'
+         '529d4caad3027116ab9e000438ca70fa'
          '37457073c7f6feeb86c053701d23197f'
          '25b6fe16ac24cd5c852213e5c1adb272'
          '48ffcdb877a69d383b7d354e330f7658'
          '3dca714ee8054634e6dfdb059464dc42'
-         '1d4f9978e8228ace523b18a09cf41e4e'
          '989b15f6bc9e2e9233fe4c6b23f412b1'
          '78a4d0c920cbb8ec6a9a36974cd775ef'
-         '7d411e5c7476e73d2a4419e41dad9f44')
+         'a2bced1791fb8eca978d31b129f92a28')
 
 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"
-  patch -Np1 -i "${srcdir}/mozilla-notify.patch"
 
   cp "${srcdir}/mozconfig" .mozconfig
   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}"
@@ -65,13 +63,13 @@
   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
 }

Added: gcc46.patch
===================================================================
--- gcc46.patch	                        (rev 0)
+++ gcc46.patch	2011-04-29 16:46:22 UTC (rev 121234)
@@ -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 <cstddef>
++
+ #include "os2.h"
+ 
+ #include "head.h"

Modified: mozconfig
===================================================================
--- mozconfig	2011-04-29 16:46:13 UTC (rev 121233)
+++ mozconfig	2011-04-29 16:46:22 UTC (rev 121234)
@@ -21,14 +21,21 @@
 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
 export USE_SHORT_LIBNAME=1

Modified: thunderbird.install
===================================================================
--- thunderbird.install	2011-04-29 16:46:13 UTC (rev 121233)
+++ thunderbird.install	2011-04-29 16:46:22 UTC (rev 121234)
@@ -1,5 +1,6 @@
 post_install() {
     update-desktop-database -q
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {