diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..362d10c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +xsettings-kde-0.11-20090829svn.tar.bz2 +/xsettings-kde-0.12.tar.bz2 diff --git a/dead.package b/dead.package deleted file mode 100644 index c23b1e9..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -old package (used in kde4 era), replaced by kde-gtk-config diff --git a/sources b/sources new file mode 100644 index 0000000..7ee017c --- /dev/null +++ b/sources @@ -0,0 +1 @@ +2a2c2bdab5d3f2c8cdf70884a57c6654 xsettings-kde-0.12.tar.bz2 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-0.9-kde4.patch b/xsettings-kde-0.9-kde4.patch new file mode 100644 index 0000000..ef9ee73 --- /dev/null +++ b/xsettings-kde-0.9-kde4.patch @@ -0,0 +1,12 @@ +diff -up xsettings-kde-0.9/xsettings-kde.c.kde4 xsettings-kde-0.9/xsettings-kde.c +--- xsettings-kde-0.9/xsettings-kde.c.kde4 2008-09-29 12:44:27.000000000 -0500 ++++ xsettings-kde-0.9/xsettings-kde.c 2008-12-30 23:34:27.000000000 -0600 +@@ -232,7 +232,7 @@ void readConfig () { + + user_file = 1; + if ((password = getpwuid (geteuid()))) { +- sprintf(filename, "%s/%s/share/config/%s",password->pw_dir, is_kde4 ? ".kde4" : ".kde", file_name[file_index]); ++ sprintf(filename, "%s/%s/share/config/%s",password->pw_dir, ".kde" , file_name[file_index]); + + if (access (filename, F_OK) == 0) { + file = fopen (filename, "r"); diff --git a/xsettings-kde.desktop b/xsettings-kde.desktop new file mode 100644 index 0000000..3c26a6c --- /dev/null +++ b/xsettings-kde.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Exec=xsettings-kde +Name=XSettings-KDE +X-KDE-autostart-after=kdesktop +Type=Service +OnlyShowIn=KDE; diff --git a/xsettings-kde.spec b/xsettings-kde.spec new file mode 100644 index 0000000..dd8e2ae --- /dev/null +++ b/xsettings-kde.spec @@ -0,0 +1,131 @@ + +Summary: XSettings Daemon for KDE +Name: xsettings-kde +Version: 0.12 +Release: 3%{?dist} +License: GPLv2+ +Group: User Interface/Desktops +Source0: ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/software/xsettings-kde/xsettings-kde-0.12.tar.bz2 +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 + +BuildRequires: glib2-devel +BuildRequires: libX11-devel + +%description +This package provides a XSettings daemon for KDE Desktop Environment. +It allows XSettings aware applications (all GTK+ 2 and GNOME 2 applications) +to be informed instantly of changes in KDE configuration, such as theme name, +default font and so on. + + +%prep +%setup -q + +%patch1 -p1 -b .kde4 +%patch2 -p1 -b .cursor-theme + + +%build + +make %{?_smp_mflags} CFLAGS="%{optflags}" lib=%{_lib} + + +%install +rm -rf %{buildroot} + +install -p -m755 -D xsettings-kde %{buildroot}%{_bindir}/xsettings-kde + +install -p -m644 -D %{SOURCE10} \ + %{buildroot}%{_datadir}/autostart/xsettings-kde.desktop + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc ChangeLog README COPYING +%{_bindir}/* +%{_datadir}/autostart/* + + +%changelog +* Mon Mar 14 2011 Kevin Kofler - 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 - 0.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Feb 07 2011 Rex Dieter 0.12-1 +- 0.12 + +* Mon Nov 29 2010 Kevin Kofler - 0.11-3 +- fix the gtk-menu-images patch to set the setting BEFORE notifying apps + +* Mon Nov 22 2010 Kevin Kofler - 0.11-2 +- make GTK+ apps display menu images in KDE + +* Sat Aug 29 2009 Rex Dieter - 0.11-1 +- xsettings-0.11 + +* Mon Jul 27 2009 Fedora Release Engineering - 0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jun 26 2009 Rex Dieter - 0.10-1 +- xsettings-0.10 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Dec 30 2008 Rex Dieter 0.9-1 +- resurrect latest kde4-enabled version, yay. + +* Sun Jan 27 2008 Manuel Wolfshant 0.6-3 +- small fixes + +* Sun Dec 30 2007 Rex Dieter 0.6-2 +- fedora-ize + +* Wed Sep 26 2007 Frederic Crozat 0.6-1mdv2008.0 ++ Revision: 93073 +- Release 0.6 : + -failover correctly when some configuration files aren't present + +* Fri Sep 21 2007 Frederic Crozat 0.5-1mdv2008.0 ++ Revision: 91946 +- Release 0.5 + - handle multiple kde profiles specified as prefixes + +* Fri Aug 31 2007 Adam Williamson 0.4-2mdv2008.0 ++ Revision: 76611 +- rebuild for 2008 +- don't package COPYING +- Import xsettings-kde + +* Wed Sep 13 2006 Frederic Crozat 0.4-1mdv2007.0 +- Release 0.4 : + * change theme according to color scheme for Ia Ora (Mdv bug #25574) + * fix theme detection + * support kde profile + * don't change theme if ~/.gtkrc-2.0 exists + +* Mon Mar 06 2006 Frederic Crozat 0.3-1mdk +- Release 0.3 : + - support Net/FallbackIconTheme, fix Mdk bug #19441) + +* Thu Aug 25 2005 Frederic Crozat 0.2-1mdk +- Release 0.2 : + - force gnome-vfs gtk2 file selector backend + +* Wed Jul 27 2005 Frederic Crozat 0.1-1mdk +- Initial package