diff options
| author | root <root@rshg054.dnsready.net> | 2011-11-17 23:14:48 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-11-17 23:14:48 +0000 |
| commit | 029ccb02a25d48cdc39a7e749c17fa8bc9fb84e3 (patch) | |
| tree | 908f9408ef6f7dbb40964c3d7000ff4668efe6af /extra/gtk2 | |
| parent | b3531e5acd3f55613eddde5591eb2e880fa96ed8 (diff) | |
Thu Nov 17 23:14:48 UTC 2011
Diffstat (limited to 'extra/gtk2')
| -rw-r--r-- | extra/gtk2/PKGBUILD | 29 | ||||
| -rw-r--r-- | extra/gtk2/revert-iconview.patch | 30 |
2 files changed, 46 insertions, 13 deletions
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 2de31d047..dc8cc3ea2 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 142534 2011-11-11 18:06:50Z ibiru $ +# $Id: PKGBUILD 142844 2011-11-16 23:13:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> 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 @@ package_gtk2() { 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 } diff --git a/extra/gtk2/revert-iconview.patch b/extra/gtk2/revert-iconview.patch new file mode 100644 index 000000000..e16fc38e3 --- /dev/null +++ b/extra/gtk2/revert-iconview.patch @@ -0,0 +1,30 @@ +From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001 +From: Cosimo Cecchi <cosimoc@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 |