wok-next rev 11577

gtk+: Fix GtkIconView segfault (thank mojo)
author Antoine Bodin <gokhlayeh@slitaz.org>
date Mon Jan 02 23:06:19 2012 +0100 (2012-01-02)
parents 87d98b449875
children 68e8b7bddb27
files gtk+/receipt gtk+/stuff/revert-iconview.patch
line diff
     1.1 --- a/gtk+/receipt	Mon Jan 02 23:06:19 2012 +0100
     1.2 +++ b/gtk+/receipt	Mon Jan 02 23:06:19 2012 +0100
     1.3 @@ -22,14 +22,17 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 -    cd $src
     1.8 -    ./configure \
     1.9 -    	--prefix=/usr \
    1.10 -    	--sysconfdir=/etc \
    1.11 -    	--with-html-dir=/usr/share/doc \
    1.12 +	cd $src
    1.13 +
    1.14 +	patch -Np1 -i "$stuff/revert-iconview.patch"
    1.15 +
    1.16 +	./configure \
    1.17 +		--prefix=/usr \
    1.18 +		--sysconfdir=/etc \
    1.19 +		--with-html-dir=/usr/share/doc \
    1.20  		--build=$HOST_SYSTEM --host=$HOST_SYSTEM &&
    1.21 -    make $MAKEFLAGS &&
    1.22 -    make DESTDIR=$DESTDIR install
    1.23 +	make $MAKEFLAGS &&
    1.24 +	make DESTDIR=$DESTDIR install
    1.25  }
    1.26  
    1.27  # Rules to gen a SliTaz package suitable for Tazpkg.
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/gtk+/stuff/revert-iconview.patch	Mon Jan 02 23:06:19 2012 +0100
     2.3 @@ -0,0 +1,30 @@
     2.4 +From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001
     2.5 +From: Cosimo Cecchi <cosimoc@gnome.org>
     2.6 +Date: Wed, 16 Nov 2011 22:38:45 +0000
     2.7 +Subject: Revert "iconview: layout items immediately when setting a GtkTreeModel"
     2.8 +
     2.9 +It makes GtkIconView segfault on GTK 2.24.
    2.10 +
    2.11 +gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if
    2.12 +there's a layout queued anyway, so we wouldn't end up in the same
    2.13 +situation causing the crash the original patch is supposed to fix.
    2.14 +
    2.15 +This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1.
    2.16 +
    2.17 +https://bugzilla.gnome.org/show_bug.cgi?id=663138
    2.18 +---
    2.19 +diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
    2.20 +index 62877fa..54b3f3b 100644
    2.21 +--- a/gtk/gtkiconview.c
    2.22 ++++ b/gtk/gtkiconview.c
    2.23 +@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
    2.24 +
    2.25 +       gtk_icon_view_build_items (icon_view);
    2.26 +
    2.27 +-      gtk_icon_view_layout (icon_view);
    2.28 ++      gtk_icon_view_queue_layout (icon_view);
    2.29 +     }
    2.30 +
    2.31 +   g_object_notify (G_OBJECT (icon_view), "model");
    2.32 +--
    2.33 +cgit v0.9.0.2