From 20bff71e3bf43ce7f3621da9cee37eb6ea3c14ad Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 12 Oct 2013 00:05:36 -0700
Subject: Sat Oct 12 00:05:35 PDT 2013

---
 extra/gtk2/PKGBUILD        | 14 ++++++--------
 extra/gtk2/gtkrc-fix.patch | 22 ----------------------
 2 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 extra/gtk2/gtkrc-fix.patch

(limited to 'extra/gtk2')

diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index e35ebeaf5..b533e863d 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196102 2013-10-07 11:52:32Z jgc $
+# $Id: PKGBUILD 196328 2013-10-11 14:41:41Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.21
-pkgrel=2
+pkgver=2.24.22
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -12,16 +12,14 @@ 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
-        gtkrc xid-collision-debug.patch gtkrc-fix.patch)
-sha256sums=('302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3'
+        gtkrc xid-collision-debug.patch)
+sha256sums=('b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f'
             'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '4038c0f1ef4cc052e469858abe32eaa8afc8d4f540760f18ad132986e396604d')
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
 prepare() {
     cd gtk+-$pkgver
     patch -Np1 -i ../xid-collision-debug.patch
-    patch -Np1 -i ../gtkrc-fix.patch
 }
 
 build() {
diff --git a/extra/gtk2/gtkrc-fix.patch b/extra/gtk2/gtkrc-fix.patch
deleted file mode 100644
index 09e350e98..000000000
--- a/extra/gtk2/gtkrc-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 1b8d3b9210c1d2201bb01a748d748f5d17e9eb4f Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 30 Sep 2013 16:50:34 +0000
-Subject: Actually look in /usr/share/gtk-2.0 for default rc files
-
-I managed to forget the 'share' component of the path.
----
-diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
-index b1f68e2..50b2563 100644
---- a/gtk/gtkrc.c
-+++ b/gtk/gtkrc.c
-@@ -525,7 +525,7 @@ gtk_rc_add_initial_default_files (void)
-       const gchar * const *config_dirs;
-       const gchar *config_dir;
- 
--      str = g_build_filename (GTK_DATA_PREFIX, "gtk-2.0", "gtkrc", NULL);
-+      str = g_build_filename (GTK_DATA_PREFIX, "share", "gtk-2.0", "gtkrc", NULL);
-       gtk_rc_add_default_file (str);
-       g_free (str);
- 
---
-cgit v0.9.2
-- 
cgit v1.2.3-54-g00ecf