[packages/gtk+2] - updated to 2.24.20 - updated arch_confdir patch - adjusted to new immodules.cache handling

[qboosh]

commit 090ef0e5dd81c8d430267dd01796f36237d72b81
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 7 20:15:31 2013 +0200

    - updated to 2.24.20
    - updated arch_confdir patch
    - adjusted to new immodules.cache handling

 gtk+2-arch_confdir.patch | 25 +++++++------------------
 gtk+2.spec               | 14 +++++++-------
 2 files changed, 14 insertions(+), 25 deletions(-)
---
diff --git a/gtk+2.spec b/gtk+2.spec
index cfa4ad6..f9a68fc 100644
--- a/gtk+2.spec
+++ b/gtk+2.spec
@@ -14,13 +14,13 @@ Summary(it.UTF-8):	Il toolkit per GIMP
 Summary(pl.UTF-8):	GIMP Toolkit
 Summary(tr.UTF-8):	GIMP ToolKit arayüz kitaplığı
 Name:		gtk+2
-Version:	2.24.19
+Version:	2.24.20
 Release:	1
 Epoch:		2
 License:	LGPL v2+
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.24/gtk+-%{version}.tar.xz
-# Source0-md5:	490236abeb0d9351b2a34e9aca70e1de
+# Source0-md5:	9d7833331d7accd80668e29d7f567ce5
 Patch0:		%{name}-arch_confdir.patch
 Patch1:		gobject-introspection.patch
 Patch2:		%{name}-papi.patch
@@ -284,7 +284,7 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
 	m4datadir=%{_aclocaldir} \
 	pkgconfigdir=%{_pkgconfigdir}
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk.immodules
+touch $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{abivers}/immodules.cache
 
 cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -321,7 +321,7 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 umask 022
-%{_bindir}/gtk-query-immodules-2.0%{pqext} > %{_sysconfdir}/gtk.immodules
+%{_bindir}/gtk-query-immodules-2.0%{pqext} --update-cache
 exit 0
 
 %postun
@@ -332,14 +332,14 @@ if [ "$1" != "0" ]; then
 	# if we remove the other arch pkg will be still present.
 	# i.e we have installed gtk+2-2.16.5-1.x86_64 and gtk+2-2.16.5-1.i686, and remove gtk+2-2.16.5-1.i686
 	if [ -d %{_sysconfdir} ]; then
-		%{_bindir}/gtk-query-immodules-2.0%{pqext} > %{_sysconfdir}/gtk.immodules
+		%{_bindir}/gtk-query-immodules-2.0%{pqext} --update-cache
 	fi
 fi
 exit 0
 
 %triggerpostun -- gtk+2 < 2:2.4.0
 umask 022
-%{_bindir}/gtk-query-immodules-2.0%{pqext} > %{_sysconfdir}/gtk.immodules
+%{_bindir}/gtk-query-immodules-2.0%{pqext} --update-cache
 exit 0
 
 %triggerin -- hicolor-icon-theme
@@ -368,6 +368,7 @@ fi
 %dir %{_libdir}/gtk-2.0/%{abivers}/filesystems
 %dir %{_libdir}/gtk-2.0/%{abivers}/immodules
 %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/immodules/im-*.so
+%ghost %{_libdir}/gtk-2.0/%{abivers}/immodules.cache
 %dir %{_libdir}/gtk-2.0/%{abivers}/printbackends
 %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/printbackends/libprintbackend-file.so
 %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/printbackends/libprintbackend-lpr.so
@@ -377,7 +378,6 @@ fi
 
 %dir %{_sysconfdir}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/im-multipress.conf
-%ghost %{_sysconfdir}/gtk.immodules
 %dir %{_datadir}/themes/Default/gtk-*
 %{_datadir}/themes/Default/gtk-*/gtkrc
 %dir %{_datadir}/themes/Emacs
diff --git a/gtk+2-arch_confdir.patch b/gtk+2-arch_confdir.patch
index a108451..b271c09 100644
--- a/gtk+2-arch_confdir.patch
+++ b/gtk+2-arch_confdir.patch
@@ -1,14 +1,3 @@
---- gtk+-2.8.12/gtk/gtkrc.c	2005-11-23 15:24:51.000000000 +0100
-+++ gtk+-2.8.12.arch_confdir/gtk/gtkrc.c	2006-02-20 22:14:36.000000000 +0100
-@@ -364,7 +364,7 @@
-       if (im_module_file)
- 	result = g_strdup (im_module_file);
-       else
--	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	result = g_build_filename (GTK_SYSCONFDIR, "gtk.immodules", NULL);
-     }
- 
-   return result;
 --- 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 @@
@@ -55,14 +44,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;
+--- gtk+-2.24.20/gtk/gtkrc.c.orig	2013-07-07 14:53:53.881925617 +0200
++++ gtk+-2.24.20/gtk/gtkrc.c	2013-07-07 14:57:44.148582620 +0200
+@@ -533,7 +533,7 @@
+           g_free (str);
+         }
+ 
 -      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/090ef0e5dd81c8d430267dd01796f36237d72b81