mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-09-11 21:42:39 -04:00
89 lines
3.0 KiB
Plaintext
89 lines
3.0 KiB
Plaintext
$NetBSD: patch-an,v 1.11 2007/01/26 02:44:28 markd Exp $
|
|
|
|
--- kdecore/kstandarddirs.cpp.orig 2005-10-11 04:06:02.000000000 +1300
|
|
+++ kdecore/kstandarddirs.cpp
|
|
@@ -1018,33 +1018,33 @@ static int tokenize( QStringList& tokens
|
|
|
|
QString KStandardDirs::kde_default(const char *type) {
|
|
if (!strcmp(type, "data"))
|
|
- return "share/apps/";
|
|
+ return "share/kde/apps/";
|
|
if (!strcmp(type, "html"))
|
|
- return "share/doc/HTML/";
|
|
+ return "share/doc/kde/HTML/";
|
|
if (!strcmp(type, "icon"))
|
|
return "share/icons/";
|
|
if (!strcmp(type, "config"))
|
|
- return "share/config/";
|
|
+ return "share/kde/config/";
|
|
if (!strcmp(type, "pixmap"))
|
|
return "share/pixmaps/";
|
|
if (!strcmp(type, "apps"))
|
|
- return "share/applnk/";
|
|
+ return "share/kde/applnk/";
|
|
if (!strcmp(type, "sound"))
|
|
- return "share/sounds/";
|
|
+ return "share/kde/sounds/";
|
|
if (!strcmp(type, "locale"))
|
|
- return "share/locale/";
|
|
+ return "@PKGLOCALEDIR@/locale/";
|
|
if (!strcmp(type, "services"))
|
|
- return "share/services/";
|
|
+ return "share/kde/services/";
|
|
if (!strcmp(type, "servicetypes"))
|
|
- return "share/servicetypes/";
|
|
+ return "share/kde/servicetypes/";
|
|
if (!strcmp(type, "mime"))
|
|
- return "share/mimelnk/";
|
|
+ return "share/kde/mimelnk/";
|
|
if (!strcmp(type, "cgi"))
|
|
- return "cgi-bin/";
|
|
+ return "kde-cgi-bin/";
|
|
if (!strcmp(type, "wallpaper"))
|
|
- return "share/wallpapers/";
|
|
+ return "share/kde/wallpapers/";
|
|
if (!strcmp(type, "templates"))
|
|
- return "share/templates/";
|
|
+ return "share/kde/templates/";
|
|
if (!strcmp(type, "exe"))
|
|
return "bin/";
|
|
if (!strcmp(type, "lib"))
|
|
@@ -1060,9 +1060,9 @@ QString KStandardDirs::kde_default(const
|
|
if (!strcmp(type, "xdgconf-menu"))
|
|
return "menus/";
|
|
if (!strcmp(type, "kcfg"))
|
|
- return "share/config.kcfg";
|
|
+ return "share/kde/config.kcfg";
|
|
if (!strcmp(type, "emoticons"))
|
|
- return "share/emoticons";
|
|
+ return "share/kde/emoticons";
|
|
|
|
|
|
qFatal("unknown resource type %s", type);
|
|
@@ -1386,6 +1386,7 @@ void KStandardDirs::addKDEDefaults()
|
|
}
|
|
|
|
xdgdirList.append("/usr/local/share/");
|
|
+ xdgdirList.append(KDEDIR "/share/");
|
|
xdgdirList.append("/usr/share/");
|
|
}
|
|
|
|
@@ -1560,7 +1561,7 @@ bool KStandardDirs::addCustomized(KConfi
|
|
for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
|
|
{
|
|
addPrefix(*it, priority);
|
|
- addXdgConfigPrefix(*it+"/etc/xdg", priority);
|
|
+ addXdgConfigPrefix(*it+"/xdg", priority);
|
|
addXdgDataPrefix(*it+"/share", priority);
|
|
}
|
|
// If there are no prefixes defined, check if there is a directory
|
|
@@ -1569,7 +1570,7 @@ bool KStandardDirs::addCustomized(KConfi
|
|
{
|
|
QString dir = profileDirsPrefix + profile;
|
|
addPrefix(dir, priority);
|
|
- addXdgConfigPrefix(dir+"/etc/xdg", priority);
|
|
+ addXdgConfigPrefix(dir+"/xdg", priority);
|
|
addXdgDataPrefix(dir+"/share", priority);
|
|
}
|
|
|