[xsettings-kde] * Mon Mar 14 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.12-3 - add support for Gtk/CursorThemeNa

[Kevin Kofler]

commit 8e834f965722a56e31bcc48f1008cb18753ee0aa
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Mar 14 19:07:04 2011 +0100

    * Mon Mar 14 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.12-3
    - add support for Gtk/CursorThemeName (#591746)
    - drop SVN checkout script, we have a tarball now

 xsettings-kde-0.12-cursor-theme.patch |   69 +++++++++++++++++++++++++++++++++
 xsettings-kde-0.12-svn_checkout.sh    |   17 --------
 xsettings-kde.spec                    |   11 ++++-
 3 files changed, 77 insertions(+), 20 deletions(-)
---
diff --git a/xsettings-kde-0.12-cursor-theme.patch b/xsettings-kde-0.12-cursor-theme.patch
new file mode 100644
index 0000000..68a268c
--- /dev/null
+++ b/xsettings-kde-0.12-cursor-theme.patch
@@ -0,0 +1,69 @@
+diff -ur xsettings-kde-0.12/xsettings-kde.c xsettings-kde-0.12-cursor-theme/xsettings-kde.c
+--- xsettings-kde-0.12/xsettings-kde.c	2011-02-07 10:41:38.000000000 +0100
++++ xsettings-kde-0.12-cursor-theme/xsettings-kde.c	2011-03-14 19:02:47.000000000 +0100
+@@ -57,6 +57,7 @@
+  * Net/FallbackIconTheme => supported
+  * Gtk/CanChangeAccels => not supported
+  * Gtk/ColorPalette => no added value
++ * Gtk/CursorThemeName => supported
+  * Gtk/FontName => supported
+  * Gtk/IconSizes => not really useful
+  * Gtk/KeyThemeName => not supported
+@@ -90,12 +91,14 @@
+ 	KDE,
+ 	Icons,
+ 	MainToolbarIcons,
+-	Directories
++	Directories,
++	Mouse
+ };
+ 
+-static char * file_name [2] = {
++static char * file_name [3] = {
+ 	"kdeglobals",
+-	"kcmfonts"
++	"kcmfonts",
++	"kcminputrc"
+ };
+ 
+ int readString (char *key, char * buffer, char *xsetting_key) {
+@@ -235,7 +238,7 @@
+ 		file = NULL;
+ 	}
+ 
+-      for (file_index = 0 ; file_index < 2 ; file_index++) {
++      for (file_index = 0 ; file_index < 3 ; file_index++) {
+ 
+ 	user_file = 0;
+ 	do {
+@@ -282,13 +285,17 @@
+ 					if (strncmp(buffer, "[KDE]", 5) == 0)
+ 						section = KDE;
+ 					else {
+-						if (strncmp(buffer, "[Icons]", 5) == 0)
++						if (strncmp(buffer, "[Icons]", 7) == 0)
+ 							section = Icons;
+ 						else { 
+ 							if (strncmp(buffer, "[MainToolbarIcons]", 18) == 0)
+ 							section = MainToolbarIcons;
+-							else 
+-							section = Unknown;
++							else {
++								if (strncmp(buffer, "[Mouse]", 7) == 0)
++								section = Mouse;
++								else
++								section = Unknown;
++							}
+ 						}
+ 					}
+ 				}
+@@ -389,6 +396,9 @@
+ 					}
+ 				}
+ 				break;
++			case Mouse:
++				notify |= readString ("cursorTheme", buffer, "Gtk/CursorThemeName");
++				break;
+ 			default: /* ignore the rest */
+ 				break;
+ 			}
diff --git a/xsettings-kde.spec b/xsettings-kde.spec
index 0520a49..dd8e2ae 100644
--- a/xsettings-kde.spec
+++ b/xsettings-kde.spec
@@ -2,17 +2,17 @@
 Summary: XSettings Daemon for KDE
 Name:    xsettings-kde
 Version: 0.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:   User Interface/Desktops 
-# upstream is a svn
 Source0: ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/software/xsettings-kde/xsettings-kde-0.12.tar.bz2
-Source1:  xsettings-kde-%{version}-svn_checkout.sh
 URL:	 http://viewvc.mageia.org/soft/theme/xsettings-kde/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # fedora doesn't use ~/.kde4 like mandriva
 Patch1: xsettings-kde-0.9-kde4.patch
+# add support for Gtk/CursorThemeName (#591746)
+Patch2: xsettings-kde-0.12-cursor-theme.patch
 
 Source10: xsettings-kde.desktop
 
@@ -30,6 +30,7 @@ default font and so on.
 %setup -q
 
 %patch1 -p1 -b .kde4
+%patch2 -p1 -b .cursor-theme
 
 
 %build
@@ -58,6 +59,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Mar 14 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.12-3
+- add support for Gtk/CursorThemeName (#591746)
+- drop SVN checkout script, we have a tarball now
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild