Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6811818b4eb775015f50c41490a3d6f53060f78b
commit 6811818b4eb775015f50c41490a3d6f53060f78b Author: crazy <[email protected]> Date: Tue Jun 20 14:32:43 2017 +0200 kio-5.35.0-2-x86_64 * added workaround patch for bug380898 diff --git a/source/kf5/kio/FrugalBuild b/source/kf5/kio/FrugalBuild index 13e81ca..e49df15 100644 --- a/source/kf5/kio/FrugalBuild +++ b/source/kf5/kio/FrugalBuild @@ -3,16 +3,18 @@ pkgname=kio pkgver=5.35.0 -pkgrel=1 +pkgrel=2 pkgdesc="Network transparent access to files and data." groups=('kf5') archs=("x86_64") _F_kde_project="frameworks" Finclude kf5 +source+=(workaround-bug380898.patch) depends=("karchive>=$_F_kf5_full" "kjobwidgets>=$_F_kf5_full" "kbookmarks>=$_F_kf5_full" \ "kwallet5>=$_F_kf5_full" "solid>=$_F_kf5_full" "libkrb5>=1.14.4" 'libxslt') makedepends+=("kdoctools>=$_F_kf5_full" "qt5-base>=$_F_kdever_qt5" 'krb5>=1.14.4') -sha1sums=('4c3f2ad925001448d204e7265335e79d786e5206') +sha1sums=('4c3f2ad925001448d204e7265335e79d786e5206' \ + '982b09a76a5ac19ca33a34ee39f1f1007fd9edec') conflicts=('kdebase-runtime-kioslave' 'libkio' 'kdebase-runtime-kioexec' 'kdebase-runtime-kpasswdserver' 'audiocd-kio' 'ksgmltools2') replaces=("${conflicts[@]}") diff --git a/source/kf5/kio/workaround-bug380898.patch b/source/kf5/kio/workaround-bug380898.patch new file mode 100644 index 0000000..24fc54e --- /dev/null +++ b/source/kf5/kio/workaround-bug380898.patch @@ -0,0 +1,28 @@ +diff --git a/src/core/copyjob.cpp b/src/core/copyjob.cpp +index 22b3b4d6..fda5acf4 100644 +--- a/src/core/copyjob.cpp ++++ b/src/core/copyjob.cpp +@@ -668,13 +668,21 @@ void CopyJobPrivate::addCopyInfoFromUDSEntry(const UDSEntry &entry, const QUrl & + url = addPathToUrl(url, fileName); + } + } +- qCDebug(KIO_COPYJOB_DEBUG) << "fileName=" << fileName << "url=" << url; ++ + if (!localPath.isEmpty() && kio_resolve_local_urls && destinationState != DEST_DOESNT_EXIST) { + url = QUrl::fromLocalFile(localPath); + } + +- info.uSource = url; ++ if (!url.isEmpty()) { ++ info.uSource = url; ++ } else { ++ // seems like urlStr is NULL? why ? ++ qCDebug(KIO_COPYJOB_DEBUG) << "Frugalware: urlStr=NULL , setting info.uSource to m_currentSrcURL"; ++ info.uSource = m_currentSrcURL; ++ } + info.uDest = currentDest; ++ ++ qCDebug(KIO_COPYJOB_DEBUG) << "fileName=" << fileName << "url=" << url; + qCDebug(KIO_COPYJOB_DEBUG) << "uSource=" << info.uSource << "uDest(1)=" << info.uDest; + // Append filename or dirname to destination URL, if allowed + if (destinationState == DEST_IS_DIR && _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
