rpms/kdelibs/F-7 kdelibs-3.5.7-kde#146105.patch, NONE, 1.1 kdelibs.spec, 1.212, 1.213
Than Ngo (than)
fedora-extras-commits at redhat.com
Wed May 30 08:52:22 UTC 2007
Author: than
Update of /cvs/extras/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14268
Modified Files:
kdelibs.spec
Added Files:
kdelibs-3.5.7-kde#146105.patch
Log Message:
- apply upstream patch to fix kde#146105
kdelibs-3.5.7-kde#146105.patch:
--- NEW FILE kdelibs-3.5.7-kde#146105.patch ---
Index: kdecore/kcmdlineargs.cpp
===================================================================
--- kdecore/kcmdlineargs.cpp (Revision 669593)
+++ kdecore/kcmdlineargs.cpp (Revision 669594)
@@ -1248,21 +1248,22 @@
KURL KCmdLineArgs::makeURL(const char *_urlArg)
{
- QString urlArg = QFile::decodeName(_urlArg);
- if (!QDir::isRelativePath(urlArg))
- {
+ const QString urlArg = QFile::decodeName(_urlArg);
+ QFileInfo fileInfo(urlArg);
+ if (!fileInfo.isRelative()) { // i.e. starts with '/', on unix
KURL result;
result.setPath(urlArg);
return result; // Absolute path.
}
- if ( !KURL::isRelativeURL(urlArg) )
- return KURL(urlArg); // Argument is a URL
+ if ( KURL::isRelativeURL(urlArg) || fileInfo.exists() ) {
+ KURL result;
+ result.setPath( cwd()+'/'+urlArg );
+ result.cleanPath();
+ return result; // Relative path
+ }
- KURL result;
- result.setPath( cwd()+"/"+urlArg );
- result.cleanPath();
- return result; // Relative path
+ return KURL(urlArg); // Argument is a URL
}
void
Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-7/kdelibs.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- kdelibs.spec 24 May 2007 15:59:50 -0000 1.212
+++ kdelibs.spec 30 May 2007 08:51:36 -0000 1.213
@@ -60,11 +60,12 @@
Patch500: kdelibs-3.5.6-qt3.3.8.patch
Patch501: kdelibs-3.5.6-kde#126812.patch
# kget ignores simultaneous download limit (kde #101956)
-Patch101956: kdelibs-3.5.0-101956.patch
+Patch502: kdelibs-3.5.0-101956.patch
# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
-Patch137675: kdelibs-3.5.6-137675.patch
+Patch503: kdelibs-3.5.6-137675.patch
## http://bugs.kde.org/140768
-Patch140768: kdelibs-3.5.6-kde#140768.patch
+Patch504: kdelibs-3.5.6-kde#140768.patch
+Patch505: kdelibs-3.5.7-kde#146105.patch
# security issue
# CVE-2007-0537
@@ -199,8 +200,9 @@
# upstream patches
%patch500 -p0 -b .qt3.3.8
%patch501 -p1 -b .kde#126812
-%patch137675 -p0 -b .kde#137675
-%patch140768 -p1 -b .kde#140768
+%patch503 -p0 -b .kde#137675
+%patch504 -p1 -b .kde#140768
+%patch505 -p1 -b .kde#146105
# security
%patch1000 -p0 -b .bz#225420-CVE-2007-0537
@@ -466,6 +468,7 @@
* Thu May 24 2007 Than Ngo <than at redhat.com> 3.5.6-10.fc7
- don't change permission .ICEauthority by sudo KDE programs
- apply patch to fix locale issue
+- apply upstream patch to fix kde#146105
* Thu May 16 2007 Rex Dieter <rdieter[AT]fedorproject.org> - 6:3.5.6-9
- make qtdocdir handling robust
More information about the fedora-extras-commits
mailing list