[kde-workspace] kcm_fonts should use $XDG_CONFIG_HOME/fontconfig/fonts.conf for storage settings for fontconfig > 2.

[Rex Dieter]

commit 727e5f62e8571236a1b40e49643f783bc0023518
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 14:08:37 2012 -0500

    kcm_fonts should use $XDG_CONFIG_HOME/fontconfig/fonts.conf for storage settings for fontconfig > 2.10.0 (kde#304317)

 kde-workspace-4.9.0-fontconfigdir.patch |   25 +++++++++++++++++++++++++
 kde-workspace.spec                      |   11 ++++++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/kde-workspace-4.9.0-fontconfigdir.patch b/kde-workspace-4.9.0-fontconfigdir.patch
new file mode 100644
index 0000000..97c722d
--- /dev/null
+++ b/kde-workspace-4.9.0-fontconfigdir.patch
@@ -0,0 +1,25 @@
+--- kde-workspace-4.9.0/kcontrol/fonts/kxftconfig.cpp.fontconfigdir	2012-05-23 07:51:10.000000000 +0800
++++ kde-workspace-4.9.0/kcontrol/fonts/kxftconfig.cpp	2012-08-01 20:34:29.000000000 +0800
+@@ -31,6 +31,8 @@
+ #include <QByteArray>
+ #include <klocale.h>
+ #include <kde_file.h>
++#include <KDE/KGlobal>
++#include <KDE/KStandardDirs>
+ #include <QDir>
+ 
+ #include <stdarg.h>
+@@ -143,7 +145,12 @@
+         return files.front();  // Just return the 1st one...
+     }
+     else // Hmmm... no known files?
+-        return home+"/.fonts.conf";
++    {
++	if(FcGetVersion() >= 21000)
++		return KGlobal::dirs()->localxdgconfdir()+"fontconfig/fonts.conf";
++	else
++		return home+"/.fonts.conf";
++    }
+ }
+ 
+ static QString getEntry(QDomElement element, const char *type, unsigned int numAttributes, ...)
diff --git a/kde-workspace.spec b/kde-workspace.spec
index d9bcf0f..0a95de0 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -12,7 +12,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -104,6 +104,11 @@ Patch57: kde-workspace-4.8.0-bug796969.patch
 # initial systemd support
 Patch58: kde-workspace-4.8.0-systemd-shutdown.patch
 
+# fontconfig-2.10+, support $XDG_CONFIG_HOME/fontconfig/fonts.conf
+# https://bugs.kde.org/show_bug.cgi?id=304317
+# http://svnweb.mageia.org/packages/cauldron/kdebase4-workspace/current/SOURCES/kdebase-workspace-4.9.0-fontconfigdir.patch
+Patch59: kde-workspace-4.9.0-fontconfigdir.patch
+
 ## upstream patches
 
 ## plasma active patches
@@ -436,6 +441,7 @@ Requires: akonadi
 #patch56 -p1 -b .kwin_llvmpipe_whitelist
 %patch57 -p1 -b .bug796969
 %patch58 -p1 -b .systemd-shutdown
+%patch59 -p1 -b fontconfigdir
 
 # upstream patches
 
@@ -988,6 +994,9 @@ fi
 
 
 %changelog
+* Fri Aug 03 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.0-2
+- kcm_fonts should use $XDG_CONFIG_HOME/fontconfig/fonts.conf for storage settings for fontconfig > 2.10.0 (kde#304317)
+
 * Thu Jul 26 2012 Lukas Tinkl <ltinkl at redhat.com> - 4.9.0-1
 - 4.9.0