rpms/kcm-gtk/F-12 kcm-gtk-0.5.3-gtkrc_setenv.patch, NONE, 1.1 kcm-gtk.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 kcm-gtk.spec, 1.1, 1.2 sources, 1.2, 1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kcm-gtk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8467/F-12

Modified Files:
	.cvsignore kcm-gtk.spec sources 
Added Files:
	kcm-gtk-0.5.3-gtkrc_setenv.patch kcm-gtk.sh 
Log Message:
* Fri Oct 30 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.3-1
- kcm-gtk-0.5.3
- .gtkrc-2.0-kde4 doesn't get used (#531788)


kcm-gtk-0.5.3-gtkrc_setenv.patch:
 gtkrcfile.cpp |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE kcm-gtk-0.5.3-gtkrc_setenv.patch ---
diff -up kcm-gtk-0.5.3/gtkrcfile.cpp.gtkrc_setenv kcm-gtk-0.5.3/gtkrcfile.cpp
--- kcm-gtk-0.5.3/gtkrcfile.cpp.gtkrc_setenv	2009-10-23 08:07:44.000000000 -0500
+++ kcm-gtk-0.5.3/gtkrcfile.cpp	2009-10-30 12:42:28.186035811 -0500
@@ -26,6 +26,8 @@
 #include <QTextStream>
 #include <QStringList>
 #include <QtDebug>
+#include <ktoolinvocation.h>
+#include <klauncher_iface.h>
 
 QRegExp GtkRcFile::k_themeNameRe("([^/]+)/gtk-2.0/gtkrc$");
 
@@ -134,6 +136,14 @@ void GtkRcFile::save()
 	stream << "\n";
 	stream << "gtk-theme-name=\"" << m_themeName << "\"\n";
 	stream << "gtk-font-name=\"" << fontName << "\"\n";
+	
+	QByteArray gtkrc = getenv("GTK2_RC_FILES");
+	QStringList list = QFile::decodeName(gtkrc).split( ':');
+	if (!list.contains(m_fileName)) {
+	  list.append(m_fileName);
+	  QString value = QFile::encodeName(list.join(":"));
+	  KToolInvocation::klauncher()->setLaunchEnv("GTK2_RC_FILES", value);
+	}
 }
 
 void GtkRcFile::setFont(const QString& family, int pointSize, bool bold, bool italic)


--- NEW FILE kcm-gtk.sh ---
#!/bin/sh

# Make sure our customised gtkrc file is loaded.
GTK2RC_KDE4=${HOME}/.gtkrc-2.0-kde4
if [ -z "${GTK2_RC_FILES}" ]; then
  GTK2_RC_FILES=${GTK2RC_KDE4}
elif ! echo ${GTK2_RC_FILES} | /bin/grep -q ${GTK2RC_KDE4} ; then
  GTK2_RC_FILES=${GTK2_RC_FILES}:${GTK2RC_KDE4}
fi
unset GTK2RC_KDE4

export GTK2_RC_FILES


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Oct 2009 20:27:03 -0000	1.2
+++ .cvsignore	30 Oct 2009 17:49:01 -0000	1.3
@@ -1 +1 @@
-kcm-gtk_0.5.1.orig.tar.gz
+kcm-gtk_0.5.3.orig.tar.gz


Index: kcm-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-12/kcm-gtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kcm-gtk.spec	26 Oct 2009 20:27:03 -0000	1.1
+++ kcm-gtk.spec	30 Oct 2009 17:49:01 -0000	1.2
@@ -3,23 +3,30 @@
 
 Summary: Configure the appearance of GTK apps in KDE 
 Name:    kcm-gtk 
-Version: 0.5.1 
-Release: 2%{?dist}
+Version: 0.5.3
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:   User Interface/Desktops
 URL:     https://launchpad.net/kcm-gtk 
-Source0: http://launchpad.net/kcm-gtk/trunk/0.5.1/+download/kcm-gtk_%{version}.orig.tar.gz 
+Source0: http://launchpad.net/kcm-gtk/0.5.x/%{version}/+download/kcm-gtk_%{version}.orig.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+# set GTK2_RC_FILES=~/.gtkrc-2.0-kde4
+Source1: kcm-gtk.sh
+
 ## upstreamable patches
 # Categories += Settings, else doesn't appear in systemsettings anywhere (?)
 Patch50: kcm-gtk-0.5.1-settings_category.patch
+# ensures GTK2_RC_FILES gets used/updated on first use, avoids 
+# possible need for logout/login, code borrowed from kdebase-workspace's krdb.cpp
+Patch51: kcm-gtk-0.5.3-gtkrc_setenv.patch
 
 %if 0%{?fedora} > 11
 Obsoletes: gtk-qt-engine <= 1:1.1
 %endif
 
+BuildRequires: gettext
 BuildRequires: kdelibs4-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -32,6 +39,7 @@ appearance of GTK apps in KDE.
 %setup -q 
 
 %patch50 -p1 -b .settings_category
+%patch51 -p1 -b .gtkrc_setenv
 
 
 
@@ -50,20 +58,29 @@ rm -rf %{buildroot} 
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%find_lang kcm_gtk
+
+install -p -m644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/kcm-gtk.sh
+
 
 %clean
 rm -rf %{buildroot} 
 
 
-%files 
+%files -f kcm_gtk.lang
 %defattr(-,root,root,-)
 %doc Changelog COPYING
+%{_sysconfdir}/kde/env/kcm-gtk.sh
 %{_kde4_libdir}/kde4/kcm_gtk.so
 %{_kde4_iconsdir}/kcm_gtk.png
 %{_kde4_datadir}/kde4/services/kcmgtk.desktop
 
 
 %changelog
+* Fri Oct 30 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.3-1
+- kcm-gtk-0.5.3
+- .gtkrc-2.0-kde4 doesn't get used (#531788)
+
 * Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-2
 - Requires: kde4-macros(api)...
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Oct 2009 20:27:04 -0000	1.2
+++ sources	30 Oct 2009 17:49:01 -0000	1.3
@@ -1 +1 @@
-adc2d8dd60aa74a744a89860b903b0b0  kcm-gtk_0.5.1.orig.tar.gz
+b49e2df3cce3bcb8c6dc96e7af73716d  kcm-gtk_0.5.3.orig.tar.gz