- port kstandarddirs hack, to search /etc/kde
This commit is contained in:
parent
634d5ca195
commit
19bd5a3481
15
kdelibs-4.0.4-kstandarddirs.patch
Normal file
15
kdelibs-4.0.4-kstandarddirs.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff -up kdelibs-4.0.4/kdecore/kernel/kstandarddirs.cpp.dirs kdelibs-4.0.4/kdecore/kernel/kstandarddirs.cpp
|
||||
--- kdelibs-4.0.4/kdecore/kernel/kstandarddirs.cpp.dirs 2008-05-22 12:17:33.000000000 -0500
|
||||
+++ kdelibs-4.0.4/kdecore/kernel/kstandarddirs.cpp 2008-05-22 12:27:50.000000000 -0500
|
||||
@@ -998,6 +998,10 @@ QStringList KStandardDirs::resourceDirs(
|
||||
if ((local || testdir.exists()) && !candidates.contains(path))
|
||||
candidates.append(path);
|
||||
}
|
||||
+ // UGLY HACK - forward porting Chris CHeney's HACK - Rex Dieter
|
||||
+ if ( local && (!strcmp("config", type)))
|
||||
+ candidates.append("/etc/kde/");
|
||||
+ //
|
||||
local = false;
|
||||
}
|
||||
}
|
||||
diff -up kdelibs-4.0.4/kdecore/kernel/kstandarddirs_unix.cpp.dirs kdelibs-4.0.4/kdecore/kernel/kstandarddirs_unix.cpp
|
@ -1,7 +1,7 @@
|
||||
|
||||
Summary: K Desktop Environment 4 - Libraries
|
||||
Version: 4.0.72
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
Name: kdelibs
|
||||
@ -79,6 +79,8 @@ Patch14: kdelibs-4.0.3-libexecdir.patch
|
||||
# fix proxy support (#443931, kde#155707)
|
||||
# patch by Sergey Saukh: http://bugs.kde.org/show_bug.cgi?id=155707#c46
|
||||
Patch15: kdelibs-4.0.4-proxy.patch
|
||||
# forward port kstandarddirs hack to search /etc/kde
|
||||
Patch18: kdelibs-4.0.4-kstandarddirs.patch
|
||||
|
||||
## upstream patches
|
||||
|
||||
@ -198,6 +200,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||
%patch13 -p1 -b .fedora-buildtype
|
||||
%patch14 -p1 -b .libexecdir
|
||||
%patch15 -p0 -b .proxy
|
||||
%patch18 -p1 -b .kstandarddirs
|
||||
|
||||
|
||||
%build
|
||||
@ -361,6 +364,9 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu May 22 2008 Rex Dieter <rdieter@fedoraproject.org> - 4.0.72-6
|
||||
- kstandarddirs hack to search /etc/kde
|
||||
|
||||
* Thu May 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-5
|
||||
- keep libphonon.so in %%{_libdir} for non-KDE apps (#447831)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user