[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge/kde-4.10] portage/kde/kdelibs: fix sftp kioslave
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2013-06-04 23:33:25
Message-ID: 20130604233325.96777A605A () git ! kde ! org
[Download RAW message or body]

Git commit 25d93c0e33d8b36964b655f0681a287c19f0c2bd by Patrick Spendrin.
Committed on 05/06/2013 at 01:33.
Pushed by sengels into branch 'kde-4.10'.

fix sftp kioslave

M  +12   -0    portage/kde/kdelibs/kdelibs-4.10.2-20130430.diff

http://commits.kde.org/emerge/25d93c0e33d8b36964b655f0681a287c19f0c2bd

diff --git a/portage/kde/kdelibs/kdelibs-4.10.2-20130430.diff \
b/portage/kde/kdelibs/kdelibs-4.10.2-20130430.diff index fde4002..3a3c74c 100644
--- a/portage/kde/kdelibs/kdelibs-4.10.2-20130430.diff
+++ b/portage/kde/kdelibs/kdelibs-4.10.2-20130430.diff
@@ -38,3 +38,15 @@ diff -Nru -x '*~' \
kdelibs-4.10.2.orig/kioslave/http/tests/CMakeLists.txt kdelibs  if(GSSAPI_FOUND)
    target_link_libraries(httpobjecttest ${GSSAPI_LIBS})
  endif(GSSAPI_FOUND)
+diff -Nru -x '*~' kdelibs-4.10.2.orig/kfile/kdiroperator.cpp \
kdelibs-4.10.2/kfile/kdiroperator.cpp +--- \
kdelibs-4.10.2.orig/kfile/kdiroperator.cpp	2013-03-01 07:26:14.011780000 +0100 ++++ \
kdelibs-4.10.2/kfile/kdiroperator.cpp	2013-06-03 20:39:40.523920500 +0200 +@@ -1040,7 \
+1040,7 @@ + 
+     newurl.adjustPath( KUrl::AddTrailingSlash );
+ #ifdef Q_WS_WIN
+-    QString pathstr = QDir::fromNativeSeparators(newurl.toLocalFile());
++    QString pathstr = (newurl.isLocalFile()) ? \
QDir::fromNativeSeparators(newurl.toLocalFile()) : newurl.path(); + #else
+     QString pathstr = newurl.path();
+ #endif


[prev in list] [next in list] [prev in thread] [next in thread]