From a25b033f4382fce7aad318d80f60624e80d94051 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:13:12 +0000 Subject: [PATCH 01/40] Initialize branch F-10 for xsettings-kde --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 975b736cc73de09ec3004e65e21a1940b8a947e0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 31 Dec 2008 05:37:48 +0000 Subject: [PATCH 02/40] - resurrect latest kde4-enabled version, yay. --- .cvsignore | 1 + sources | 1 + xsettings-kde-0.9-kde4.patch | 12 ++++ xsettings-kde-0.9-svn_checkout.sh | 17 +++++ xsettings-kde.desktop | 8 +++ xsettings-kde.spec | 101 ++++++++++++++++++++++++++++++ 6 files changed, 140 insertions(+) create mode 100644 xsettings-kde-0.9-kde4.patch create mode 100755 xsettings-kde-0.9-svn_checkout.sh create mode 100644 xsettings-kde.desktop create mode 100644 xsettings-kde.spec diff --git a/.cvsignore b/.cvsignore index e69de29..3999039 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xsettings-kde-0.9-20081230svn.tar.bz2 diff --git a/sources b/sources index e69de29..fd0776a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +4bcb0db445ced7c585755625e0f2c9df xsettings-kde-0.9-20081230svn.tar.bz2 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-0.9-svn_checkout.sh b/xsettings-kde-0.9-svn_checkout.sh new file mode 100755 index 0000000..2ae30af --- /dev/null +++ b/xsettings-kde-0.9-svn_checkout.sh @@ -0,0 +1,17 @@ +#/bin/sh + +DATE=$(date +%Y%m%d) +MODULE="$(basename $0 -svn_checkout.sh)" +SVNROOT=http://svn.mandriva.com/svn/soft/theme/xsettings-kde/tags/V0_9_1mdv/ + +set -x +rm -rf $MODULE + +svn export $SVNROOT $MODULE + +## tar it up +tar cjf $MODULE-${DATE}svn.tar.bz2 $MODULE + +## cleanup +rm -rf $MODULE + diff --git a/xsettings-kde.desktop b/xsettings-kde.desktop new file mode 100644 index 0000000..c517f1c --- /dev/null +++ b/xsettings-kde.desktop @@ -0,0 +1,8 @@ +[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..5fa2c20 --- /dev/null +++ b/xsettings-kde.spec @@ -0,0 +1,101 @@ + +Summary: XSettings Daemon for KDE +Name: xsettings-kde +Version: 0.9 +Release: 1%{?dist} +License: GPLv2+ +Group: User Interface/Desktops +# upstream is a svn +Source0: %{name}-%{version}-20081230svn.tar.bz2 +Source1: xsettings-kde-0.9-svn_checkout.sh +URL: http://svn.mandriva.com/cgi-bin/viewvc.cgi/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 + +Source10: xsettings-kde.desktop + +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 + + +%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 +* 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 From 9f9092a3bf811253c6ee87a7a36c49a774d940a8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 31 Dec 2008 21:52:21 +0000 Subject: [PATCH 03/40] - resurrect latest kde4-enabled version, yay. --- .cvsignore | 1 + sources | 1 + xsettings-kde-0.9-kde4.patch | 12 ++++ xsettings-kde-0.9-svn_checkout.sh | 17 +++++ xsettings-kde.desktop | 8 +++ xsettings-kde.spec | 101 ++++++++++++++++++++++++++++++ 6 files changed, 140 insertions(+) create mode 100644 xsettings-kde-0.9-kde4.patch create mode 100755 xsettings-kde-0.9-svn_checkout.sh create mode 100644 xsettings-kde.desktop create mode 100644 xsettings-kde.spec diff --git a/.cvsignore b/.cvsignore index e69de29..3999039 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xsettings-kde-0.9-20081230svn.tar.bz2 diff --git a/sources b/sources index e69de29..fd0776a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +4bcb0db445ced7c585755625e0f2c9df xsettings-kde-0.9-20081230svn.tar.bz2 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-0.9-svn_checkout.sh b/xsettings-kde-0.9-svn_checkout.sh new file mode 100755 index 0000000..2ae30af --- /dev/null +++ b/xsettings-kde-0.9-svn_checkout.sh @@ -0,0 +1,17 @@ +#/bin/sh + +DATE=$(date +%Y%m%d) +MODULE="$(basename $0 -svn_checkout.sh)" +SVNROOT=http://svn.mandriva.com/svn/soft/theme/xsettings-kde/tags/V0_9_1mdv/ + +set -x +rm -rf $MODULE + +svn export $SVNROOT $MODULE + +## tar it up +tar cjf $MODULE-${DATE}svn.tar.bz2 $MODULE + +## cleanup +rm -rf $MODULE + diff --git a/xsettings-kde.desktop b/xsettings-kde.desktop new file mode 100644 index 0000000..c517f1c --- /dev/null +++ b/xsettings-kde.desktop @@ -0,0 +1,8 @@ +[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..5fa2c20 --- /dev/null +++ b/xsettings-kde.spec @@ -0,0 +1,101 @@ + +Summary: XSettings Daemon for KDE +Name: xsettings-kde +Version: 0.9 +Release: 1%{?dist} +License: GPLv2+ +Group: User Interface/Desktops +# upstream is a svn +Source0: %{name}-%{version}-20081230svn.tar.bz2 +Source1: xsettings-kde-0.9-svn_checkout.sh +URL: http://svn.mandriva.com/cgi-bin/viewvc.cgi/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 + +Source10: xsettings-kde.desktop + +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 + + +%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 +* 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 From 2afba816f6ddb908bd2b5ffcc1a42027c9662f3d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 12:04:03 +0000 Subject: [PATCH 04/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xsettings-kde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 5fa2c20..b1ae12e 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: User Interface/Desktops # upstream is a svn @@ -57,6 +57,9 @@ rm -rf %{buildroot} %changelog +* 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. From 764d19479e9888184642c7d8524a909e4d62d805 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 27 Jun 2009 01:35:26 +0000 Subject: [PATCH 05/40] - xsettings-0.10 --- .cvsignore | 2 +- sources | 2 +- ..._checkout.sh => xsettings-kde-0.10-svn_checkout.sh | 2 +- xsettings-kde.desktop | 2 -- xsettings-kde.spec | 11 +++++++---- 5 files changed, 10 insertions(+), 9 deletions(-) rename xsettings-kde-0.9-svn_checkout.sh => xsettings-kde-0.10-svn_checkout.sh (95%) diff --git a/.cvsignore b/.cvsignore index 3999039..07da367 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xsettings-kde-0.9-20081230svn.tar.bz2 +xsettings-kde-0.10-20090626svn.tar.bz2 diff --git a/sources b/sources index fd0776a..2734364 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4bcb0db445ced7c585755625e0f2c9df xsettings-kde-0.9-20081230svn.tar.bz2 +79df02a7ee43e2e2523e5469ca5e12a8 xsettings-kde-0.10-20090626svn.tar.bz2 diff --git a/xsettings-kde-0.9-svn_checkout.sh b/xsettings-kde-0.10-svn_checkout.sh similarity index 95% rename from xsettings-kde-0.9-svn_checkout.sh rename to xsettings-kde-0.10-svn_checkout.sh index 2ae30af..10f4366 100755 --- a/xsettings-kde-0.9-svn_checkout.sh +++ b/xsettings-kde-0.10-svn_checkout.sh @@ -2,7 +2,7 @@ DATE=$(date +%Y%m%d) MODULE="$(basename $0 -svn_checkout.sh)" -SVNROOT=http://svn.mandriva.com/svn/soft/theme/xsettings-kde/tags/V0_9_1mdv/ +SVNROOT=http://svn.mandriva.com/svn/soft/theme/xsettings-kde/tags/V0_10_1mdv/ set -x rm -rf $MODULE diff --git a/xsettings-kde.desktop b/xsettings-kde.desktop index c517f1c..3c26a6c 100644 --- a/xsettings-kde.desktop +++ b/xsettings-kde.desktop @@ -4,5 +4,3 @@ Name=XSettings-KDE X-KDE-autostart-after=kdesktop Type=Service OnlyShowIn=KDE; - - diff --git a/xsettings-kde.spec b/xsettings-kde.spec index b1ae12e..ea8f49e 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -1,13 +1,13 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde -Version: 0.9 -Release: 2%{?dist} +Version: 0.10 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops # upstream is a svn -Source0: %{name}-%{version}-20081230svn.tar.bz2 -Source1: xsettings-kde-0.9-svn_checkout.sh +Source0: %{name}-%{version}-20090626svn.tar.bz2 +Source1: xsettings-kde-%{version}-svn_checkout.sh URL: http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/theme/xsettings-kde/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -57,6 +57,9 @@ rm -rf %{buildroot} %changelog +* 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 From d437c1645891399e09fcbdd00f1b7b51cdcb878b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 27 Jun 2009 01:44:31 +0000 Subject: [PATCH 06/40] BR: glib2-devel --- xsettings-kde.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index ea8f49e..e2794ec 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -16,6 +16,7 @@ Patch1: xsettings-kde-0.9-kde4.patch Source10: xsettings-kde.desktop +BuildRequires: glib2-devel BuildRequires: libX11-devel %description From 4bd596012b2dc5209c60cb57585d263c6195f614 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:45:25 +0000 Subject: [PATCH 07/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xsettings-kde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index e2794ec..558a742 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: User Interface/Desktops # upstream is a svn @@ -58,6 +58,9 @@ rm -rf %{buildroot} %changelog +* 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 From 1507b345397687f523b7d1975fa286281bb2f738 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 29 Aug 2009 18:01:46 +0000 Subject: [PATCH 08/40] - xsettings-0.11 --- .cvsignore | 2 +- sources | 2 +- ...svn_checkout.sh => xsettings-kde-0.11-svn_checkout.sh | 2 +- xsettings-kde.spec | 9 ++++++--- 4 files changed, 9 insertions(+), 6 deletions(-) rename xsettings-kde-0.10-svn_checkout.sh => xsettings-kde-0.11-svn_checkout.sh (95%) diff --git a/.cvsignore b/.cvsignore index 07da367..aff6366 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xsettings-kde-0.10-20090626svn.tar.bz2 +xsettings-kde-0.11-20090829svn.tar.bz2 diff --git a/sources b/sources index 2734364..5dd0ba4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79df02a7ee43e2e2523e5469ca5e12a8 xsettings-kde-0.10-20090626svn.tar.bz2 +ec6f797883068c1c25609d864e425cd8 xsettings-kde-0.11-20090829svn.tar.bz2 diff --git a/xsettings-kde-0.10-svn_checkout.sh b/xsettings-kde-0.11-svn_checkout.sh similarity index 95% rename from xsettings-kde-0.10-svn_checkout.sh rename to xsettings-kde-0.11-svn_checkout.sh index 10f4366..4023bdf 100755 --- a/xsettings-kde-0.10-svn_checkout.sh +++ b/xsettings-kde-0.11-svn_checkout.sh @@ -2,7 +2,7 @@ DATE=$(date +%Y%m%d) MODULE="$(basename $0 -svn_checkout.sh)" -SVNROOT=http://svn.mandriva.com/svn/soft/theme/xsettings-kde/tags/V0_10_1mdv/ +SVNROOT=http://svn.mandriva.com/svn/soft/theme/xsettings-kde/tags/V0_11_1mdv/ set -x rm -rf $MODULE diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 558a742..d0403d7 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -1,12 +1,12 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde -Version: 0.10 -Release: 2%{?dist} +Version: 0.11 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops # upstream is a svn -Source0: %{name}-%{version}-20090626svn.tar.bz2 +Source0: %{name}-%{version}-20090829svn.tar.bz2 Source1: xsettings-kde-%{version}-svn_checkout.sh URL: http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/theme/xsettings-kde/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -58,6 +58,9 @@ rm -rf %{buildroot} %changelog +* 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 From 9d5f851d18cce5155ae3ff75ce01af4c6094d6af Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 24 Oct 2009 14:35:59 +0000 Subject: [PATCH 09/40] - xsettings-0.11 --- .cvsignore | 2 +- sources | 2 +- ...t.sh => xsettings-kde-0.11-svn_checkout.sh | 2 +- xsettings-kde.desktop | 2 -- xsettings-kde.spec | 19 ++++++++++++++++--- 5 files changed, 19 insertions(+), 8 deletions(-) rename xsettings-kde-0.9-svn_checkout.sh => xsettings-kde-0.11-svn_checkout.sh (95%) diff --git a/.cvsignore b/.cvsignore index 3999039..aff6366 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xsettings-kde-0.9-20081230svn.tar.bz2 +xsettings-kde-0.11-20090829svn.tar.bz2 diff --git a/sources b/sources index fd0776a..5dd0ba4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4bcb0db445ced7c585755625e0f2c9df xsettings-kde-0.9-20081230svn.tar.bz2 +ec6f797883068c1c25609d864e425cd8 xsettings-kde-0.11-20090829svn.tar.bz2 diff --git a/xsettings-kde-0.9-svn_checkout.sh b/xsettings-kde-0.11-svn_checkout.sh similarity index 95% rename from xsettings-kde-0.9-svn_checkout.sh rename to xsettings-kde-0.11-svn_checkout.sh index 2ae30af..4023bdf 100755 --- a/xsettings-kde-0.9-svn_checkout.sh +++ b/xsettings-kde-0.11-svn_checkout.sh @@ -2,7 +2,7 @@ DATE=$(date +%Y%m%d) MODULE="$(basename $0 -svn_checkout.sh)" -SVNROOT=http://svn.mandriva.com/svn/soft/theme/xsettings-kde/tags/V0_9_1mdv/ +SVNROOT=http://svn.mandriva.com/svn/soft/theme/xsettings-kde/tags/V0_11_1mdv/ set -x rm -rf $MODULE diff --git a/xsettings-kde.desktop b/xsettings-kde.desktop index c517f1c..3c26a6c 100644 --- a/xsettings-kde.desktop +++ b/xsettings-kde.desktop @@ -4,5 +4,3 @@ Name=XSettings-KDE X-KDE-autostart-after=kdesktop Type=Service OnlyShowIn=KDE; - - diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 5fa2c20..d0403d7 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -1,13 +1,13 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde -Version: 0.9 +Version: 0.11 Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops # upstream is a svn -Source0: %{name}-%{version}-20081230svn.tar.bz2 -Source1: xsettings-kde-0.9-svn_checkout.sh +Source0: %{name}-%{version}-20090829svn.tar.bz2 +Source1: xsettings-kde-%{version}-svn_checkout.sh URL: http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/theme/xsettings-kde/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,6 +16,7 @@ Patch1: xsettings-kde-0.9-kde4.patch Source10: xsettings-kde.desktop +BuildRequires: glib2-devel BuildRequires: libX11-devel %description @@ -57,6 +58,18 @@ rm -rf %{buildroot} %changelog +* 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. From 61ddbb512727ed35586c7d37afcc7721d386af3f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:41:07 +0000 Subject: [PATCH 10/40] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1513d4d..4598aec 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xsettings-kde SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f770d1255d4184f42e210e526e552cb40b517170 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:14 +0000 Subject: [PATCH 11/40] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1513d4d..4598aec 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xsettings-kde SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 64a6f22e91d2bc9b0d1c3420b633fb5b593321ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:13:17 +0000 Subject: [PATCH 12/40] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4598aec..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xsettings-kde -# $Id$ -NAME := xsettings-kde -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 From 1404993db2d0faa50b00b1acfa888eb702ebc406 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:13:18 +0000 Subject: [PATCH 13/40] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4598aec..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xsettings-kde -# $Id$ -NAME := xsettings-kde -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 5d11628eaec6e297985c59c1ec53ff7fb82951fc Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 22 Nov 2010 03:00:19 +0100 Subject: [PATCH 14/40] * Mon Nov 22 2010 Kevin Kofler - 0.11-2 - make GTK+ apps display menu images in KDE --- xsettings-kde-0.11-gtk-menu-images.patch | 24 ++++++++++++++++++++++++ xsettings-kde.spec | 8 +++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 xsettings-kde-0.11-gtk-menu-images.patch diff --git a/xsettings-kde-0.11-gtk-menu-images.patch b/xsettings-kde-0.11-gtk-menu-images.patch new file mode 100644 index 0000000..3a8493e --- /dev/null +++ b/xsettings-kde-0.11-gtk-menu-images.patch @@ -0,0 +1,24 @@ +diff -ur xsettings-kde-0.11/xsettings-kde.c xsettings-kde-0.11-gtk-menu-images/xsettings-kde.c +--- xsettings-kde-0.11/xsettings-kde.c 2009-08-19 12:01:38.000000000 +0200 ++++ xsettings-kde-0.11-gtk-menu-images/xsettings-kde.c 2010-11-22 02:42:26.000000000 +0100 +@@ -67,7 +67,7 @@ + * Gtk/Modules => not supported + * Gtk/FileChooserBackend => forced to gnome-vfs + * Gtk/ButtonImages => supported +- * Gtk/MenuImages => can't be configured in KDE ++ * Gtk/MenuImages => can't be configured in KDE, always set to true + * Gtk/MenuBarAccel => not supported + * Xft/Antialias => KDE uses .fonts.conf directly + * Xft/Hinting => KDE uses .fonts.conf directly +@@ -469,6 +469,11 @@ + xsettings_manager_notify (managers[i]); + } + } ++ ++ /* KDE always shows menu images, so make sure GTK+ does, too */ ++ for (i = 0 ; i < max_display ; i++) { ++ xsettings_manager_set_int(managers[i], "Gtk/MenuImages", 1); ++ } + } + + void initial_init () { diff --git a/xsettings-kde.spec b/xsettings-kde.spec index d0403d7..29739b7 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: User Interface/Desktops # upstream is a svn @@ -13,6 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora doesn't use ~/.kde4 like mandriva Patch1: xsettings-kde-0.9-kde4.patch +# make GTK+ apps display menu images in KDE +Patch2: xsettings-kde-0.11-gtk-menu-images.patch Source10: xsettings-kde.desktop @@ -30,6 +32,7 @@ default font and so on. %setup -q %patch1 -p1 -b .kde4 +%patch2 -p1 -b .gtk-menu-images %build @@ -58,6 +61,9 @@ rm -rf %{buildroot} %changelog +* 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 From e55fbb9d0282da4dec4cdea668bf19fb4264afc5 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 30 Nov 2010 00:03:47 +0100 Subject: [PATCH 15/40] * Mon Nov 29 2010 Kevin Kofler - 0.11-3 - fix the gtk-menu-images patch to set the setting BEFORE notifying apps --- xsettings-kde-0.11-gtk-menu-images.patch | 17 +++++++++-------- xsettings-kde.spec | 5 ++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/xsettings-kde-0.11-gtk-menu-images.patch b/xsettings-kde-0.11-gtk-menu-images.patch index 3a8493e..cbad324 100644 --- a/xsettings-kde-0.11-gtk-menu-images.patch +++ b/xsettings-kde-0.11-gtk-menu-images.patch @@ -1,6 +1,6 @@ diff -ur xsettings-kde-0.11/xsettings-kde.c xsettings-kde-0.11-gtk-menu-images/xsettings-kde.c --- xsettings-kde-0.11/xsettings-kde.c 2009-08-19 12:01:38.000000000 +0200 -+++ xsettings-kde-0.11-gtk-menu-images/xsettings-kde.c 2010-11-22 02:42:26.000000000 +0100 ++++ xsettings-kde-0.11-gtk-menu-images/xsettings-kde.c 2010-11-30 00:02:07.000000000 +0100 @@ -67,7 +67,7 @@ * Gtk/Modules => not supported * Gtk/FileChooserBackend => forced to gnome-vfs @@ -10,15 +10,16 @@ diff -ur xsettings-kde-0.11/xsettings-kde.c xsettings-kde-0.11-gtk-menu-images/x * Gtk/MenuBarAccel => not supported * Xft/Antialias => KDE uses .fonts.conf directly * Xft/Hinting => KDE uses .fonts.conf directly -@@ -469,6 +469,11 @@ - xsettings_manager_notify (managers[i]); - } +@@ -464,6 +464,12 @@ + notify = 1; } -+ + + /* KDE always shows menu images, so make sure GTK+ does, too */ + for (i = 0 ; i < max_display ; i++) { + xsettings_manager_set_int(managers[i], "Gtk/MenuImages", 1); + } - } - - void initial_init () { ++ notify = 1; /* TODO: eliminate this variable, as this makes it useless */ ++ + if (notify) { + for (i = 0 ; i < max_display ; i++) { + xsettings_manager_notify (managers[i]); diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 29739b7..34e7383 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.11 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: User Interface/Desktops # upstream is a svn @@ -61,6 +61,9 @@ rm -rf %{buildroot} %changelog +* 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 From da866c830e8417b6490567882840ff9194a4bd95 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 30 Nov 2010 00:08:05 +0100 Subject: [PATCH 16/40] Move the unconditional setting to initial_init, there's no point in having it in readConfig. --- xsettings-kde-0.11-gtk-menu-images.patch | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/xsettings-kde-0.11-gtk-menu-images.patch b/xsettings-kde-0.11-gtk-menu-images.patch index cbad324..1997448 100644 --- a/xsettings-kde-0.11-gtk-menu-images.patch +++ b/xsettings-kde-0.11-gtk-menu-images.patch @@ -1,6 +1,6 @@ diff -ur xsettings-kde-0.11/xsettings-kde.c xsettings-kde-0.11-gtk-menu-images/xsettings-kde.c --- xsettings-kde-0.11/xsettings-kde.c 2009-08-19 12:01:38.000000000 +0200 -+++ xsettings-kde-0.11-gtk-menu-images/xsettings-kde.c 2010-11-30 00:02:07.000000000 +0100 ++++ xsettings-kde-0.11-gtk-menu-images/xsettings-kde.c 2010-11-30 00:07:05.000000000 +0100 @@ -67,7 +67,7 @@ * Gtk/Modules => not supported * Gtk/FileChooserBackend => forced to gnome-vfs @@ -10,16 +10,12 @@ diff -ur xsettings-kde-0.11/xsettings-kde.c xsettings-kde-0.11-gtk-menu-images/x * Gtk/MenuBarAccel => not supported * Xft/Antialias => KDE uses .fonts.conf directly * Xft/Hinting => KDE uses .fonts.conf directly -@@ -464,6 +464,12 @@ - notify = 1; - } - -+ /* KDE always shows menu images, so make sure GTK+ does, too */ -+ for (i = 0 ; i < max_display ; i++) { +@@ -485,6 +485,8 @@ + for (i = 0 ; i < max_display ; i++) { + xsettings_manager_set_string(managers[i], "Gtk/FileChooserBackend", "gio"); + xsettings_manager_set_string(managers[i], "Net/FallbackIconTheme", "gnome"); ++ /* KDE always shows menu images, so make sure GTK+ does, too */ + xsettings_manager_set_int(managers[i], "Gtk/MenuImages", 1); -+ } -+ notify = 1; /* TODO: eliminate this variable, as this makes it useless */ -+ - if (notify) { - for (i = 0 ; i < max_display ; i++) { - xsettings_manager_notify (managers[i]); + xsettings_manager_notify (managers[i]); + } + } From 4db7ddd3607d367b02750775ad1cddc7823b609a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 7 Feb 2011 08:07:03 -0600 Subject: [PATCH 17/40] - 0.12 --- .gitignore | 1 + sources | 2 +- xsettings-kde-0.11-gtk-menu-images.patch | 21 ------------------- ...t.sh => xsettings-kde-0.12-svn_checkout.sh | 2 +- xsettings-kde.spec | 14 ++++++------- 5 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 xsettings-kde-0.11-gtk-menu-images.patch rename xsettings-kde-0.11-svn_checkout.sh => xsettings-kde-0.12-svn_checkout.sh (72%) diff --git a/.gitignore b/.gitignore index aff6366..362d10c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xsettings-kde-0.11-20090829svn.tar.bz2 +/xsettings-kde-0.12.tar.bz2 diff --git a/sources b/sources index 5dd0ba4..7ee017c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec6f797883068c1c25609d864e425cd8 xsettings-kde-0.11-20090829svn.tar.bz2 +2a2c2bdab5d3f2c8cdf70884a57c6654 xsettings-kde-0.12.tar.bz2 diff --git a/xsettings-kde-0.11-gtk-menu-images.patch b/xsettings-kde-0.11-gtk-menu-images.patch deleted file mode 100644 index 1997448..0000000 --- a/xsettings-kde-0.11-gtk-menu-images.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur xsettings-kde-0.11/xsettings-kde.c xsettings-kde-0.11-gtk-menu-images/xsettings-kde.c ---- xsettings-kde-0.11/xsettings-kde.c 2009-08-19 12:01:38.000000000 +0200 -+++ xsettings-kde-0.11-gtk-menu-images/xsettings-kde.c 2010-11-30 00:07:05.000000000 +0100 -@@ -67,7 +67,7 @@ - * Gtk/Modules => not supported - * Gtk/FileChooserBackend => forced to gnome-vfs - * Gtk/ButtonImages => supported -- * Gtk/MenuImages => can't be configured in KDE -+ * Gtk/MenuImages => can't be configured in KDE, always set to true - * Gtk/MenuBarAccel => not supported - * Xft/Antialias => KDE uses .fonts.conf directly - * Xft/Hinting => KDE uses .fonts.conf directly -@@ -485,6 +485,8 @@ - for (i = 0 ; i < max_display ; i++) { - xsettings_manager_set_string(managers[i], "Gtk/FileChooserBackend", "gio"); - xsettings_manager_set_string(managers[i], "Net/FallbackIconTheme", "gnome"); -+ /* KDE always shows menu images, so make sure GTK+ does, too */ -+ xsettings_manager_set_int(managers[i], "Gtk/MenuImages", 1); - xsettings_manager_notify (managers[i]); - } - } diff --git a/xsettings-kde-0.11-svn_checkout.sh b/xsettings-kde-0.12-svn_checkout.sh similarity index 72% rename from xsettings-kde-0.11-svn_checkout.sh rename to xsettings-kde-0.12-svn_checkout.sh index 4023bdf..7fd9f43 100755 --- a/xsettings-kde-0.11-svn_checkout.sh +++ b/xsettings-kde-0.12-svn_checkout.sh @@ -2,7 +2,7 @@ DATE=$(date +%Y%m%d) MODULE="$(basename $0 -svn_checkout.sh)" -SVNROOT=http://svn.mandriva.com/svn/soft/theme/xsettings-kde/tags/V0_11_1mdv/ +SVNROOT=http://viewvc.mageia.org/soft/theme/xsettings-kde/tags/V0_12_0/ set -x rm -rf $MODULE diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 34e7383..71e401a 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -1,20 +1,18 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde -Version: 0.11 -Release: 3%{?dist} +Version: 0.12 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops # upstream is a svn -Source0: %{name}-%{version}-20090829svn.tar.bz2 +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://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/theme/xsettings-kde/ +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 -# make GTK+ apps display menu images in KDE -Patch2: xsettings-kde-0.11-gtk-menu-images.patch Source10: xsettings-kde.desktop @@ -32,7 +30,6 @@ default font and so on. %setup -q %patch1 -p1 -b .kde4 -%patch2 -p1 -b .gtk-menu-images %build @@ -61,6 +58,9 @@ rm -rf %{buildroot} %changelog +* 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 From ce4c850a4a5e116ae335ad523cbcc3fbd17d9dba Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 00:58:45 -0600 Subject: [PATCH 18/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xsettings-kde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 71e401a..0520a49 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: User Interface/Desktops # upstream is a svn @@ -58,6 +58,9 @@ rm -rf %{buildroot} %changelog +* 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 From 8e834f965722a56e31bcc48f1008cb18753ee0aa Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 14 Mar 2011 19:07:04 +0100 Subject: [PATCH 19/40] * Mon Mar 14 2011 Kevin Kofler - 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(-) create mode 100644 xsettings-kde-0.12-cursor-theme.patch delete mode 100755 xsettings-kde-0.12-svn_checkout.sh 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.12-svn_checkout.sh b/xsettings-kde-0.12-svn_checkout.sh deleted file mode 100755 index 7fd9f43..0000000 --- a/xsettings-kde-0.12-svn_checkout.sh +++ /dev/null @@ -1,17 +0,0 @@ -#/bin/sh - -DATE=$(date +%Y%m%d) -MODULE="$(basename $0 -svn_checkout.sh)" -SVNROOT=http://viewvc.mageia.org/soft/theme/xsettings-kde/tags/V0_12_0/ - -set -x -rm -rf $MODULE - -svn export $SVNROOT $MODULE - -## tar it up -tar cjf $MODULE-${DATE}svn.tar.bz2 $MODULE - -## cleanup -rm -rf $MODULE - 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 - 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 From 6b29f8ef67f7c35ab824f2ba6536830a2f94e870 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Thu, 17 Mar 2011 18:41:17 +0100 Subject: [PATCH 20/40] * Thu Mar 17 2011 Kevin Kofler - 0.12-4 - update upstream URL (viewvc -> svnweb) --- xsettings-kde.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index dd8e2ae..86458ff 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,11 +2,11 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12 -Release: 3%{?dist} +Release: 4%{?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/ +URL: http://svnweb.mageia.org/soft/theme/xsettings-kde/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora doesn't use ~/.kde4 like mandriva @@ -59,6 +59,9 @@ rm -rf %{buildroot} %changelog +* Thu Mar 17 2011 Kevin Kofler - 0.12-4 +- update upstream URL (viewvc -> svnweb) + * Mon Mar 14 2011 Kevin Kofler - 0.12-3 - add support for Gtk/CursorThemeName (#591746) - drop SVN checkout script, we have a tarball now From 392d6c349708e09645cedb6fb86d2e548396a17b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 6 Aug 2011 10:58:25 -0500 Subject: [PATCH 21/40] 0.12.2 --- .gitignore | 1 + sources | 2 +- xsettings-kde-0.12-cursor-theme.patch | 69 --------------------------- xsettings-kde.spec | 12 ++--- 4 files changed, 8 insertions(+), 76 deletions(-) delete mode 100644 xsettings-kde-0.12-cursor-theme.patch diff --git a/.gitignore b/.gitignore index 362d10c..320da56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xsettings-kde-0.11-20090829svn.tar.bz2 /xsettings-kde-0.12.tar.bz2 +/xsettings-kde-0.12.2.tar.bz2 diff --git a/sources b/sources index 7ee017c..521f8e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a2c2bdab5d3f2c8cdf70884a57c6654 xsettings-kde-0.12.tar.bz2 +31d2e6b07f49dd25c1e909594ed69489 xsettings-kde-0.12.2.tar.bz2 diff --git a/xsettings-kde-0.12-cursor-theme.patch b/xsettings-kde-0.12-cursor-theme.patch deleted file mode 100644 index 68a268c..0000000 --- a/xsettings-kde-0.12-cursor-theme.patch +++ /dev/null @@ -1,69 +0,0 @@ -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 86458ff..7ba2ddb 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -1,18 +1,16 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde -Version: 0.12 -Release: 4%{?dist} +Version: 0.12.2 +Release: 1%{?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 +Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 URL: http://svnweb.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,7 +28,6 @@ default font and so on. %setup -q %patch1 -p1 -b .kde4 -%patch2 -p1 -b .cursor-theme %build @@ -59,6 +56,9 @@ rm -rf %{buildroot} %changelog +* Sat Aug 06 2011 Rex Dieter 0.12.2-1 +- 0.12.2 + * Thu Mar 17 2011 Kevin Kofler - 0.12-4 - update upstream URL (viewvc -> svnweb) From a2b916dbad7c44b5bc800ea8e4cc92c432f2ddff Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 22 Sep 2011 08:41:59 -0500 Subject: [PATCH 22/40] RFE: Gtk/IMModule support (#727822) --- xsettings-kde-0.12.2-immmodule.patch | 115 +++++++++++++++++++++++++++ xsettings-kde.spec | 9 ++- 2 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 xsettings-kde-0.12.2-immmodule.patch diff --git a/xsettings-kde-0.12.2-immmodule.patch b/xsettings-kde-0.12.2-immmodule.patch new file mode 100644 index 0000000..8f54e86 --- /dev/null +++ b/xsettings-kde-0.12.2-immmodule.patch @@ -0,0 +1,115 @@ +--- xsettings-kde-0.12.orig/xsettings-kde.c 2011-09-07 14:20:50.841919049 +0900 ++++ xsettings-kde-0.12.orig/xsettings-kde.c 2011-09-08 11:58:55.615007305 +0900 +@@ -32,9 +32,13 @@ + #include + #include + #include ++#include + + #include "xsettings-manager.h" + ++#define IMMODULE_SCHEMA "org.gnome.desktop.interface" ++#define IMMODULE_KEY "gtk-im-module" ++ + static XSettingsManager **managers; + static int max_display; + static int is_kde4; +@@ -65,6 +69,7 @@ terminate_cb (void *data) + * Gtk/ToolbarIconSize => implemented but disabled, doesn't seem to work in GTK+ + * Gtk/IMPreeditStyle => not supported + * Gtk/IMStatusStyle => not supported ++ * Gtk/IMModule => supported + * Gtk/Modules => not supported + * Gtk/FileChooserBackend => forced to gnome-vfs + * Gtk/ButtonImages => supported +@@ -189,6 +194,41 @@ int readDPI(char *buffer) + return 0; + } + ++static gboolean ++check_gsettings_schema (const gchar *schema) ++{ ++ const gchar * const *schemas = g_settings_list_schemas (); ++ gint i; ++ ++ for (i = 0; schemas[i] != NULL; i++) { ++ if (g_strcmp0 (schemas[i], schema) == 0) ++ return TRUE; ++ } ++ g_warning ("Settings schema '%s' is not installed.", schema); ++ ++ return FALSE; ++} ++ ++static void ++gsettings_changed (GSettings *settings, ++ const char *key, ++ gpointer user_data) ++{ ++ gchar *val; ++ gint i; ++ ++ if (g_strcmp0 (key, IMMODULE_KEY)) { ++ /* deal with Gtk/IMModule only so far */ ++ return; ++ } ++ ++ val = g_settings_get_string (settings, key); ++ for (i = 0; i < max_display; i++) { ++ xsettings_manager_set_string (managers[i], "Gtk/IMModule", val); ++ xsettings_manager_notify (managers[i]); ++ } ++ g_free(val); ++} + + void readConfig () { + FILE *file = NULL; +@@ -484,6 +524,17 @@ void readConfig () { + void initial_init () { + int i; + const char *kde_version; ++ GSettings *settings = NULL; ++ gchar *vgtkimm = NULL; ++ ++ if (check_gsettings_schema (IMMODULE_SCHEMA)) { ++ settings = g_settings_new (IMMODULE_SCHEMA); ++ g_signal_connect (settings, "changed", ++ G_CALLBACK (gsettings_changed), NULL); ++ ++ vgtkimm = g_settings_get_string (settings, ++ IMMODULE_KEY); ++ } + + kde_version = getenv("KDE_SESSION_VERSION"); + +@@ -497,8 +548,11 @@ void initial_init () { + xsettings_manager_set_string(managers[i], "Net/FallbackIconTheme", "gnome"); + /* KDE always shows menu images, so make sure GTK+ does, too */ + xsettings_manager_set_int(managers[i], "Gtk/MenuImages", 1); ++ if (vgtkimm) ++ xsettings_manager_set_string (managers[i], "Gtk/IMModule", vgtkimm); + xsettings_manager_notify (managers[i]); + } ++ g_free(vgtkimm); + } + + struct xevent_data { +@@ -515,6 +569,10 @@ xevent_handle (gpointer user_data) + int i; + + while (1) { ++ if (!XPending(xev->display)) { ++ sleep(2); ++ continue; ++ } + XNextEvent (xev->display, &xevent); + + for (i = 0 ; i < max_display ; i++) { +@@ -551,6 +609,7 @@ int main (int argc, char **argv) { + GMainLoop *loop; + + g_thread_init(NULL); ++ g_type_init(); + + xev.display = XOpenDisplay (NULL); + if (xev.display == NULL) { diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 7ba2ddb..d91f599 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: User Interface/Desktops Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 @@ -12,6 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora doesn't use ~/.kde4 like mandriva Patch1: xsettings-kde-0.9-kde4.patch +## upstreamable patches +Patch50: xsettings-kde-0.12.2-immmodule.patch + Source10: xsettings-kde.desktop BuildRequires: glib2-devel @@ -28,6 +31,7 @@ default font and so on. %setup -q %patch1 -p1 -b .kde4 +%patch50 -p1 -b .immodule %build @@ -56,6 +60,9 @@ rm -rf %{buildroot} %changelog +* Thu Sep 22 2011 Rex Dieter 0.12.2-2 +- RFE: Gtk/IMModule support (#727822) + * Sat Aug 06 2011 Rex Dieter 0.12.2-1 - 0.12.2 From 40cb3aac4e0fa4cd519ffbb9adb87b2fa4a80c7e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:19:28 -0600 Subject: [PATCH 23/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xsettings-kde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index d91f599..c653772 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: User Interface/Desktops Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 @@ -60,6 +60,9 @@ rm -rf %{buildroot} %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.12.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Sep 22 2011 Rex Dieter 0.12.2-2 - RFE: Gtk/IMModule support (#727822) From c51c39db2eaa5c80bfa793978983f3927229caa9 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 17 Jan 2012 23:11:23 +0100 Subject: [PATCH 24/40] * Tue Jan 17 2012 Kevin Kofler - 0.12.3-1 - update to 0.12.3 - drop upstreamed immodule patch - rewrite Net/ThemeName handling: set it based on .gtkrc-2.0-kde4 (kcm-gtk) --- .gitignore | 1 + sources | 2 +- xsettings-kde-0.12.2-immmodule.patch | 115 --------------------------- xsettings-kde.spec | 16 +++- 4 files changed, 14 insertions(+), 120 deletions(-) delete mode 100644 xsettings-kde-0.12.2-immmodule.patch diff --git a/.gitignore b/.gitignore index 320da56..697744a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xsettings-kde-0.11-20090829svn.tar.bz2 /xsettings-kde-0.12.tar.bz2 /xsettings-kde-0.12.2.tar.bz2 +/xsettings-kde-0.12.3.tar.bz2 diff --git a/sources b/sources index 521f8e3..fe44157 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31d2e6b07f49dd25c1e909594ed69489 xsettings-kde-0.12.2.tar.bz2 +312375c139d9acfef4abadc1e22b9449 xsettings-kde-0.12.3.tar.bz2 diff --git a/xsettings-kde-0.12.2-immmodule.patch b/xsettings-kde-0.12.2-immmodule.patch deleted file mode 100644 index 8f54e86..0000000 --- a/xsettings-kde-0.12.2-immmodule.patch +++ /dev/null @@ -1,115 +0,0 @@ ---- xsettings-kde-0.12.orig/xsettings-kde.c 2011-09-07 14:20:50.841919049 +0900 -+++ xsettings-kde-0.12.orig/xsettings-kde.c 2011-09-08 11:58:55.615007305 +0900 -@@ -32,9 +32,13 @@ - #include - #include - #include -+#include - - #include "xsettings-manager.h" - -+#define IMMODULE_SCHEMA "org.gnome.desktop.interface" -+#define IMMODULE_KEY "gtk-im-module" -+ - static XSettingsManager **managers; - static int max_display; - static int is_kde4; -@@ -65,6 +69,7 @@ terminate_cb (void *data) - * Gtk/ToolbarIconSize => implemented but disabled, doesn't seem to work in GTK+ - * Gtk/IMPreeditStyle => not supported - * Gtk/IMStatusStyle => not supported -+ * Gtk/IMModule => supported - * Gtk/Modules => not supported - * Gtk/FileChooserBackend => forced to gnome-vfs - * Gtk/ButtonImages => supported -@@ -189,6 +194,41 @@ int readDPI(char *buffer) - return 0; - } - -+static gboolean -+check_gsettings_schema (const gchar *schema) -+{ -+ const gchar * const *schemas = g_settings_list_schemas (); -+ gint i; -+ -+ for (i = 0; schemas[i] != NULL; i++) { -+ if (g_strcmp0 (schemas[i], schema) == 0) -+ return TRUE; -+ } -+ g_warning ("Settings schema '%s' is not installed.", schema); -+ -+ return FALSE; -+} -+ -+static void -+gsettings_changed (GSettings *settings, -+ const char *key, -+ gpointer user_data) -+{ -+ gchar *val; -+ gint i; -+ -+ if (g_strcmp0 (key, IMMODULE_KEY)) { -+ /* deal with Gtk/IMModule only so far */ -+ return; -+ } -+ -+ val = g_settings_get_string (settings, key); -+ for (i = 0; i < max_display; i++) { -+ xsettings_manager_set_string (managers[i], "Gtk/IMModule", val); -+ xsettings_manager_notify (managers[i]); -+ } -+ g_free(val); -+} - - void readConfig () { - FILE *file = NULL; -@@ -484,6 +524,17 @@ void readConfig () { - void initial_init () { - int i; - const char *kde_version; -+ GSettings *settings = NULL; -+ gchar *vgtkimm = NULL; -+ -+ if (check_gsettings_schema (IMMODULE_SCHEMA)) { -+ settings = g_settings_new (IMMODULE_SCHEMA); -+ g_signal_connect (settings, "changed", -+ G_CALLBACK (gsettings_changed), NULL); -+ -+ vgtkimm = g_settings_get_string (settings, -+ IMMODULE_KEY); -+ } - - kde_version = getenv("KDE_SESSION_VERSION"); - -@@ -497,8 +548,11 @@ void initial_init () { - xsettings_manager_set_string(managers[i], "Net/FallbackIconTheme", "gnome"); - /* KDE always shows menu images, so make sure GTK+ does, too */ - xsettings_manager_set_int(managers[i], "Gtk/MenuImages", 1); -+ if (vgtkimm) -+ xsettings_manager_set_string (managers[i], "Gtk/IMModule", vgtkimm); - xsettings_manager_notify (managers[i]); - } -+ g_free(vgtkimm); - } - - struct xevent_data { -@@ -515,6 +569,10 @@ xevent_handle (gpointer user_data) - int i; - - while (1) { -+ if (!XPending(xev->display)) { -+ sleep(2); -+ continue; -+ } - XNextEvent (xev->display, &xevent); - - for (i = 0 ; i < max_display ; i++) { -@@ -551,6 +609,7 @@ int main (int argc, char **argv) { - GMainLoop *loop; - - g_thread_init(NULL); -+ g_type_init(); - - xev.display = XOpenDisplay (NULL); - if (xev.display == NULL) { diff --git a/xsettings-kde.spec b/xsettings-kde.spec index c653772..d8db3fc 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -1,8 +1,8 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde -Version: 0.12.2 -Release: 3%{?dist} +Version: 0.12.3 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 @@ -11,9 +11,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora doesn't use ~/.kde4 like mandriva Patch1: xsettings-kde-0.9-kde4.patch +# rewrite Net/ThemeName handling: set it based on .gtkrc-2.0-kde4 (kcm-gtk) +# This makes sure GTK+ 3 also picks up the theme setting from kcm-gtk. +# TODO: Discuss with upstream. +Patch2: xsettings-kde-0.12.3-gtktheme.patch ## upstreamable patches -Patch50: xsettings-kde-0.12.2-immmodule.patch Source10: xsettings-kde.desktop @@ -31,7 +34,7 @@ default font and so on. %setup -q %patch1 -p1 -b .kde4 -%patch50 -p1 -b .immodule +%patch2 -p1 -b .gtktheme %build @@ -60,6 +63,11 @@ rm -rf %{buildroot} %changelog +* Tue Jan 17 2012 Kevin Kofler - 0.12.3-1 +- update to 0.12.3 +- drop upstreamed immodule patch +- rewrite Net/ThemeName handling: set it based on .gtkrc-2.0-kde4 (kcm-gtk) + * Sat Jan 14 2012 Fedora Release Engineering - 0.12.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 49acf2e9108fc14a47dab40847c4fb6aee43de09 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 17 Jan 2012 23:13:47 +0100 Subject: [PATCH 25/40] Oops, add the patch. --- xsettings-kde-0.12.3-gtktheme.patch | 109 ++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 xsettings-kde-0.12.3-gtktheme.patch diff --git a/xsettings-kde-0.12.3-gtktheme.patch b/xsettings-kde-0.12.3-gtktheme.patch new file mode 100644 index 0000000..3e1388e --- /dev/null +++ b/xsettings-kde-0.12.3-gtktheme.patch @@ -0,0 +1,109 @@ +diff -ur xsettings-kde-0.12.3/xsettings-kde.c xsettings-kde-0.12.3-gtktheme/xsettings-kde.c +--- xsettings-kde-0.12.3/xsettings-kde.c 2011-10-07 01:09:07.000000000 +0200 ++++ xsettings-kde-0.12.3-gtktheme/xsettings-kde.c 2012-01-17 23:05:41.000000000 +0100 +@@ -239,15 +239,12 @@ + char filename[1024]; + char kdeprefix[1024]; + char *prefix; +- char color[1024]; + char style[1024]; +- char themefilename[1024]; + struct passwd *password; + int i; + int user_file; + int file_index; + +- color[0]= '\0'; + kdeprefix[0]= '\0'; + filename[0]= '\0'; + style[0]='\0'; +@@ -386,16 +383,6 @@ + } + notify = 1; + } +- if (strncmp(buffer,"widgetStyle=",12) == 0) { +- +- /* found style */ +- sscanf(buffer,"widgetStyle=%s", style); +- +- } +- if (strncmp(buffer,"ColorScheme=",12) == 0) { +- strcpy(color, buffer+12); +- color[strlen(color)-1]='\0'; +- } + notify |= readDPI(buffer); + + break; +@@ -455,55 +442,28 @@ + free (buffer); + } + +- if ((style[0] == '\0' || (!is_kde4 && strcmp(style, "ia_ora") == 0) || (is_kde4 && strcmp(style, "iaora-qt") == 0) || (is_kde4 && strcmp(style, "iaorakde") == 0)) && strncmp("Ia Ora ", color, 7) == 0) +- { +- strcpy(style, color); +- if (!is_kde4) { +- style[strlen(style)-6] = '\0'; +- } +- } +- +- if (style[0]) { +- int gtkrc_access = 1; +- sprintf(themefilename, "/usr/share/themes/%s/gtk-2.0/gtkrc", style); +- +- if (password) { +- char gtkrc[1024]; +- sprintf(gtkrc,"%s/.gtkrc-2.0", password->pw_dir); +- gtkrc_access = access (gtkrc, F_OK); +- /* if not .gtkrc-2.0, try KDE variant */ +- if (gtkrc_access) { +- char *gtkrc_env; +- char *gtkrc_file; +- +- gtkrc_env = getenv ("GTK2_RC_FILES"); +- gtkrc_file = NULL; +- +- if (gtkrc_env) { +- do { +- if (gtkrc_file == NULL) { +- gtkrc_file = strtok (gtkrc_env, ":"); +- } +- else { +- gtkrc_file = strtok (NULL, ":"); +- } +- if (gtkrc_file != NULL) { +- if ((gtkrc_access = access (gtkrc_file, F_OK)) == 0) { +- break; +- } +- } +- } while (gtkrc_file != NULL ); ++ /* look for style set by kcm-gtk, enforce it through Net/ThemeName so GTK+ 3 also picks it up */ ++ if (password) { ++ sprintf (filename, "%s/.gtkrc-2.0-kde4", password->pw_dir); ++ file = fopen (filename, "r"); ++ ++ if (file) { ++ while ((read = getline (&buffer, &len, file)) != -1) { ++ if (strncmp (buffer, "gtk-theme-name=", 15) == 0) { ++ sscanf (buffer, "gtk-theme-name=\"%1023[^\"]\"", style); + } + } ++ ++ fclose (file); ++ file = NULL; + } ++ } + +- /* do not set theme name if .gtkrc is being used */ +- if (gtkrc_access && (access (themefilename, F_OK) == 0 )) { +- for (i = 0 ; i < max_display ; i++) { +- xsettings_manager_set_string (managers[i], "Net/ThemeName", style); +- } +- notify = 1; ++ if (style[0]) { ++ for (i = 0 ; i < max_display ; i++) { ++ xsettings_manager_set_string (managers[i], "Net/ThemeName", style); + } ++ notify = 1; + } + + From 18364b23f0cf846a82b8eece5916e8f1d6336972 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Wed, 18 Jan 2012 21:41:47 +0100 Subject: [PATCH 26/40] * Wed Jan 18 2012 Kevin Kofler - 0.12.3-2 - fix use-after-free bug in my patch --- xsettings-kde-0.12.3-gtktheme.patch | 66 ++++++++++++++++------------- xsettings-kde.spec | 5 ++- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/xsettings-kde-0.12.3-gtktheme.patch b/xsettings-kde-0.12.3-gtktheme.patch index 3e1388e..7a8ee71 100644 --- a/xsettings-kde-0.12.3-gtktheme.patch +++ b/xsettings-kde-0.12.3-gtktheme.patch @@ -1,6 +1,6 @@ diff -ur xsettings-kde-0.12.3/xsettings-kde.c xsettings-kde-0.12.3-gtktheme/xsettings-kde.c --- xsettings-kde-0.12.3/xsettings-kde.c 2011-10-07 01:09:07.000000000 +0200 -+++ xsettings-kde-0.12.3-gtktheme/xsettings-kde.c 2012-01-17 23:05:41.000000000 +0100 ++++ xsettings-kde-0.12.3-gtktheme/xsettings-kde.c 2012-01-18 21:38:27.000000000 +0100 @@ -239,15 +239,12 @@ char filename[1024]; char kdeprefix[1024]; @@ -34,22 +34,39 @@ diff -ur xsettings-kde-0.12.3/xsettings-kde.c xsettings-kde-0.12.3-gtktheme/xset notify |= readDPI(buffer); break; -@@ -455,55 +442,28 @@ - free (buffer); - } +@@ -451,59 +438,32 @@ + } while (user_file == 0); + } + +- if (buffer) { +- free (buffer); +- } ++ /* look for style set by kcm-gtk, enforce it through Net/ThemeName so GTK+ 3 also picks it up */ ++ if (password) { ++ sprintf (filename, "%s/.gtkrc-2.0-kde4", password->pw_dir); ++ file = fopen (filename, "r"); ++ ++ if (file) { ++ while ((read = getline (&buffer, &len, file)) != -1) { ++ if (strncmp (buffer, "gtk-theme-name=", 15) == 0) { ++ sscanf (buffer, "gtk-theme-name=\"%1023[^\"]\"", style); ++ } ++ } - if ((style[0] == '\0' || (!is_kde4 && strcmp(style, "ia_ora") == 0) || (is_kde4 && strcmp(style, "iaora-qt") == 0) || (is_kde4 && strcmp(style, "iaorakde") == 0)) && strncmp("Ia Ora ", color, 7) == 0) - { - strcpy(style, color); - if (!is_kde4) { - style[strlen(style)-6] = '\0'; -- } -- } ++ fclose (file); ++ file = NULL; + } + } - - if (style[0]) { - int gtkrc_access = 1; - sprintf(themefilename, "/usr/share/themes/%s/gtk-2.0/gtkrc", style); -- + - if (password) { - char gtkrc[1024]; - sprintf(gtkrc,"%s/.gtkrc-2.0", password->pw_dir); @@ -61,7 +78,10 @@ diff -ur xsettings-kde-0.12.3/xsettings-kde.c xsettings-kde-0.12.3-gtktheme/xset - - gtkrc_env = getenv ("GTK2_RC_FILES"); - gtkrc_file = NULL; -- ++ if (buffer) { ++ free (buffer); ++ } + - if (gtkrc_env) { - do { - if (gtkrc_file == NULL) { @@ -76,34 +96,20 @@ diff -ur xsettings-kde-0.12.3/xsettings-kde.c xsettings-kde-0.12.3-gtktheme/xset - } - } - } while (gtkrc_file != NULL ); -+ /* look for style set by kcm-gtk, enforce it through Net/ThemeName so GTK+ 3 also picks it up */ -+ if (password) { -+ sprintf (filename, "%s/.gtkrc-2.0-kde4", password->pw_dir); -+ file = fopen (filename, "r"); -+ -+ if (file) { -+ while ((read = getline (&buffer, &len, file)) != -1) { -+ if (strncmp (buffer, "gtk-theme-name=", 15) == 0) { -+ sscanf (buffer, "gtk-theme-name=\"%1023[^\"]\"", style); - } - } -+ -+ fclose (file); -+ file = NULL; +- } +- } ++ if (style[0]) { ++ for (i = 0 ; i < max_display ; i++) { ++ xsettings_manager_set_string (managers[i], "Net/ThemeName", style); } -+ } - +- - /* do not set theme name if .gtkrc is being used */ - if (gtkrc_access && (access (themefilename, F_OK) == 0 )) { - for (i = 0 ; i < max_display ; i++) { - xsettings_manager_set_string (managers[i], "Net/ThemeName", style); - } -- notify = 1; -+ if (style[0]) { -+ for (i = 0 ; i < max_display ; i++) { -+ xsettings_manager_set_string (managers[i], "Net/ThemeName", style); - } -+ notify = 1; + notify = 1; +- } } diff --git a/xsettings-kde.spec b/xsettings-kde.spec index d8db3fc..517eaa3 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: User Interface/Desktops Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 @@ -63,6 +63,9 @@ rm -rf %{buildroot} %changelog +* Wed Jan 18 2012 Kevin Kofler - 0.12.3-2 +- fix use-after-free bug in my patch + * Tue Jan 17 2012 Kevin Kofler - 0.12.3-1 - update to 0.12.3 - drop upstreamed immodule patch From d028a93e698c510a7c320813c3ee9a3a70b651e6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 8 Mar 2012 07:53:22 -0600 Subject: [PATCH 27/40] rebuild (for f16/kde48) --- xsettings-kde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 517eaa3..e5947bc 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 2%{?dist} +Release: 2%{?dist}.1 License: GPLv2+ Group: User Interface/Desktops Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 @@ -63,6 +63,9 @@ rm -rf %{buildroot} %changelog +* Thu Mar 08 2012 Rex Dieter 0.12.3-2.1 +- rebuild (for f16/kde48) + * Wed Jan 18 2012 Kevin Kofler - 0.12.3-2 - fix use-after-free bug in my patch From 0bdf60423d34b116e275a04a55c3b0faeb03fc72 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 May 2012 18:04:47 -0500 Subject: [PATCH 28/40] drop some needless wakeups introduced with Gtk/IMModule support --- xsettings-kde-wakeups.patch | 31 +++++++++++++++++++++++++++++++ xsettings-kde.spec | 8 +++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 xsettings-kde-wakeups.patch diff --git a/xsettings-kde-wakeups.patch b/xsettings-kde-wakeups.patch new file mode 100644 index 0000000..e17d821 --- /dev/null +++ b/xsettings-kde-wakeups.patch @@ -0,0 +1,31 @@ +From: Harald Sitter +Subject: Remove pointless sleep() + The IM support patch from [1], imported into Mageia in [2] adds a + conditional sleep() call when the infinite loop runs into an empty + event queue which is bound to happen quite a few times. + . + This introduces pointless code and pointless wake ups as the used + XNextEvent function blocks on an empty queue anyway [3], thus + rendering the manual sleep() call superfluous. + . + [1] https://bugzilla.redhat.com/show_bug.cgi?id=727822 + [2] http://svnweb.mageia.org/soft?view=revision&revision=2011 + [3] http://tronche.com/gui/x/xlib/event-handling/manipulating-event-queue/XNextEvent.html + +Index: xsettings-kde-0.12.3/xsettings-kde.c +=================================================================== +--- xsettings-kde-0.12.3.orig/xsettings-kde.c 2012-05-22 00:01:21.000000000 +0200 ++++ xsettings-kde-0.12.3/xsettings-kde.c 2012-05-22 00:02:25.209293378 +0200 +@@ -529,11 +529,7 @@ + int i; + + while (1) { +- if (!XPending(xev->display)) { +- sleep(2); +- continue; +- } +- XNextEvent (xev->display, &xevent); ++ XNextEvent (xev->display, &xevent); + + for (i = 0 ; i < max_display ; i++) { + if (xsettings_manager_process_event (managers[i], &xevent)) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index e5947bc..47ac02d 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 2%{?dist}.1 +Release: 3%{?dist} License: GPLv2+ Group: User Interface/Desktops Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 @@ -17,6 +17,8 @@ Patch1: xsettings-kde-0.9-kde4.patch Patch2: xsettings-kde-0.12.3-gtktheme.patch ## upstreamable patches +# drop needless spinloop introduced in https://bugzilla.redhat.com/727822 +Patch50: xsettings-kde-wakeups.patch Source10: xsettings-kde.desktop @@ -35,6 +37,7 @@ default font and so on. %patch1 -p1 -b .kde4 %patch2 -p1 -b .gtktheme +%patch50 -p1 -b .wakeups %build @@ -63,6 +66,9 @@ rm -rf %{buildroot} %changelog +* Mon May 21 2012 Rex Dieter 0.12.3-3 +- drop some needless wakeups introduced with Gtk/IMModule support + * Thu Mar 08 2012 Rex Dieter 0.12.3-2.1 - rebuild (for f16/kde48) From 49128b0c73e4111bcfe10684b73230b2a5f820fe Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 02:17:12 -0500 Subject: [PATCH 29/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xsettings-kde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 47ac02d..9036b89 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: User Interface/Desktops Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 @@ -66,6 +66,9 @@ rm -rf %{buildroot} %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.12.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon May 21 2012 Rex Dieter 0.12.3-3 - drop some needless wakeups introduced with Gtk/IMModule support From d0defe0b9ccf41779fbf81e6c3c61718c0e4e032 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 22:04:46 -0600 Subject: [PATCH 30/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xsettings-kde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 9036b89..f5ac423 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: User Interface/Desktops Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 @@ -66,6 +66,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.12.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 0.12.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From fd9cd7345152885e575dd373d7c9be08e0d9373a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:16:38 -0500 Subject: [PATCH 31/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xsettings-kde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index f5ac423..c43a16d 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: User Interface/Desktops Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 @@ -66,6 +66,9 @@ rm -rf %{buildroot} %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.12.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 0.12.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 18fa598d35eaf7458cca8997ea53bed31d1c4c34 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 7 Dec 2013 13:11:34 -0600 Subject: [PATCH 32/40] xsettings-kde.desktop: +X-KDE-autostart-phase=1 - .spec cleanup --- xsettings-kde.desktop | 1 + xsettings-kde.spec | 17 ++++++----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/xsettings-kde.desktop b/xsettings-kde.desktop index 3c26a6c..e70ab85 100644 --- a/xsettings-kde.desktop +++ b/xsettings-kde.desktop @@ -2,5 +2,6 @@ Exec=xsettings-kde Name=XSettings-KDE X-KDE-autostart-after=kdesktop +X-KDE-autostart-phase=1 Type=Service OnlyShowIn=KDE; diff --git a/xsettings-kde.spec b/xsettings-kde.spec index c43a16d..58519af 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,12 +2,11 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 6%{?dist} +Release: 7%{?dist} + License: GPLv2+ -Group: User Interface/Desktops Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 URL: http://svnweb.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 @@ -41,31 +40,27 @@ default font and so on. %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 +* Sat Dec 07 2013 Rex Dieter - 0.12.3-7 +- xsettings-kde.desktop: +X-KDE-autostart-phase=1 +- .spec cleanup + * Sun Aug 04 2013 Fedora Release Engineering - 0.12.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 453ccf086145b51df3bd17aef6b316ba4d91dc2f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:52:44 -0500 Subject: [PATCH 33/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xsettings-kde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 58519af..c1f2ba9 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 @@ -57,6 +57,9 @@ install -p -m644 -D %{SOURCE10} \ %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0.12.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Dec 07 2013 Rex Dieter - 0.12.3-7 - xsettings-kde.desktop: +X-KDE-autostart-phase=1 - .spec cleanup From 79ad5d9e1d5f3425555c8b7857123f7e74d89ab8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 6 Aug 2014 12:20:01 -0500 Subject: [PATCH 34/40] use xdg autostart dir (so plasma5 can use it too) --- xsettings-kde.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index c1f2ba9..4b1b91f 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 @@ -47,16 +47,19 @@ make %{?_smp_mflags} CFLAGS="%{optflags}" lib=%{_lib} install -p -m755 -D xsettings-kde %{buildroot}%{_bindir}/xsettings-kde install -p -m644 -D %{SOURCE10} \ - %{buildroot}%{_datadir}/autostart/xsettings-kde.desktop + %{buildroot}%{_sysconfdir}/xdg/autostart/xsettings-kde.desktop %files %doc ChangeLog README COPYING -%{_bindir}/* -%{_datadir}/autostart/* +%{_bindir}/xsettings-kde +%{_sysconfdir}/xdg/autostart/xsettings-kde.desktop %changelog +* Wed Aug 06 2014 Rex Dieter 0.12.3-9 +- use xdg autostart dir (so plasma5 can use it too) + * Sun Jun 08 2014 Fedora Release Engineering - 0.12.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 8829d184de4311aa45c146c2c19282d646adacb0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:01:08 +0000 Subject: [PATCH 35/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xsettings-kde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 4b1b91f..6a42a46 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 @@ -57,6 +57,9 @@ install -p -m644 -D %{SOURCE10} \ %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.12.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Aug 06 2014 Rex Dieter 0.12.3-9 - use xdg autostart dir (so plasma5 can use it too) From a2cd5875d3da7609e7ec7f81a090822ab76e61ec Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:27:58 +0000 Subject: [PATCH 36/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xsettings-kde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 6a42a46..164eede 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 @@ -57,6 +57,9 @@ install -p -m644 -D %{SOURCE10} \ %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.12.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 0.12.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 73a70ebae5f72edd706810f8ada6fa36650fcdcb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 25 Jan 2016 13:44:33 -0600 Subject: [PATCH 37/40] pull in upstream fixed, update URL, use %license --- ...atch-from-1-imported-into-Mageia-in-.patch | 38 +++++++++++ 0002-Drop-Ia-Ora-theme-support.patch | 64 +++++++++++++++++++ 0003-Enable-PrimaryPaste.patch | 25 ++++++++ ...tead-of-gnome-as-fallback-icon-theme.patch | 25 ++++++++ xsettings-kde-wakeups.patch | 31 --------- xsettings-kde.spec | 35 ++++++---- 6 files changed, 175 insertions(+), 43 deletions(-) create mode 100644 0001-The-IM-support-patch-from-1-imported-into-Mageia-in-.patch create mode 100644 0002-Drop-Ia-Ora-theme-support.patch create mode 100644 0003-Enable-PrimaryPaste.patch create mode 100644 0004-Use-Adwaita-instead-of-gnome-as-fallback-icon-theme.patch delete mode 100644 xsettings-kde-wakeups.patch diff --git a/0001-The-IM-support-patch-from-1-imported-into-Mageia-in-.patch b/0001-The-IM-support-patch-from-1-imported-into-Mageia-in-.patch new file mode 100644 index 0000000..d03da4a --- /dev/null +++ b/0001-The-IM-support-patch-from-1-imported-into-Mageia-in-.patch @@ -0,0 +1,38 @@ +From 82de82cb6710da9bf2a8b729954e9db3b68db3d2 Mon Sep 17 00:00:00 2001 +From: Harald Sitter +Date: Wed, 23 May 2012 00:18:51 +0200 +Subject: [PATCH 1/4] The IM support patch from [1], imported into Mageia in + [2] adds a conditional sleep() call when the infinite loop runs into an empty + event queue which is bound to happen quite a few times. + +This introduces pointless code and pointless wake ups as the used +XNextEvent function blocks on an empty queue anyway [3], thus +rendering the manual sleep() call superfluous. + +[1] https://bugzilla.redhat.com/show_bug.cgi?id=727822 +[2] http://svnweb.mageia.org/soft?view=revision&revision=2011 +[3] http://tronche.com/gui/x/xlib/event-handling/manipulating-event-queue/XNextEvent.html +--- + xsettings-kde.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/xsettings-kde.c b/xsettings-kde.c +index 613f77c..39058ac 100644 +--- a/xsettings-kde.c ++++ b/xsettings-kde.c +@@ -569,11 +569,7 @@ xevent_handle (gpointer user_data) + int i; + + while (1) { +- if (!XPending(xev->display)) { +- sleep(2); +- continue; +- } +- XNextEvent (xev->display, &xevent); ++ XNextEvent (xev->display, &xevent); + + for (i = 0 ; i < max_display ; i++) { + if (xsettings_manager_process_event (managers[i], &xevent)) +-- +2.5.0 + diff --git a/0002-Drop-Ia-Ora-theme-support.patch b/0002-Drop-Ia-Ora-theme-support.patch new file mode 100644 index 0000000..961ed85 --- /dev/null +++ b/0002-Drop-Ia-Ora-theme-support.patch @@ -0,0 +1,64 @@ +From 34cc41b6a2a47bc329e0e2bfb853cf6b879ccdd5 Mon Sep 17 00:00:00 2001 +From: Luc Menut +Date: Mon, 8 Dec 2014 21:49:52 +0100 +Subject: [PATCH 2/4] Drop Ia Ora theme support + +--- + xsettings-kde.c | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/xsettings-kde.c b/xsettings-kde.c +index 39058ac..6162136 100644 +--- a/xsettings-kde.c ++++ b/xsettings-kde.c +@@ -239,7 +239,6 @@ void readConfig () { + char filename[1024]; + char kdeprefix[1024]; + char *prefix; +- char color[1024]; + char style[1024]; + char themefilename[1024]; + struct passwd *password; +@@ -247,7 +246,6 @@ void readConfig () { + int user_file; + int file_index; + +- color[0]= '\0'; + kdeprefix[0]= '\0'; + filename[0]= '\0'; + style[0]='\0'; +@@ -386,16 +384,7 @@ void readConfig () { + } + notify = 1; + } +- if (strncmp(buffer,"widgetStyle=",12) == 0) { + +- /* found style */ +- sscanf(buffer,"widgetStyle=%s", style); +- +- } +- if (strncmp(buffer,"ColorScheme=",12) == 0) { +- strcpy(color, buffer+12); +- color[strlen(color)-1]='\0'; +- } + notify |= readDPI(buffer); + + break; +@@ -455,14 +444,6 @@ void readConfig () { + free (buffer); + } + +- if ((style[0] == '\0' || (!is_kde4 && strcmp(style, "ia_ora") == 0) || (is_kde4 && strcmp(style, "iaora-qt") == 0) || (is_kde4 && strcmp(style, "iaorakde") == 0)) && strncmp("Ia Ora ", color, 7) == 0) +- { +- strcpy(style, color); +- if (!is_kde4) { +- style[strlen(style)-6] = '\0'; +- } +- } +- + if (style[0]) { + int gtkrc_access = 1; + sprintf(themefilename, "/usr/share/themes/%s/gtk-2.0/gtkrc", style); +-- +2.5.0 + diff --git a/0003-Enable-PrimaryPaste.patch b/0003-Enable-PrimaryPaste.patch new file mode 100644 index 0000000..81517d3 --- /dev/null +++ b/0003-Enable-PrimaryPaste.patch @@ -0,0 +1,25 @@ +From 618350acb244804522bba66aab485d4995527526 Mon Sep 17 00:00:00 2001 +From: Luc Menut +Date: Mon, 8 Dec 2014 22:35:32 +0100 +Subject: [PATCH 3/4] Enable PrimaryPaste + +--- + xsettings-kde.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/xsettings-kde.c b/xsettings-kde.c +index 6162136..d6dbb2f 100644 +--- a/xsettings-kde.c ++++ b/xsettings-kde.c +@@ -530,6 +530,8 @@ void initial_init () { + xsettings_manager_set_string(managers[i], "Net/FallbackIconTheme", "gnome"); + /* KDE always shows menu images, so make sure GTK+ does, too */ + xsettings_manager_set_int(managers[i], "Gtk/MenuImages", 1); ++ /* KDE always pastes clipboard content on middle-click */ ++ xsettings_manager_set_int(managers[i], "Gtk/EnablePrimaryPaste", 1); + if (vgtkimm) + xsettings_manager_set_string (managers[i], "Gtk/IMModule", vgtkimm); + xsettings_manager_notify (managers[i]); +-- +2.5.0 + diff --git a/0004-Use-Adwaita-instead-of-gnome-as-fallback-icon-theme.patch b/0004-Use-Adwaita-instead-of-gnome-as-fallback-icon-theme.patch new file mode 100644 index 0000000..24bf73e --- /dev/null +++ b/0004-Use-Adwaita-instead-of-gnome-as-fallback-icon-theme.patch @@ -0,0 +1,25 @@ +From 19a8d0d239d95e5aef4c54c289606550edddd158 Mon Sep 17 00:00:00 2001 +From: Luc Menut +Date: Mon, 16 Feb 2015 22:14:14 +0100 +Subject: [PATCH 4/4] Use Adwaita instead of gnome as fallback icon theme + +--- + xsettings-kde.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xsettings-kde.c b/xsettings-kde.c +index d6dbb2f..706339b 100644 +--- a/xsettings-kde.c ++++ b/xsettings-kde.c +@@ -527,7 +527,7 @@ void initial_init () { + + for (i = 0 ; i < max_display ; i++) { + xsettings_manager_set_string(managers[i], "Gtk/FileChooserBackend", "gio"); +- xsettings_manager_set_string(managers[i], "Net/FallbackIconTheme", "gnome"); ++ xsettings_manager_set_string(managers[i], "Net/FallbackIconTheme", "Adwaita"); + /* KDE always shows menu images, so make sure GTK+ does, too */ + xsettings_manager_set_int(managers[i], "Gtk/MenuImages", 1); + /* KDE always pastes clipboard content on middle-click */ +-- +2.5.0 + diff --git a/xsettings-kde-wakeups.patch b/xsettings-kde-wakeups.patch deleted file mode 100644 index e17d821..0000000 --- a/xsettings-kde-wakeups.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Harald Sitter -Subject: Remove pointless sleep() - The IM support patch from [1], imported into Mageia in [2] adds a - conditional sleep() call when the infinite loop runs into an empty - event queue which is bound to happen quite a few times. - . - This introduces pointless code and pointless wake ups as the used - XNextEvent function blocks on an empty queue anyway [3], thus - rendering the manual sleep() call superfluous. - . - [1] https://bugzilla.redhat.com/show_bug.cgi?id=727822 - [2] http://svnweb.mageia.org/soft?view=revision&revision=2011 - [3] http://tronche.com/gui/x/xlib/event-handling/manipulating-event-queue/XNextEvent.html - -Index: xsettings-kde-0.12.3/xsettings-kde.c -=================================================================== ---- xsettings-kde-0.12.3.orig/xsettings-kde.c 2012-05-22 00:01:21.000000000 +0200 -+++ xsettings-kde-0.12.3/xsettings-kde.c 2012-05-22 00:02:25.209293378 +0200 -@@ -529,11 +529,7 @@ - int i; - - while (1) { -- if (!XPending(xev->display)) { -- sleep(2); -- continue; -- } -- XNextEvent (xev->display, &xevent); -+ XNextEvent (xev->display, &xevent); - - for (i = 0 ; i < max_display ; i++) { - if (xsettings_manager_process_event (managers[i], &xevent)) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index 164eede..e6f76c9 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,22 +2,24 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ +URL: http://projects.kde.org/xsettings-kde Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 -URL: http://svnweb.mageia.org/soft/theme/xsettings-kde/ + +## upstream patches +Patch1: 0001-The-IM-support-patch-from-1-imported-into-Mageia-in-.patch +Patch2: 0002-Drop-Ia-Ora-theme-support.patch +Patch3: 0003-Enable-PrimaryPaste.patch +Patch4: 0004-Use-Adwaita-instead-of-gnome-as-fallback-icon-theme.patch # fedora doesn't use ~/.kde4 like mandriva -Patch1: xsettings-kde-0.9-kde4.patch +Patch100: xsettings-kde-0.9-kde4.patch # rewrite Net/ThemeName handling: set it based on .gtkrc-2.0-kde4 (kcm-gtk) # This makes sure GTK+ 3 also picks up the theme setting from kcm-gtk. # TODO: Discuss with upstream. -Patch2: xsettings-kde-0.12.3-gtktheme.patch - -## upstreamable patches -# drop needless spinloop introduced in https://bugzilla.redhat.com/727822 -Patch50: xsettings-kde-wakeups.patch +Patch102: xsettings-kde-0.12.3-gtktheme.patch Source10: xsettings-kde.desktop @@ -34,9 +36,14 @@ default font and so on. %prep %setup -q -%patch1 -p1 -b .kde4 -%patch2 -p1 -b .gtktheme -%patch50 -p1 -b .wakeups +%patch1 -p1 -b .0001 +## don't apply patch2 in favor of patch102 below +#patch2 -p1 -b .0002 +%patch3 -p1 -b .0003 +%patch4 -p1 -b .0004 + +%patch100 -p1 -b .kde4 +%patch102 -p1 -b .gtktheme %build @@ -51,12 +58,16 @@ install -p -m644 -D %{SOURCE10} \ %files -%doc ChangeLog README COPYING +%doc ChangeLog README +%license COPYING %{_bindir}/xsettings-kde %{_sysconfdir}/xdg/autostart/xsettings-kde.desktop %changelog +* Mon Jan 25 2016 Rex Dieter 0.12.3-12 +- pull in upstream fixed, update URL, use %%license + * Fri Jun 19 2015 Fedora Release Engineering - 0.12.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 61695d3f40cc3576412a29371e27b5ed6cbc00e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:50:51 +0000 Subject: [PATCH 38/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xsettings-kde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index e6f76c9..bdd0975 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ URL: http://projects.kde.org/xsettings-kde @@ -65,6 +65,9 @@ install -p -m644 -D %{SOURCE10} \ %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.12.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Jan 25 2016 Rex Dieter 0.12.3-12 - pull in upstream fixed, update URL, use %%license From be7da0b13e61730f10cdac07fdb82a4a4a79a01b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:09:59 +0000 Subject: [PATCH 39/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xsettings-kde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsettings-kde.spec b/xsettings-kde.spec index bdd0975..d4ad77b 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -2,7 +2,7 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde Version: 0.12.3 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ URL: http://projects.kde.org/xsettings-kde @@ -65,6 +65,9 @@ install -p -m644 -D %{SOURCE10} \ %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.12.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 0.12.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 78a251218f58c446260fd61074677b9f645a4812 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 9 May 2017 09:09:54 -0500 Subject: [PATCH 40/40] old package (used in kde4 era), replaced by kde-gtk-config --- .gitignore | 4 - ...atch-from-1-imported-into-Mageia-in-.patch | 38 ---- 0002-Drop-Ia-Ora-theme-support.patch | 64 ------ 0003-Enable-PrimaryPaste.patch | 25 --- ...tead-of-gnome-as-fallback-icon-theme.patch | 25 --- dead.package | 1 + sources | 1 - xsettings-kde-0.12.3-gtktheme.patch | 115 ---------- xsettings-kde-0.9-kde4.patch | 12 -- xsettings-kde.desktop | 7 - xsettings-kde.spec | 197 ------------------ 11 files changed, 1 insertion(+), 488 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-The-IM-support-patch-from-1-imported-into-Mageia-in-.patch delete mode 100644 0002-Drop-Ia-Ora-theme-support.patch delete mode 100644 0003-Enable-PrimaryPaste.patch delete mode 100644 0004-Use-Adwaita-instead-of-gnome-as-fallback-icon-theme.patch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xsettings-kde-0.12.3-gtktheme.patch delete mode 100644 xsettings-kde-0.9-kde4.patch delete mode 100644 xsettings-kde.desktop delete mode 100644 xsettings-kde.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 697744a..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -xsettings-kde-0.11-20090829svn.tar.bz2 -/xsettings-kde-0.12.tar.bz2 -/xsettings-kde-0.12.2.tar.bz2 -/xsettings-kde-0.12.3.tar.bz2 diff --git a/0001-The-IM-support-patch-from-1-imported-into-Mageia-in-.patch b/0001-The-IM-support-patch-from-1-imported-into-Mageia-in-.patch deleted file mode 100644 index d03da4a..0000000 --- a/0001-The-IM-support-patch-from-1-imported-into-Mageia-in-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 82de82cb6710da9bf2a8b729954e9db3b68db3d2 Mon Sep 17 00:00:00 2001 -From: Harald Sitter -Date: Wed, 23 May 2012 00:18:51 +0200 -Subject: [PATCH 1/4] The IM support patch from [1], imported into Mageia in - [2] adds a conditional sleep() call when the infinite loop runs into an empty - event queue which is bound to happen quite a few times. - -This introduces pointless code and pointless wake ups as the used -XNextEvent function blocks on an empty queue anyway [3], thus -rendering the manual sleep() call superfluous. - -[1] https://bugzilla.redhat.com/show_bug.cgi?id=727822 -[2] http://svnweb.mageia.org/soft?view=revision&revision=2011 -[3] http://tronche.com/gui/x/xlib/event-handling/manipulating-event-queue/XNextEvent.html ---- - xsettings-kde.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/xsettings-kde.c b/xsettings-kde.c -index 613f77c..39058ac 100644 ---- a/xsettings-kde.c -+++ b/xsettings-kde.c -@@ -569,11 +569,7 @@ xevent_handle (gpointer user_data) - int i; - - while (1) { -- if (!XPending(xev->display)) { -- sleep(2); -- continue; -- } -- XNextEvent (xev->display, &xevent); -+ XNextEvent (xev->display, &xevent); - - for (i = 0 ; i < max_display ; i++) { - if (xsettings_manager_process_event (managers[i], &xevent)) --- -2.5.0 - diff --git a/0002-Drop-Ia-Ora-theme-support.patch b/0002-Drop-Ia-Ora-theme-support.patch deleted file mode 100644 index 961ed85..0000000 --- a/0002-Drop-Ia-Ora-theme-support.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 34cc41b6a2a47bc329e0e2bfb853cf6b879ccdd5 Mon Sep 17 00:00:00 2001 -From: Luc Menut -Date: Mon, 8 Dec 2014 21:49:52 +0100 -Subject: [PATCH 2/4] Drop Ia Ora theme support - ---- - xsettings-kde.c | 19 ------------------- - 1 file changed, 19 deletions(-) - -diff --git a/xsettings-kde.c b/xsettings-kde.c -index 39058ac..6162136 100644 ---- a/xsettings-kde.c -+++ b/xsettings-kde.c -@@ -239,7 +239,6 @@ void readConfig () { - char filename[1024]; - char kdeprefix[1024]; - char *prefix; -- char color[1024]; - char style[1024]; - char themefilename[1024]; - struct passwd *password; -@@ -247,7 +246,6 @@ void readConfig () { - int user_file; - int file_index; - -- color[0]= '\0'; - kdeprefix[0]= '\0'; - filename[0]= '\0'; - style[0]='\0'; -@@ -386,16 +384,7 @@ void readConfig () { - } - notify = 1; - } -- if (strncmp(buffer,"widgetStyle=",12) == 0) { - -- /* found style */ -- sscanf(buffer,"widgetStyle=%s", style); -- -- } -- if (strncmp(buffer,"ColorScheme=",12) == 0) { -- strcpy(color, buffer+12); -- color[strlen(color)-1]='\0'; -- } - notify |= readDPI(buffer); - - break; -@@ -455,14 +444,6 @@ void readConfig () { - free (buffer); - } - -- if ((style[0] == '\0' || (!is_kde4 && strcmp(style, "ia_ora") == 0) || (is_kde4 && strcmp(style, "iaora-qt") == 0) || (is_kde4 && strcmp(style, "iaorakde") == 0)) && strncmp("Ia Ora ", color, 7) == 0) -- { -- strcpy(style, color); -- if (!is_kde4) { -- style[strlen(style)-6] = '\0'; -- } -- } -- - if (style[0]) { - int gtkrc_access = 1; - sprintf(themefilename, "/usr/share/themes/%s/gtk-2.0/gtkrc", style); --- -2.5.0 - diff --git a/0003-Enable-PrimaryPaste.patch b/0003-Enable-PrimaryPaste.patch deleted file mode 100644 index 81517d3..0000000 --- a/0003-Enable-PrimaryPaste.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 618350acb244804522bba66aab485d4995527526 Mon Sep 17 00:00:00 2001 -From: Luc Menut -Date: Mon, 8 Dec 2014 22:35:32 +0100 -Subject: [PATCH 3/4] Enable PrimaryPaste - ---- - xsettings-kde.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/xsettings-kde.c b/xsettings-kde.c -index 6162136..d6dbb2f 100644 ---- a/xsettings-kde.c -+++ b/xsettings-kde.c -@@ -530,6 +530,8 @@ void initial_init () { - xsettings_manager_set_string(managers[i], "Net/FallbackIconTheme", "gnome"); - /* KDE always shows menu images, so make sure GTK+ does, too */ - xsettings_manager_set_int(managers[i], "Gtk/MenuImages", 1); -+ /* KDE always pastes clipboard content on middle-click */ -+ xsettings_manager_set_int(managers[i], "Gtk/EnablePrimaryPaste", 1); - if (vgtkimm) - xsettings_manager_set_string (managers[i], "Gtk/IMModule", vgtkimm); - xsettings_manager_notify (managers[i]); --- -2.5.0 - diff --git a/0004-Use-Adwaita-instead-of-gnome-as-fallback-icon-theme.patch b/0004-Use-Adwaita-instead-of-gnome-as-fallback-icon-theme.patch deleted file mode 100644 index 24bf73e..0000000 --- a/0004-Use-Adwaita-instead-of-gnome-as-fallback-icon-theme.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 19a8d0d239d95e5aef4c54c289606550edddd158 Mon Sep 17 00:00:00 2001 -From: Luc Menut -Date: Mon, 16 Feb 2015 22:14:14 +0100 -Subject: [PATCH 4/4] Use Adwaita instead of gnome as fallback icon theme - ---- - xsettings-kde.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xsettings-kde.c b/xsettings-kde.c -index d6dbb2f..706339b 100644 ---- a/xsettings-kde.c -+++ b/xsettings-kde.c -@@ -527,7 +527,7 @@ void initial_init () { - - for (i = 0 ; i < max_display ; i++) { - xsettings_manager_set_string(managers[i], "Gtk/FileChooserBackend", "gio"); -- xsettings_manager_set_string(managers[i], "Net/FallbackIconTheme", "gnome"); -+ xsettings_manager_set_string(managers[i], "Net/FallbackIconTheme", "Adwaita"); - /* KDE always shows menu images, so make sure GTK+ does, too */ - xsettings_manager_set_int(managers[i], "Gtk/MenuImages", 1); - /* KDE always pastes clipboard content on middle-click */ --- -2.5.0 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..c23b1e9 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +old package (used in kde4 era), replaced by kde-gtk-config diff --git a/sources b/sources deleted file mode 100644 index fe44157..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -312375c139d9acfef4abadc1e22b9449 xsettings-kde-0.12.3.tar.bz2 diff --git a/xsettings-kde-0.12.3-gtktheme.patch b/xsettings-kde-0.12.3-gtktheme.patch deleted file mode 100644 index 7a8ee71..0000000 --- a/xsettings-kde-0.12.3-gtktheme.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -ur xsettings-kde-0.12.3/xsettings-kde.c xsettings-kde-0.12.3-gtktheme/xsettings-kde.c ---- xsettings-kde-0.12.3/xsettings-kde.c 2011-10-07 01:09:07.000000000 +0200 -+++ xsettings-kde-0.12.3-gtktheme/xsettings-kde.c 2012-01-18 21:38:27.000000000 +0100 -@@ -239,15 +239,12 @@ - char filename[1024]; - char kdeprefix[1024]; - char *prefix; -- char color[1024]; - char style[1024]; -- char themefilename[1024]; - struct passwd *password; - int i; - int user_file; - int file_index; - -- color[0]= '\0'; - kdeprefix[0]= '\0'; - filename[0]= '\0'; - style[0]='\0'; -@@ -386,16 +383,6 @@ - } - notify = 1; - } -- if (strncmp(buffer,"widgetStyle=",12) == 0) { -- -- /* found style */ -- sscanf(buffer,"widgetStyle=%s", style); -- -- } -- if (strncmp(buffer,"ColorScheme=",12) == 0) { -- strcpy(color, buffer+12); -- color[strlen(color)-1]='\0'; -- } - notify |= readDPI(buffer); - - break; -@@ -451,59 +438,32 @@ - } while (user_file == 0); - } - -- if (buffer) { -- free (buffer); -- } -+ /* look for style set by kcm-gtk, enforce it through Net/ThemeName so GTK+ 3 also picks it up */ -+ if (password) { -+ sprintf (filename, "%s/.gtkrc-2.0-kde4", password->pw_dir); -+ file = fopen (filename, "r"); -+ -+ if (file) { -+ while ((read = getline (&buffer, &len, file)) != -1) { -+ if (strncmp (buffer, "gtk-theme-name=", 15) == 0) { -+ sscanf (buffer, "gtk-theme-name=\"%1023[^\"]\"", style); -+ } -+ } - -- if ((style[0] == '\0' || (!is_kde4 && strcmp(style, "ia_ora") == 0) || (is_kde4 && strcmp(style, "iaora-qt") == 0) || (is_kde4 && strcmp(style, "iaorakde") == 0)) && strncmp("Ia Ora ", color, 7) == 0) -- { -- strcpy(style, color); -- if (!is_kde4) { -- style[strlen(style)-6] = '\0'; -+ fclose (file); -+ file = NULL; - } - } -- -- if (style[0]) { -- int gtkrc_access = 1; -- sprintf(themefilename, "/usr/share/themes/%s/gtk-2.0/gtkrc", style); - -- if (password) { -- char gtkrc[1024]; -- sprintf(gtkrc,"%s/.gtkrc-2.0", password->pw_dir); -- gtkrc_access = access (gtkrc, F_OK); -- /* if not .gtkrc-2.0, try KDE variant */ -- if (gtkrc_access) { -- char *gtkrc_env; -- char *gtkrc_file; -- -- gtkrc_env = getenv ("GTK2_RC_FILES"); -- gtkrc_file = NULL; -+ if (buffer) { -+ free (buffer); -+ } - -- if (gtkrc_env) { -- do { -- if (gtkrc_file == NULL) { -- gtkrc_file = strtok (gtkrc_env, ":"); -- } -- else { -- gtkrc_file = strtok (NULL, ":"); -- } -- if (gtkrc_file != NULL) { -- if ((gtkrc_access = access (gtkrc_file, F_OK)) == 0) { -- break; -- } -- } -- } while (gtkrc_file != NULL ); -- } -- } -+ if (style[0]) { -+ for (i = 0 ; i < max_display ; i++) { -+ xsettings_manager_set_string (managers[i], "Net/ThemeName", style); - } -- -- /* do not set theme name if .gtkrc is being used */ -- if (gtkrc_access && (access (themefilename, F_OK) == 0 )) { -- for (i = 0 ; i < max_display ; i++) { -- xsettings_manager_set_string (managers[i], "Net/ThemeName", style); -- } - notify = 1; -- } - } - - diff --git a/xsettings-kde-0.9-kde4.patch b/xsettings-kde-0.9-kde4.patch deleted file mode 100644 index ef9ee73..0000000 --- a/xsettings-kde-0.9-kde4.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index e70ab85..0000000 --- a/xsettings-kde.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Exec=xsettings-kde -Name=XSettings-KDE -X-KDE-autostart-after=kdesktop -X-KDE-autostart-phase=1 -Type=Service -OnlyShowIn=KDE; diff --git a/xsettings-kde.spec b/xsettings-kde.spec deleted file mode 100644 index d4ad77b..0000000 --- a/xsettings-kde.spec +++ /dev/null @@ -1,197 +0,0 @@ - -Summary: XSettings Daemon for KDE -Name: xsettings-kde -Version: 0.12.3 -Release: 14%{?dist} - -License: GPLv2+ -URL: http://projects.kde.org/xsettings-kde -Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 - -## upstream patches -Patch1: 0001-The-IM-support-patch-from-1-imported-into-Mageia-in-.patch -Patch2: 0002-Drop-Ia-Ora-theme-support.patch -Patch3: 0003-Enable-PrimaryPaste.patch -Patch4: 0004-Use-Adwaita-instead-of-gnome-as-fallback-icon-theme.patch - -# fedora doesn't use ~/.kde4 like mandriva -Patch100: xsettings-kde-0.9-kde4.patch -# rewrite Net/ThemeName handling: set it based on .gtkrc-2.0-kde4 (kcm-gtk) -# This makes sure GTK+ 3 also picks up the theme setting from kcm-gtk. -# TODO: Discuss with upstream. -Patch102: xsettings-kde-0.12.3-gtktheme.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 .0001 -## don't apply patch2 in favor of patch102 below -#patch2 -p1 -b .0002 -%patch3 -p1 -b .0003 -%patch4 -p1 -b .0004 - -%patch100 -p1 -b .kde4 -%patch102 -p1 -b .gtktheme - - -%build -make %{?_smp_mflags} CFLAGS="%{optflags}" lib=%{_lib} - - -%install -install -p -m755 -D xsettings-kde %{buildroot}%{_bindir}/xsettings-kde - -install -p -m644 -D %{SOURCE10} \ - %{buildroot}%{_sysconfdir}/xdg/autostart/xsettings-kde.desktop - - -%files -%doc ChangeLog README -%license COPYING -%{_bindir}/xsettings-kde -%{_sysconfdir}/xdg/autostart/xsettings-kde.desktop - - -%changelog -* Sat Feb 11 2017 Fedora Release Engineering - 0.12.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0.12.3-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jan 25 2016 Rex Dieter 0.12.3-12 -- pull in upstream fixed, update URL, use %%license - -* Fri Jun 19 2015 Fedora Release Engineering - 0.12.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 0.12.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Aug 06 2014 Rex Dieter 0.12.3-9 -- use xdg autostart dir (so plasma5 can use it too) - -* Sun Jun 08 2014 Fedora Release Engineering - 0.12.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Dec 07 2013 Rex Dieter - 0.12.3-7 -- xsettings-kde.desktop: +X-KDE-autostart-phase=1 -- .spec cleanup - -* Sun Aug 04 2013 Fedora Release Engineering - 0.12.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 0.12.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 0.12.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon May 21 2012 Rex Dieter 0.12.3-3 -- drop some needless wakeups introduced with Gtk/IMModule support - -* Thu Mar 08 2012 Rex Dieter 0.12.3-2.1 -- rebuild (for f16/kde48) - -* Wed Jan 18 2012 Kevin Kofler - 0.12.3-2 -- fix use-after-free bug in my patch - -* Tue Jan 17 2012 Kevin Kofler - 0.12.3-1 -- update to 0.12.3 -- drop upstreamed immodule patch -- rewrite Net/ThemeName handling: set it based on .gtkrc-2.0-kde4 (kcm-gtk) - -* Sat Jan 14 2012 Fedora Release Engineering - 0.12.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Sep 22 2011 Rex Dieter 0.12.2-2 -- RFE: Gtk/IMModule support (#727822) - -* Sat Aug 06 2011 Rex Dieter 0.12.2-1 -- 0.12.2 - -* Thu Mar 17 2011 Kevin Kofler - 0.12-4 -- update upstream URL (viewvc -> svnweb) - -* 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