From 56913dc8679143308408596f2872f3894b3ab9d0 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 24 Jul 2012 00:01:46 +0000
Subject: Tue Jul 24 00:01:46 UTC 2012

---
 extra/gtk2/PKGBUILD | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'extra/gtk2/PKGBUILD')

diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 5081e813d..ee9859444 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163898 2012-07-21 19:20:18Z ibiru $
+# $Id: PKGBUILD 163911 2012-07-22 09:08:14Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
 pkgver=2.24.11
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -12,13 +12,16 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc
 options=('!libtool')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
-        xid-collision-debug.patch)
+        xid-collision-debug.patch
+        fix-stuck-grabs.patch)
 sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+            '7739a1ab04aaf6e7f87987bad106062456e71933bc50acd948160cc03634dcd9')
 
 build() {
-    cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -i "$srcdir/xid-collision-debug.patch"
+    cd gtk+-$pkgver
+    patch -Np1 -i ../xid-collision-debug.patch
+    patch -Np1 -i ../fix-stuck-grabs.patch
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
@@ -38,7 +41,7 @@ package_gtk2() {
     backup=(etc/gtk-2.0/gtkrc)
     replaces=('gtk2-docs')
 
-    cd "$srcdir/gtk+-$pkgver"
+    cd gtk+-$pkgver
 
     make DESTDIR="$pkgdir" install
     sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
@@ -50,7 +53,7 @@ package_gtk-update-icon-cache() {
     pkgdesc="The GTK+ update icon cache tool"
     depends=('gdk-pixbuf2>=2.24.1-3')
 
-    cd "$srcdir/gtk+-$pkgver/gtk"
+    cd gtk+-$pkgver/gtk
 
     install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache
 }
-- 
cgit v1.2.3-54-g00ecf