[arch-commits] CVS update of extra/network/thunderbird (2 files)

[Alexander Baldeck]

    Date: Monday, October 15, 2007 @ 14:34:06
  Author: alexander
    Path: /home/cvs-extra/extra/network/thunderbird

   Added: mozilla-firefox-2.0.0.6-fixgtk212.patch (1.1)
Modified: PKGBUILD (1.11 -> 1.12)

* fixes FS#8120


-----------------------------------------+
 PKGBUILD                                |   15 +++++++++------
 mozilla-firefox-2.0.0.6-fixgtk212.patch |   13 +++++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)


Index: extra/network/thunderbird/PKGBUILD
diff -u extra/network/thunderbird/PKGBUILD:1.11 extra/network/thunderbird/PKGBUILD:1.12
--- extra/network/thunderbird/PKGBUILD:1.11	Thu Aug  2 07:04:48 2007
+++ extra/network/thunderbird/PKGBUILD	Mon Oct 15 14:34:06 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.11 2007/08/02 11:04:48 alexander Exp $
+# $Id: PKGBUILD,v 1.12 2007/10/15 18:34:06 alexander Exp $
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Dale Blount <dale at archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom at home.se>
 pkgname=thunderbird
 pkgver=2.0.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
@@ -12,8 +12,8 @@
 provides=('mozilla-thunderbird')
 conflicts=('mozilla-thunderbird')
 replaces=('mozilla-thunderbird')
-depends=('gtk2>=2.10.11' 'gcc' 'libidl2' 'mozilla-common' 'nss>=3.11.5' 'libxt')
-makedepends=('zip' 'pkgconfig' 'imagemagick')
+depends=('gtk2>=2.12.0' 'gcc' 'libidl2' 'mozilla-common' 'nss>=3.11.5' 'libxt')
+makedepends=('zip' 'pkgconfig' 'imagemagick' 'diffutils')
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}-source.tar.bz2
 	mozconfig
 	launcher.patch
@@ -23,7 +23,8 @@
 	firefox-visibility.patch
 	firefox-1.5-new-gtkim.patch
 	firefox-1.5-pango-cursor-position.patch
-	firefox-2.0-link-layout.patch)
+	firefox-2.0-link-layout.patch
+	mozilla-firefox-2.0.0.6-fixgtk212.patch)
 
 build() {
   export MAKEFLAGS="-j1"
@@ -34,6 +35,7 @@
   patch -Np1 -i ${startdir}/src/firefox-1.5-new-gtkim.patch || return 1
   patch -Np1 -i ${startdir}/src/firefox-1.5-pango-cursor-position.patch || return 1
   patch -Np1 -i ${startdir}/src/firefox-2.0-link-layout.patch || return 1
+  patch -Np1 -i ${startdir}/src/mozilla-firefox-2.0.0.6-fixgtk212.patch || return 1
 
   if [ "${CARCH}" = "x86_64" ]; then
     patch -Np0 -i ${startdir}/src/firefox-visibility.patch || return 1
@@ -93,4 +95,5 @@
          '362f9e0b0f25b964f7120b68fb629ee0'
          '60b4bbe73d2e919ee4a6476dca6705b6'
          '288fb7db871700ff5cf7286db6192b45'
-         'b933c00957ea793fe940f4d46a85e10e')
+         'b933c00957ea793fe940f4d46a85e10e'
+         'a1969b660d3ccfcb182383d058995a26')
Index: extra/network/thunderbird/mozilla-firefox-2.0.0.6-fixgtk212.patch
diff -u /dev/null extra/network/thunderbird/mozilla-firefox-2.0.0.6-fixgtk212.patch:1.1
--- /dev/null	Mon Oct 15 14:34:06 2007
+++ extra/network/thunderbird/mozilla-firefox-2.0.0.6-fixgtk212.patch	Mon Oct 15 14:34:06 2007
@@ -0,0 +1,13 @@
+--- mozilla/gfx/src/gtk/gtk2drawing.c.fixgtk212	2005-09-13 05:30:53.000000000 +0200
++++ mozilla/gfx/src/gtk/gtk2drawing.c	2007-09-06 09:42:34.000000000 +0200
+@@ -551,8 +551,8 @@ moz_gtk_option_menu_get_metrics(gboolean
+     else
+         *indicator_spacing = default_indicator_spacing;
+ 
+-    g_free(tmp_indicator_size);
+-    g_free(tmp_indicator_spacing);
++    gtk_requisition_free(tmp_indicator_size);
++    gtk_border_free(tmp_indicator_spacing);
+  
+     return MOZ_GTK_SUCCESS;
+ }