summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /kde-base/kdelibs/files/dist
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'kde-base/kdelibs/files/dist')
-rw-r--r--kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch18
-rw-r--r--kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch30
2 files changed, 48 insertions, 0 deletions
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);
+
diff --git a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
new file mode 100644
index 000000000000..3049b0a7a28c
--- /dev/null
+++ b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.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(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())