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

- port kstandarddirs hack, to search /etc/kde

This commit is contained in:
Rex Dieter 2008-05-22 18:43:42 +00:00
parent e5d986d5c3
commit a444a5e960
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kdelibs-4.0.4-kstandarddirs.patch Normal file
View 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

10
kdelibs.spec
View File

@ -1,7 +1,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.0.4
Release: 5%{?dist}
Release: 6%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -84,6 +84,8 @@ Patch16: kdelibs-4.0.4-phonon-hal.patch
# kdebug:162189: Problems with deleting dirs on FTP server
# http://websvn.kde.org/?view=rev&revision=810707
Patch17: kdelibs-4.0.4-remote-encoding.patch
# forward port kstandarddirs hack to search /etc/kde
Patch18: kdelibs-4.0.4-kstandarddirs.patch
## upstream patches
@ -205,6 +207,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch15 -p0 -b .proxy
%patch16 -p1 -b .phonon-hal
%patch17 -p1 -b .remote-encoding
%patch18 -p1 -b .kstandarddirs
%build
@ -362,7 +365,10 @@ rm -rf %{buildroot}
%changelog
* Wed May 21 2008 Lukáš Tinkl <ltinkl@redhat.com>
* Thu May 22 2008 Rex Dieter <rdieter@fedoraproject.org> - 4.0.4-6
- kstandarddirs hack to search /etc/kde
* Wed May 21 2008 Lukáš Tinkl <ltinkl@redhat.com> - 4.0.4-5
- fix problems with deleting dirs on FTP server (kdebug:162189)
* Thu May 15 2008 Lukáš Tinkl <ltinkl@redhat.com> - 4.0.4-4