[arch-commits] Commit in gtk2/trunk (PKGBUILD revert-iconview.patch)

[Ionut Biru]

    Date: Wednesday, January 25, 2012 @ 10:42:18
  Author: ibiru
Revision: 147270

update to 2.24.9

Modified:
  gtk2/trunk/PKGBUILD
Deleted:
  gtk2/trunk/revert-iconview.patch

-----------------------+
 PKGBUILD              |   13 +++++--------
 revert-iconview.patch |   30 ------------------------------
 2 files changed, 5 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-25 13:57:06 UTC (rev 147269)
+++ PKGBUILD	2012-01-25 15:42:18 UTC (rev 147270)
@@ -3,8 +3,8 @@
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.8
-pkgrel=2
+pkgver=2.24.9
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -12,16 +12,13 @@
 options=('!libtool' '!docs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
-        xid-collision-debug.patch
-        revert-iconview.patch)
-sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '517b3d0797b27324b8fa042ce4b653334ff3b55e48b921de3485505b9ca99fba')
+        xid-collision-debug.patch)
+sha256sums=('84204bf24cac739fd979943127e7b29cb46b1017684aa24dce630faa01bcb61d'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
 build() {
     cd "$srcdir/gtk+-$pkgver"
     patch -Np1 -i "$srcdir/xid-collision-debug.patch"
-    patch -Np1 -i "$srcdir/revert-iconview.patch"
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \

Deleted: revert-iconview.patch
===================================================================
--- revert-iconview.patch	2012-01-25 13:57:06 UTC (rev 147269)
+++ revert-iconview.patch	2012-01-25 15:42:18 UTC (rev 147270)
@@ -1,30 +0,0 @@
-From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc at gnome.org>
-Date: Wed, 16 Nov 2011 22:38:45 +0000
-Subject: Revert "iconview: layout items immediately when setting a GtkTreeModel"
-
-It makes GtkIconView segfault on GTK 2.24.
-
-gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if
-there's a layout queued anyway, so we wouldn't end up in the same
-situation causing the crash the original patch is supposed to fix.
-
-This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663138
----
-diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
-index 62877fa..54b3f3b 100644
---- a/gtk/gtkiconview.c
-+++ b/gtk/gtkiconview.c
-@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
- 
-       gtk_icon_view_build_items (icon_view);
- 
--      gtk_icon_view_layout (icon_view);
-+      gtk_icon_view_queue_layout (icon_view);
-     }
- 
-   g_object_notify (G_OBJECT (icon_view), "model");  
---
-cgit v0.9.0.2