diff options
| author |   Alex Alexander <wired@gentoo.org> | 2009-09-01 18:55:37 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2009-09-01 18:55:37 +0000 |
| commit | 5d3e807fddf0afe0fc20e3330151a2ba8d86b605 (patch) | |
| tree | 7b3a9999456072e73a5f75dcf0b373f21b045ad4 | |
| parent | Stabilised on amd64 and x86. (diff) | |
| download | gentoo-2-5d3e807fddf0afe0fc20e3330151a2ba8d86b605.tar.gz gentoo-2-5d3e807fddf0afe0fc20e3330151a2ba8d86b605.tar.bz2 gentoo-2-5d3e807fddf0afe0fc20e3330151a2ba8d86b605.zip | |
added missing patches
(Portage version: 2.2_rc40/cvs/Linux x86_64, RepoMan options: --force)
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix.patch | 18 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs.patch | 30 |
3 files changed, 54 insertions, 1 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 9f2b5e2174b7..a4d1c948d502 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.620 2009/09/01 15:11:09 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.621 2009/09/01 18:55:37 wired Exp $ + + 01 Sep 2009; Alex Alexander <wired@gentoo.org> + +files/dist/01_gentoo_set_xdg_menu_prefix.patch, + +files/dist/02_gentoo_append_xdg_config_dirs.patch: + added missing patches *kdelibs-4.3.1 (01 Sep 2009) diff --git a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix.patch b/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix.patch new file mode 100644 index 000000000000..005b06094f05 --- /dev/null +++ b/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix.patch @@ -0,0 +1,18 @@ +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); + diff --git a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs.patch b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs.patch new file mode 100644 index 000000000000..072f0ffbf366 --- /dev/null +++ b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs.patch @@ -0,0 +1,30 @@ +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()) |