[arch-commits] Commit in gtk3/trunk (PKGBUILD empty_grid.patch)

[Ionut Biru]

    Date: Thursday, December 29, 2011 @ 05:09:17
  Author: ibiru
Revision: 145726

fix crash on treeview edit. FS#27708

Added:
  gtk3/trunk/empty_grid.patch
Modified:
  gtk3/trunk/PKGBUILD

------------------+
 PKGBUILD         |    9 ++++++---
 empty_grid.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-28 19:13:07 UTC (rev 145725)
+++ PKGBUILD	2011-12-29 10:09:17 UTC (rev 145726)
@@ -3,7 +3,7 @@
 
 pkgname=gtk3
 pkgver=3.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ is a multi-platform toolkit (v3)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -14,12 +14,15 @@
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz
-        settings.ini)
+        settings.ini
+        empty_grid.patch)
 sha256sums=('e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
+            'd05ccfeaf4c558668b72aaacdd11356b6419d2359def6c1b9af1b465fa5a3c25')
 
 build() {
     cd "$srcdir/gtk+-$pkgver"
+    patch -Np1 -i "$srcdir/empty_grid.patch"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \

Added: empty_grid.patch
===================================================================
--- empty_grid.patch	                        (rev 0)
+++ empty_grid.patch	2011-12-29 10:09:17 UTC (rev 145726)
@@ -0,0 +1,29 @@
+From 97c1df4bb05966a4ce53b07271eff2f53284e235 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Fri, 21 Oct 2011 20:23:03 +0000
+Subject: Fix natural/min widht calculations for empty grids
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660139
+---
+diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
+index a122ad4..78ae2ff 100644
+--- a/gtk/gtkgrid.c
++++ b/gtk/gtkgrid.c
+@@ -927,8 +927,13 @@ gtk_grid_request_sum (GtkGridRequest *request,
+   linedata = &priv->linedata[orientation];
+   lines = &request->lines[orientation];
+ 
+-  min = (nonempty - 1) * linedata->spacing;
+-  nat = (nonempty - 1) * linedata->spacing;
++  min = 0;
++  nat = 0;
++  if (nonempty > 0)
++    {
++      min = (nonempty - 1) * linedata->spacing;
++      nat = (nonempty - 1) * linedata->spacing;
++    }
+ 
+   for (i = 0; i < lines->max - lines->min; i++)
+     {
+--
+cgit v0.9.0.2