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

4.11.97

This commit is contained in:
Rex Dieter 2013-11-30 21:40:51 -06:00
parent f3d640ed40
commit 3de52986bd
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,3 +1,2 @@
/kdelibs-4.11.3.tar.xz
/kdelibs-4.11.90.tar.xz
/kdelibs-4.11.95.tar.xz
/kdelibs-4.11.97.tar.xz

19
kdelibs-4.10.0-kstandarddirs.patch → kdelibs-4.11.97-kstandarddirs.patch
View File

@ -1,19 +1,18 @@
diff -up kdelibs-4.10.0/kdecore/kernel/kstandarddirs.cpp.kstandarddirs kdelibs-4.10.0/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.10.0/kdecore/kernel/kstandarddirs.cpp.kstandarddirs 2013-01-31 07:44:58.336676504 -0600
+++ kdelibs-4.10.0/kdecore/kernel/kstandarddirs.cpp 2013-01-31 07:44:58.340676454 -0600
@@ -1153,7 +1153,9 @@ QStringList KStandardDirs::KStandardDirs
diff -up kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp.kstandarddirs kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp.kstandarddirs 2013-11-30 21:24:01.637163800 -0600
+++ kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp 2013-11-30 21:35:27.166292739 -0600
@@ -1149,7 +1149,8 @@ QStringList KStandardDirs::KStandardDirs
pit != prefixList->end();
++pit)
{
- if((*pit)!=installprefix||installdir.isEmpty())
+ // "exe" never has a custom install path, and the check triggers
+ // a false positive due to the libexecdir patch
+ if((*pit)!=installprefix||installdir.isEmpty()||!strcmp("exe", type))
- if((*pit).compare(installprefix, cs) != 0 || installdir.isEmpty())
+ // "exe" never has a custom install path, and the check triggers a false positive due to the libexecdir patch
+ if((*pit).compare(installprefix, cs) != 0 || installdir.isEmpty() || !strcmp("exe", type))
{
for (QStringList::ConstIterator it = dirs.constBegin();
it != dirs.constEnd(); ++it)
@@ -1171,6 +1173,11 @@ QStringList KStandardDirs::KStandardDirs
if ((local || testdir.exists()) && !candidates.contains(path))
@@ -1163,6 +1164,11 @@ QStringList KStandardDirs::KStandardDirs
if ((local || testdir.exists()) && !candidates.contains(path, cs))
candidates.append(path);
}
+ // special-case "config" (forward porting Chris Cheney's

9
kdelibs.spec
View File

@ -36,8 +36,8 @@
%global _changelog_trimtime %(date +%s -d "1 year ago")
Summary: KDE Libraries
Version: 4.11.95
Release: 2%{?dist}
Version: 4.11.97
Release: 1%{?dist}
Name: kdelibs
Epoch: 6
@ -103,7 +103,7 @@ Patch12: kdelibs-4.10.0-xdg-menu.patch
Patch14: kdelibs-4.11.3-libexecdir.patch
# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
Patch18: kdelibs-4.10.0-kstandarddirs.patch
Patch18: kdelibs-4.11.97-kstandarddirs.patch
# set build type
Patch20: kdelibs-4.10.0-cmake.patch
@ -604,6 +604,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%changelog
* Sun Dec 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 6:4.11.97-1
- 4.11.97
* Wed Nov 27 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.11.95-2
- rebuild (openexr)

2
sources
View File

@ -1 +1 @@
4f148f5248d3d04e33fd1affdb049ba3 kdelibs-4.11.95.tar.xz
a9c044cf48bc591894d3c4d5ad5be475 kdelibs-4.11.97.tar.xz