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

[Ionut Biru]

    Date: Tuesday, November 29, 2011 @ 15:17:10
  Author: ibiru
Revision: 143839

proper fix segmentation for apps that use filechooser

Modified:
  gtk3/trunk/PKGBUILD
Deleted:
  gtk3/trunk/fix_crash_treeview.patch

--------------------------+
 PKGBUILD                 |    8 +++---
 fix_crash_treeview.patch |   55 ---------------------------------------------
 2 files changed, 4 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-29 20:05:21 UTC (rev 143838)
+++ PKGBUILD	2011-11-29 20:17:10 UTC (rev 143839)
@@ -3,7 +3,7 @@
 
 pkgname=gtk3
 pkgver=3.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="GTK+ is a multi-platform toolkit (v3)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -15,14 +15,14 @@
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz
         settings.ini
-        fix_crash_treeview.patch)
+        filechooserdefault_do_not_unref_value_twice.patch)
 sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84'
             'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            'eb187ef05f3735b24b58cd4c533dc3d4f616103cafba399c009ea3eb519be0b9')
+            '0d6b04d5fc12b7c08e0cff4b94d001d5c167a944b72579fb14fd6de2ee4ad9e6')
 
 build() {
     cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -R -i "$srcdir/fix_crash_treeview.patch"
+    patch -Np1 -i "$srcdir/filechooserdefault_do_not_unref_value_twice.patch"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \

Deleted: fix_crash_treeview.patch
===================================================================
--- fix_crash_treeview.patch	2011-11-29 20:05:21 UTC (rev 143838)
+++ fix_crash_treeview.patch	2011-11-29 20:17:10 UTC (rev 143839)
@@ -1,55 +0,0 @@
-From 456b19a35adbdc4b098e6da020c3a87cb62ae7f4 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte at redhat.com>
-Date: Thu, 10 Nov 2011 15:52:44 +0000
-Subject: a11y: Fix gcc warning
-
----
-diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c
-index 663bb51..b2ca9ba 100644
---- a/gtk/a11y/gtktreeviewaccessible.c
-+++ b/gtk/a11y/gtktreeviewaccessible.c
-@@ -238,7 +238,7 @@ gtk_tree_view_accessible_initialize (AtkObject *obj,
-   accessible->n_children_deleted = 0;
- 
-   accessible->cell_info_by_index = g_hash_table_new_full (g_int_hash,
--      g_int_equal, NULL, cell_info_free);
-+      g_int_equal, NULL, (GDestroyNotify) cell_info_free);
- 
-   widget = GTK_WIDGET (data);
-   tree_view = GTK_TREE_VIEW (widget);
---
-cgit v0.9.0.2
-From b25621173734ad1c9cee83802f7ac32ab7df20e7 Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
-Date: Wed, 09 Nov 2011 13:32:32 +0000
-Subject: gtktreeviewaccessible: use a value_destroy_func with the cell_info_by_index hash
-
-This ensures that we don't leak any GtkTreeViewAccessibleCellInfo when
-re-inserting a new one with the same key.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663694
----
-diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c
-index 046e253..4ad323c 100644
---- a/gtk/a11y/gtktreeviewaccessible.c
-+++ b/gtk/a11y/gtktreeviewaccessible.c
-@@ -237,7 +237,8 @@ gtk_tree_view_accessible_initialize (AtkObject *obj,
-   accessible->idle_expand_path = NULL;
-   accessible->n_children_deleted = 0;
- 
--  accessible->cell_info_by_index = g_hash_table_new (g_int_hash, g_int_equal);
-+  accessible->cell_info_by_index = g_hash_table_new_full (g_int_hash,
-+      g_int_equal, NULL, cell_info_free);
- 
-   widget = GTK_WIDGET (data);
-   tree_view = GTK_TREE_VIEW (widget);
-@@ -2845,7 +2846,6 @@ garbage_collect_cell_data (gpointer data)
-     {
-       if (!cell_info->in_use)
-         {
--          cell_info_free (cell_info);
-           g_hash_table_iter_remove (&iter);
-         }
-     }
---
-cgit v0.9.0.2