[packages/gtk+2] fix path to system gtkrc

glen glen at pld-linux.org
Sat Mar 2 15:00:22 CET 2013


commit 631511a4ef287ca23d8fa50592ce90826e46fb94
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Mar 2 15:58:42 2013 +0200

    fix path to system gtkrc

 gtk+2-arch_confdir.patch | 26 +++++++++++---------------
 gtk+2.spec               |  4 ++--
 2 files changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/gtk+2.spec b/gtk+2.spec
index 395d523..515f049 100644
--- a/gtk+2.spec
+++ b/gtk+2.spec
@@ -4,7 +4,7 @@
 %bcond_without	cups		# disable CUPS support
 %bcond_without	papi		# disable PAPI support
 %bcond_without	static_libs	# don't build static library
-#
+
 Summary:	The GIMP Toolkit
 Summary(cs.UTF-8):	Sada nástrojů pro GIMP
 Summary(de.UTF-8):	Der GIMP-Toolkit
@@ -15,7 +15,7 @@ Summary(pl.UTF-8):	GIMP Toolkit
 Summary(tr.UTF-8):	GIMP ToolKit arayüz kitaplığı
 Name:		gtk+2
 Version:	2.24.16
-Release:	1
+Release:	2
 Epoch:		2
 License:	LGPL v2+
 Group:		X11/Libraries
diff --git a/gtk+2-arch_confdir.patch b/gtk+2-arch_confdir.patch
index c98bc56..a108451 100644
--- a/gtk+2-arch_confdir.patch
+++ b/gtk+2-arch_confdir.patch
@@ -9,21 +9,6 @@
      }
  
    return result;
-#--- gtk+-2.8.12/gtk-zip.sh.in	2006-02-07 23:57:06.000000000 +0100
-#+++ gtk+-2.8.12.arch_confdir/gtk-zip.sh.in	2006-02-20 22:12:22.000000000 +0100
-#@@ -9,9 +9,9 @@
-# 
-# zip $ZIP -@ <<EOF
-# COPYING.LIB-2
-#-etc/gtk-2.0/gdk-pixbuf.loaders
-#-etc/gtk-2.0/gtkrc
-#-etc/gtk-2.0/gtk.immodules
-#+etc/gtk-2.0- at ARCH@/gdk-pixbuf.loaders
-#+etc/gtk-2.0- at ARCH@/gtkrc
-#+etc/gtk-2.0- at ARCH@/gtk.immodules
-# bin/libgdk_pixbuf- at GTK_API_VERSION@- at LT_CURRENT_MINUS_AGE@.dll
-# bin/libgdk-win32- at GTK_API_VERSION@- at LT_CURRENT_MINUS_AGE@.dll
-# bin/libgtk-win32- at GTK_API_VERSION@- at LT_CURRENT_MINUS_AGE@.dll
 --- gtk+-2.8.12/modules/input/Makefile.am	2005-06-05 00:08:50.000000000 +0200
 +++ gtk+-2.8.12.arch_confdir/modules/input/Makefile.am	2006-02-20 22:14:07.000000000 +0100
 @@ -101,10 +102,10 @@
@@ -70,3 +55,14 @@
  dist_imconffile_DATA = im-multipress.conf
  
  if CROSS_COMPILING
+--- gtk+-2.24.16/gtk/gtkrc.c~	2013-03-02 15:40:51.000000000 +0200
++++ gtk+-2.24.16/gtk/gtkrc.c	2013-03-02 15:56:13.321139207 +0200
+@@ -522,7 +522,7 @@
+   else
+     {
+       const gchar *home;
+-      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
++      str = g_build_filename (GTK_SYSCONFDIR, "gtkrc", NULL);
+ 
+       gtk_rc_add_default_file (str);
+       g_free (str);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtk+2.git/commitdiff/631511a4ef287ca23d8fa50592ce90826e46fb94



More information about the pld-cvs-commit mailing list