[kdelibs] update kstandarddirs patch

[Rex Dieter]

commit 60ad3002d0504e91eacbce689acabbd9995dc88a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Nov 20 16:06:09 2010 -0600

    update kstandarddirs patch

 ...irs.patch => kdelibs-4.5.80-kstandarddirs.patch |   12 ++++++------
 kdelibs.spec                                       |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/kdelibs-4.1.72-kstandarddirs.patch b/kdelibs-4.5.80-kstandarddirs.patch
similarity index 67%
rename from kdelibs-4.1.72-kstandarddirs.patch
rename to kdelibs-4.5.80-kstandarddirs.patch
index 6f3478b..17f285f 100644
--- a/kdelibs-4.1.72-kstandarddirs.patch
+++ b/kdelibs-4.5.80-kstandarddirs.patch
@@ -1,7 +1,7 @@
-diff -Naur kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp kdelibs-4.1.72.kstandarddirs/kdecore/kernel/kstandarddirs.cpp
---- kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp	2008-11-12 18:31:44.000000000 +0100
-+++ kdelibs-4.1.72.kstandarddirs/kdecore/kernel/kstandarddirs.cpp	2008-11-12 18:38:40.000000000 +0100
-@@ -1002,7 +1002,9 @@
+diff -up kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp.kstandarddirs kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp
+--- kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp.kstandarddirs	2010-11-20 16:04:10.456373049 -0600
++++ kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp	2010-11-20 16:05:09.356363480 -0600
+@@ -1125,7 +1125,9 @@ QStringList KStandardDirs::KStandardDirs
                   pit != prefixList->end();
                   ++pit)
              {
@@ -12,7 +12,7 @@ diff -Naur kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp kdelibs-4.1.72.kstand
  	        {
                      for (QStringList::ConstIterator it = dirs.constBegin();
                           it != dirs.constEnd(); ++it)
-@@ -1016,6 +1018,11 @@
+@@ -1143,6 +1145,11 @@ QStringList KStandardDirs::KStandardDirs
                          if ((local || testdir.exists()) && !candidates.contains(path))
                              candidates.append(path);
                      }
@@ -20,7 +20,7 @@ diff -Naur kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp kdelibs-4.1.72.kstand
 +                    // hack) - we want /etc/kde after the local config paths
 +                    // and before the ones in /usr (including kde-profile)
 +                    if (local && !strcmp("config", type))
-+                       candidates.append("/etc/kde/");
++                       candidates.append(QLatin1STring("/etc/kde/"));
                      local = false;
                  }
  	        else
diff --git a/kdelibs.spec b/kdelibs.spec
index 417f99e..54dc34c 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -72,7 +72,7 @@ Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.5.80-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
-Patch18: kdelibs-4.1.72-kstandarddirs.patch
+Patch18: kdelibs-4.5.80-kstandarddirs.patch
 # COMMENT ME PLEASE
 Patch20: kdelibs-4.1.70-cmake.patch
 # disable drkonqi by default, RHEL prefers/wants abrt