[arch-commits] Commit in lib32-gtk2/trunk (PKGBUILD gtkrc-fix.patch)

[Florian Pritz]

    Date: Tuesday, October 8, 2013 @ 15:16:04
  Author: bluewind
Revision: 98321

upgpkg: lib32-gtk2 2.24.21-1

upstream update

Added:
  lib32-gtk2/trunk/gtkrc-fix.patch
Modified:
  lib32-gtk2/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   12 +++++++-----
 gtkrc-fix.patch |   22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-08 13:08:38 UTC (rev 98320)
+++ PKGBUILD	2013-10-08 13:16:04 UTC (rev 98321)
@@ -5,8 +5,8 @@
 
 _pkgbasename=gtk2
 pkgname=lib32-$_pkgbasename
-pkgver=2.24.20
-pkgrel=2
+pkgver=2.24.21
+pkgrel=1
 pkgdesc="The GTK+ Toolkit (v2) (32-bit)"
 arch=('x86_64')
 url="http://www.gtk.org/"
@@ -18,14 +18,16 @@
 options=('!libtool' '!docs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-        xid-collision-debug.patch)
-sha256sums=('cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3'
-'d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+        xid-collision-debug.patch gtkrc-fix.patch)
+sha256sums=('302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+            '4038c0f1ef4cc052e469858abe32eaa8afc8d4f540760f18ad132986e396604d')
 
 prepare() {
   cd "${srcdir}/gtk+-${pkgver}"
 
   patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
+  patch -Np1 -i ../gtkrc-fix.patch
 }
 
 build() {

Added: gtkrc-fix.patch
===================================================================
--- gtkrc-fix.patch	                        (rev 0)
+++ gtkrc-fix.patch	2013-10-08 13:16:04 UTC (rev 98321)
@@ -0,0 +1,22 @@
+From 1b8d3b9210c1d2201bb01a748d748f5d17e9eb4f Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at 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