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

[Alexander Baldeck]

    Date: Monday, October 15, 2007 @ 13:44:36
  Author: alexander
    Path: /home/cvs-extra/extra/network/firefox

   Added: mozilla-firefox-2.0.0.6-fixgtk212.patch (1.1)
Modified: PKGBUILD (1.14 -> 1.15)

* fixes FS#8120


-----------------------------------------+
 PKGBUILD                                |   12 +++++++-----
 mozilla-firefox-2.0.0.6-fixgtk212.patch |   13 +++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)


Index: extra/network/firefox/PKGBUILD
diff -u extra/network/firefox/PKGBUILD:1.14 extra/network/firefox/PKGBUILD:1.15
--- extra/network/firefox/PKGBUILD:1.14	Tue Sep 18 17:06:52 2007
+++ extra/network/firefox/PKGBUILD	Mon Oct 15 13:44:36 2007
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD,v 1.14 2007/09/18 21:06:52 andyrtr Exp $
+# $Id: PKGBUILD,v 1.15 2007/10/15 17:44:36 alexander Exp $
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Dale Blount <dale at archlinux.org>
 # Contributer: Nick Penwarden <toth64 at yahoo.com>
 pkgname=firefox
 pkgver=2.0.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(i686 x86_64)
 license=('MPL' 'GPL' 'LGPL')
 depends=('gtk2>=2.10.11' 'pango>=1.16.1' 'gcc' 'libxt' 'libidl2' 'mozilla-common' 'nss>=3.11.7' 'desktop-file-utils')
-makedepends=('zip' 'imagemagick' 'pkgconfig')
+makedepends=('zip' 'imagemagick' 'pkgconfig' 'diffutils')
 replaces=('mozilla-firebird' 'phoenix' 'mozilla-firefox')
 conflicts=('mozilla-firefox')
 provides=('mozilla-firefox')
@@ -27,8 +27,10 @@
 	firefox-1.5-pango-cursor-position.patch
 	firefox-2.0-add-ldflags.patch
 	firefox-2.0-buildversion.patch
+	mozilla-firefox-2.0.0.6-fixgtk212.patch
         firefox.desktop
 	firefox-safe.desktop)
+options=('!makeflags')
 md5sums=('ec14cf833d75d07190c4095345d688bd'
          'b6b9a0977d33f79b79d58f0b501578e7'
          '224962b5f2446cab7727fdf07fd526de'
@@ -41,9 +43,9 @@
          '288fb7db871700ff5cf7286db6192b45'
          '25f355113cdee6800380c6e1a4cd38f0'
          '11b221ff41078d97c131e17361072e47'
+         'a1969b660d3ccfcb182383d058995a26'
          '74ea70c9e935f0e7f7b75436fe33efd5'
          '5e68cabfcf3c021806b326f664ac505e')
-options=('!makeflags')
 
 build() {
   cd ${startdir}/src/mozilla
@@ -56,6 +58,7 @@
   patch -Np1 -i ${startdir}/src/firefox-1.5-pango-cursor-position.patch || return 1
   patch -Np0 -i ${startdir}/src/firefox-2.0-add-ldflags.patch || return 1
   patch -Np0 -i ${startdir}/src/firefox-2.0-buildversion.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 ../firefox-visibility.patch || return 1
@@ -96,4 +99,3 @@
   install -m644 ${startdir}/src/mozilla/browser/app/default.xpm ${startdir}/pkg/opt/mozilla/lib/firefox/chrome/icons/default/
   install -m644 ${startdir}/src/mozilla/browser/app/default.xpm ${startdir}/pkg/opt/mozilla/lib/firefox/icons/
 }
-
Index: extra/network/firefox/mozilla-firefox-2.0.0.6-fixgtk212.patch
diff -u /dev/null extra/network/firefox/mozilla-firefox-2.0.0.6-fixgtk212.patch:1.1
--- /dev/null	Mon Oct 15 13:44:36 2007
+++ extra/network/firefox/mozilla-firefox-2.0.0.6-fixgtk212.patch	Mon Oct 15 13:44:36 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;
+ }