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

[Alex Alexander (wired)]

wired       09/09/01 18:55:37

  Added:                02_gentoo_append_xdg_config_dirs.patch
                        01_gentoo_set_xdg_menu_prefix.patch
  Log:
  added missing patches
  (Portage version: 2.2_rc40/cvs/Linux x86_64, RepoMan options: --force)

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

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

Index: 02_gentoo_append_xdg_config_dirs.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("/etc/xdg");
+
 #ifdef Q_WS_WIN
-        xdgdirList.append(installPath("kdedir") + "etc/xdg");
+    xdgdirList.append(installPath("kdedir") + "etc/xdg");
 #else
-        xdgdirList.append(KDESYSCONFDIR "/xdg");
+    xdgdirList.append(KDESYSCONFDIR "/xdg");
 #endif
-    }
+    xdgdirList.append("/etc/xdg");
 
     QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
     if (!localXdgDir.isEmpty())



1.1                  kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix.patch?rev=1.1&content-type=text/plain

Index: 01_gentoo_set_xdg_menu_prefix.patch
===================================================================
Set XDG_MENU_PREFIX to kde4- if not set. This fixes "empty-applications-menu" when running
KDE4 applications outside of KDE4 environment.

Index: kded/vfolder_menu.cpp
===================================================================
--- kded/vfolder_menu.cpp	(revision 1014368)
+++ kded/vfolder_menu.cpp	(working copy)
@@ -770,7 +770,9 @@
    QString result;
 
    QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
-   if (!xdgMenuPrefix.isEmpty())
+   if (xdgMenuPrefix.isEmpty())
+      xdgMenuPrefix = "@REPLACE_MENU_PREFIX@";
+
    {
       QFileInfo fileInfo(fileName);