[gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files/dist: 02_gentoo_append_xdg_config_dirs-1.patch

[Theo Chatzimichos (tampakrap)]

tampakrap    11/01/26 23:45:57

  Added:                02_gentoo_append_xdg_config_dirs-1.patch
  Log:
  Add missing patch from kde overlay
  
  (Portage version: 2.2.0_alpha17/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch?rev=1.1&content-type=text/plain

Index: 02_gentoo_append_xdg_config_dirs-1.patch
===================================================================
Set up XDG_CONFIG_DIRS lookup in order:
1. custom XDG_CONFIG_DIRS from env
2. kdeprefix xdg config dirs
3. /etc/xdg

Index: kdecore/kernel/kstandarddirs.cpp
===================================================================
--- kdecore/kernel/kstandarddirs.cpp	(revision 1014759)
+++ kdecore/kernel/kstandarddirs.cpp	(working copy)
@@ -1664,16 +1664,13 @@
     {
         tokenize(xdgdirList, xdgdirs, QString(QChar(KPATH_SEPARATOR)));
     }
-    else
-    {
-        xdgdirList.clear();
-        xdgdirList.append(QString::fromLatin1("/etc/xdg"));
+
 #ifdef Q_WS_WIN
-        xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
+    xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
 #else
-        xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
+    xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
 #endif
-    }
+    xdgdirList.append(QString::fromLatin1("/etc/xdg"));
 
     QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
     if (!localXdgDir.isEmpty())