summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-06-10 21:37:58 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-06-10 21:37:58 +0000
commit59536de3732fbcad0011a5dfb3bcd786ba9bb470 (patch)
treee102f7b6e527df014fc8dc7a2f1284e79afd56fa /kde-base
parentRemanifest as tarball was changed (diff)
downloadgentoo-2-59536de3732fbcad0011a5dfb3bcd786ba9bb470.tar.gz
gentoo-2-59536de3732fbcad0011a5dfb3bcd786ba9bb470.tar.bz2
gentoo-2-59536de3732fbcad0011a5dfb3bcd786ba9bb470.zip
Add missing patch, bug 371063
(Portage version: 2.1.10.1/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdelibs/ChangeLog6
-rw-r--r--kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch18
2 files changed, 23 insertions, 1 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index c13f1524cfc3..78bc129543e2 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdelibs
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.766 2011/06/10 18:00:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.767 2011/06/10 21:37:58 dilfridge Exp $
+
+ 10 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +files/dist/01_gentoo_set_xdg_menu_prefix-1.patch:
+ Add missing patch, bug 371063
*kdelibs-4.6.4 (10 Jun 2011)
diff --git a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch b/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
new file mode 100644
index 000000000000..228914fbb82c
--- /dev/null
+++ b/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
@@ -0,0 +1,18 @@
+Set XDG_MENU_PREFIX to kde-4- 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 = "kde-4-";
++
+ {
+ QFileInfo fileInfo(fileName);
+