[kde-workspace] 4.10.2-12

[Rex Dieter]

commit 52e005c208b1aaba72408e55b2a56c7df1689c56
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri May 3 07:31:51 2013 -0500

    4.10.2-12
    
    - -DKDE4_ENABLE_FPIE:BOOL=ON
    - don't write fonts.conf on load (kde#105797)

 kde-workspace-kcm_fonts_dont_change_on_load.patch |   38 +++++++++++++++++++++
 kde-workspace.spec                                |   12 ++++++-
 2 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/kde-workspace-kcm_fonts_dont_change_on_load.patch b/kde-workspace-kcm_fonts_dont_change_on_load.patch
new file mode 100644
index 0000000..97c1589
--- /dev/null
+++ b/kde-workspace-kcm_fonts_dont_change_on_load.patch
@@ -0,0 +1,38 @@
+diff -up kde-workspace-4.10.2/kcontrol/fonts/fonts.cpp.kcm_fonts_dont_change_on_load kde-workspace-4.10.2/kcontrol/fonts/fonts.cpp
+--- kde-workspace-4.10.2/kcontrol/fonts/fonts.cpp.kcm_fonts_dont_change_on_load	2013-03-01 00:32:24.000000000 -0600
++++ kde-workspace-4.10.2/kcontrol/fonts/fonts.cpp	2013-05-03 07:22:57.033141204 -0500
+@@ -330,14 +330,9 @@ bool FontAASettings::load()
+ 
+   if(!xft.getHintStyle(hStyle) || KXftConfig::Hint::NotSet==hStyle)
+   {
+-    KConfig kglobals("kdeglobals", KConfig::NoGlobals);
+-
+     hStyle=KXftConfig::Hint::Medium;
+     xft.setHintStyle(hStyle);
+-    xft.apply();  // Save this setting
+-    KConfigGroup(&kglobals, "General").writeEntry("XftHintStyle", KXftConfig::toStr(hStyle));
+-    kglobals.sync();
+-    runRdb(KRdbExportXftSettings | KRdbExportGtkTheme);
++    changesMade = true;
+   }
+ 
+   hintingStyle->setCurrentIndex(getIndex(hStyle));
+diff -up kde-workspace-4.10.2/kcontrol/fonts/kxftconfig.cpp.kcm_fonts_dont_change_on_load kde-workspace-4.10.2/kcontrol/fonts/kxftconfig.cpp
+--- kde-workspace-4.10.2/kcontrol/fonts/kxftconfig.cpp.kcm_fonts_dont_change_on_load	2013-03-01 00:32:24.056859289 -0600
++++ kde-workspace-4.10.2/kcontrol/fonts/kxftconfig.cpp	2013-05-03 07:13:43.182065296 -0500
+@@ -282,7 +282,6 @@ bool KXftConfig::reset()
+                 m_excludePixelRange.from=pFrom;
+                 m_excludePixelRange.to=pTo;
+                 m_madeChanges=true;
+-                apply();
+             }
+         }
+         else if(!equal(0, m_excludePixelRange.from) || !equal(0, m_excludePixelRange.to))   
+@@ -291,7 +290,6 @@ bool KXftConfig::reset()
+             m_excludeRange.from=(int)pixel2Point(m_excludePixelRange.from);
+             m_excludeRange.to=(int)pixel2Point(m_excludePixelRange.to);
+             m_madeChanges=true;
+-            apply();
+         }
+     }
+ 
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 5b30e09..547b1fd 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -17,7 +17,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.10.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -91,6 +91,10 @@ Patch52: kde-workspace-4.8.2-bz#732830-login.patch
 # http://bugs.kde.org/242065
 Patch53: kde-workspace-4.7.95-kdm_xauth.patch
 
+# don't modify font settings on load (without explicit save)
+# http://bugs.kde.org/105797
+Patch54: kde-workspace-kcm_fonts_dont_change_on_load.patch
+
 # support BUILD_KCM_RANDR (default ON) option
 Patch55: kde-workspace-4.10.2-BUILD_KCM_RANDR.patch
 
@@ -464,6 +468,7 @@ Requires: akonadi
 %patch51 -p1 -b .add_apper_to_kickoff_favorites
 %patch52 -p1 -b .bz#732830-login
 %patch53 -p1 -b .kdm_xauth
+%patch54 -p1 -b .kcm_fonts_dont_change_on_load
 %patch55 -p1 -b .BUILD_KCM_RANDR
 %patch57 -p1 -b .bug796969
 %patch62 -p1 -b .systemd-displaymanager
@@ -514,6 +519,7 @@ sed -i -e 's|198|197|g' powerdevil/daemon/backends/upower/powerdevilupowerbacken
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
+  -DKDE4_ENABLE_FPIE:BOOL=ON \
   -DKDE4_KDM_PAM_SERVICE=kdm \
   -DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
   -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver \
@@ -1041,6 +1047,10 @@ fi
 
 
 %changelog
+* Fri May 03 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.10.2-12
+- -DKDE4_ENABLE_FPIE:BOOL=ON
+- don't write fonts.conf on load (kde#105797)
+
 * Mon Apr 29 2013 Than Ngo <than at redhat.com> - 4.10.2-11
 - drop old patch for aurora
 - fix multilib issue