Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde5.git;a=commitdiff;h=45a79542d567d49cf24d5bf833577ccc469b0d26
commit 45a79542d567d49cf24d5bf833577ccc469b0d26 Author: crazy <[email protected]> Date: Sat Jul 8 20:53:49 2017 +0200 kio-5.36.0-1-x86_64 * Version bump diff --git a/source/kf5/kio/FrugalBuild b/source/kf5/kio/FrugalBuild index e49df15..52a7249 100644 --- a/source/kf5/kio/FrugalBuild +++ b/source/kf5/kio/FrugalBuild @@ -2,19 +2,17 @@ # Maintainer: Melko <[email protected]> pkgname=kio -pkgver=5.35.0 -pkgrel=2 +pkgver=5.36.0 +pkgrel=1 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' \ - '982b09a76a5ac19ca33a34ee39f1f1007fd9edec') +sha1sums=('6d82f1955f96e3190fb38e19aa646caa6440a849') 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 deleted file mode 100644 index 24fc54e..0000000 --- a/source/kf5/kio/workaround-bug380898.patch +++ /dev/null @@ -1,28 +0,0 @@ -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
