[arch-commits] Commit in gtk2/trunk (PKGBUILD gtkrc-fix.patch)
Jan Steffens
heftig at nymeria.archlinux.org
Fri Oct 11 14:20:04 UTC 2013
Date: Friday, October 11, 2013 @ 16:20:04
Author: heftig
Revision: 196322
2.24.22
Modified:
gtk2/trunk/PKGBUILD
Deleted:
gtk2/trunk/gtkrc-fix.patch
-----------------+
PKGBUILD | 12 +++++-------
gtkrc-fix.patch | 22 ----------------------
2 files changed, 5 insertions(+), 29 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-10-11 13:53:14 UTC (rev 196321)
+++ PKGBUILD 2013-10-11 14:20:04 UTC (rev 196322)
@@ -3,8 +3,8 @@
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 @@
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() {
Deleted: gtkrc-fix.patch
===================================================================
--- gtkrc-fix.patch 2013-10-11 13:53:14 UTC (rev 196321)
+++ gtkrc-fix.patch 2013-10-11 14:20:04 UTC (rev 196322)
@@ -1,22 +0,0 @@
-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
More information about the arch-commits
mailing list