[arch-commits] Commit in gtk2/trunk (PKGBUILD revert-iconview.patch)
Ionut Biru
ibiru at archlinux.org
Wed Nov 16 23:10:40 UTC 2011
Date: Wednesday, November 16, 2011 @ 18:10:40
Author: ibiru
Revision: 142843
fix lxappearance crash
Added:
gtk2/trunk/revert-iconview.patch
Modified:
gtk2/trunk/PKGBUILD
-----------------------+
PKGBUILD | 27 +++++++++++++++------------
revert-iconview.patch | 30 ++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-11-16 20:25:47 UTC (rev 142842)
+++ PKGBUILD 2011-11-16 23:10:40 UTC (rev 142843)
@@ -4,21 +4,24 @@
pkgbase=gtk2
pkgname=('gtk2' 'gtk-update-icon-cache')
pkgver=2.24.8
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.gtk.org/"
makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
options=('!libtool' '!docs')
license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
- xid-collision-debug.patch)
+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')
+ 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+ '517b3d0797b27324b8fa042ce4b653334ff3b55e48b921de3485505b9ca99fba')
build() {
- cd "${srcdir}/gtk+-${pkgver}"
- patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
+ 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 \
@@ -37,19 +40,19 @@
depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
backup=(etc/gtk-2.0/gtkrc)
- cd "${srcdir}/gtk+-${pkgver}"
+ cd "$srcdir/gtk+-$pkgver"
- make DESTDIR="${pkgdir}" install
+ make DESTDIR="$pkgdir" install
sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
- echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc"
+ echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc"
#split this out to use with gtk3 too
- rm ${pkgdir}/usr/bin/gtk-update-icon-cache
+ rm $pkgdir/usr/bin/gtk-update-icon-cache
}
package_gtk-update-icon-cache() {
pkgdesc="The GTK+ update icon cache tool"
depends=('gdk-pixbuf2')
- cd "${srcdir}/gtk+-${pkgver}/gtk"
+ cd "$srcdir/gtk+-$pkgver/gtk"
- install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache
+ install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache
}
Added: revert-iconview.patch
===================================================================
--- revert-iconview.patch (rev 0)
+++ revert-iconview.patch 2011-11-16 23:10:40 UTC (rev 142843)
@@ -0,0 +1,30 @@
+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
More information about the arch-commits
mailing list