[kde-workspace] 4.8 branch commit for settings_style support

[Rex Dieter]

commit aab331f109f1bd8192229a2e04f7611f2f02b8c2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 12:09:29 2012 -0600

    4.8 branch commit for settings_style support

 kde-workspace-4.8.1-settings_style.patch |   19 +++++++++++++++++++
 kde-workspace.spec                       |    8 +++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/kde-workspace-4.8.1-settings_style.patch b/kde-workspace-4.8.1-settings_style.patch
new file mode 100644
index 0000000..3992d1f
--- /dev/null
+++ b/kde-workspace-4.8.1-settings_style.patch
@@ -0,0 +1,19 @@
+commit a91f888dac689bd64d1ac9290769bd881af9e319
+Author: Ignat Semenov <ragnarokk91 at gmail.com>
+Date:   Tue Feb 7 18:14:09 2012 +0400
+
+    use the SETTINGS_STYLE category for notifications about graphic effects level changes
+
+diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
+index b8f46be..849a49b 100644
+--- a/kcontrol/style/kcmstyle.cpp
++++ b/kcontrol/style/kcmstyle.cpp
+@@ -421,7 +421,7 @@ void KCMStyle::save()
+         KGlobalSettings::self()->emitChange(KGlobalSettings::StyleChanged);
+ 
+     if ( m_bEffectsDirty ) {
+-        KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged);
++        KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged, KGlobalSettings::SETTINGS_STYLE);
+         // ##### FIXME - Doesn't apply all settings correctly due to bugs in
+         // KApplication/KToolbar
+         KGlobalSettings::self()->emitChange(KGlobalSettings::ToolbarStyleChanged);
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 162f50a..b1b208f 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -10,7 +10,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -102,6 +102,8 @@ Patch56: kde-workspace-4.8.0-kwin_llvmpipe_whitelist.patch
 Patch57: kde-workspace-4.8.0-bug796969.patch
 
 ## upstream patches
+# https://projects.kde.org/projects/kde/kde-workspace/repository/revisions/a91f888dac689bd64d1ac9290769bd881af9e319
+Patch100:  kde-workspace-4.8.1-settings_style.patch
 
 ## plasma active patches
 # adapted version of wac-html-widgets.patch
@@ -425,6 +427,7 @@ Requires: akonadi
 %patch57 -p1 -b .bug796969
 
 # upstream patches
+%patch100 -p1 -b .settings_style
 
 # plasma-active
 %patch153 -p1 -b .wac-html-widgets
@@ -964,6 +967,9 @@ fi
 
 
 %changelog
+* Thu Mar 08 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.1-2
+- 4.8 branch commit for settings_style support
+
 * Mon Mar 05 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.1-1
 - 4.8.1
 - removed powerdevil verb., eDP and gcc47 patches