rpms/kdelibs
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update kstandarddirs patch

Browse Source
This commit is contained in:
Rex Dieter 2010-11-20 16:06:09 -06:00
parent 97e2720006
commit 60ad3002d0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kdelibs-4.1.72-kstandarddirs.patch → kdelibs-4.5.80-kstandarddirs.patch
View File

@ -1,7 +1,7 @@
diff -Naur kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp kdelibs-4.1.72.kstandarddirs/kdecore/kernel/kstandarddirs.cpp diff -up kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp.kstandarddirs kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp 2008-11-12 18:31:44.000000000 +0100 --- kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp.kstandarddirs 2010-11-20 16:04:10.456373049 -0600
+++ kdelibs-4.1.72.kstandarddirs/kdecore/kernel/kstandarddirs.cpp 2008-11-12 18:38:40.000000000 +0100 +++ kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp 2010-11-20 16:05:09.356363480 -0600
@@ -1002,7 +1002,9 @@ @@ -1125,7 +1125,9 @@ QStringList KStandardDirs::KStandardDirs
pit != prefixList->end(); pit != prefixList->end();
++pit) ++pit)
{ {
@ -12,7 +12,7 @@ diff -Naur kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp kdelibs-4.1.72.kstand
{ {
for (QStringList::ConstIterator it = dirs.constBegin(); for (QStringList::ConstIterator it = dirs.constBegin();
it != dirs.constEnd(); ++it) it != dirs.constEnd(); ++it)
@@ -1016,6 +1018,11 @@ @@ -1143,6 +1145,11 @@ QStringList KStandardDirs::KStandardDirs
if ((local || testdir.exists()) && !candidates.contains(path)) if ((local || testdir.exists()) && !candidates.contains(path))
candidates.append(path); candidates.append(path);
} }
@ -20,7 +20,7 @@ diff -Naur kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp kdelibs-4.1.72.kstand
+ // hack) - we want /etc/kde after the local config paths + // hack) - we want /etc/kde after the local config paths
+ // and before the ones in /usr (including kde-profile) + // and before the ones in /usr (including kde-profile)
+ if (local && !strcmp("config", type)) + if (local && !strcmp("config", type))
+ candidates.append("/etc/kde/"); + candidates.append(QLatin1STring("/etc/kde/"));
local = false; local = false;
} }
else else

2
kdelibs.spec
View File

@ -72,7 +72,7 @@ Patch12: kdelibs-4.1.0-xdg-menu.patch
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
Patch14: kdelibs-4.5.80-libexecdir.patch Patch14: kdelibs-4.5.80-libexecdir.patch
# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir} # kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
Patch18: kdelibs-4.1.72-kstandarddirs.patch Patch18: kdelibs-4.5.80-kstandarddirs.patch
# COMMENT ME PLEASE # COMMENT ME PLEASE
Patch20: kdelibs-4.1.70-cmake.patch Patch20: kdelibs-4.1.70-cmake.patch
# disable drkonqi by default, RHEL prefers/wants abrt # disable drkonqi by default, RHEL prefers/wants abrt