diff --git a/copyjob-Only-set-modification-time-if-the-kio-slave-provided-it.patch b/copyjob-Only-set-modification-time-if-the-kio-slave-provided-it.patch deleted file mode 100644 index fbff694..0000000 --- a/copyjob-Only-set-modification-time-if-the-kio-slave-provided-it.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5e791ef216c230efc15b853c08b21d41eca65e0c Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -Date: Fri, 21 Jun 2019 15:30:48 +0200 -Subject: [copyjob] Only set modification time if the kio-slave provided it - -If the slave didn't pass a modification time (e.g. the http slave -doesn't), it was set to -1, resulting in setting a wrong modification -time for the destination file in copyNextFile() later on because that -case wasn't checked. - -So only set info.mtime when the slave actually provided a value. - -There's no need for further checks later in copyNextFile() (where -FileCopyJob::setModificationTime() is called) because FileCopyJob checks -for validity anyway. - -BUG: 374420 -FIXED-IN: 5.60.0 -Differential Revision: https://phabricator.kde.org/D21955 ---- - src/core/copyjob.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/core/copyjob.cpp b/src/core/copyjob.cpp -index 7288a26..0a14edc 100644 ---- a/src/core/copyjob.cpp -+++ b/src/core/copyjob.cpp -@@ -664,7 +664,10 @@ void CopyJobPrivate::addCopyInfoFromUDSEntry(const UDSEntry &entry, const QUrl & - { - struct CopyInfo info; - info.permissions = entry.numberValue(KIO::UDSEntry::UDS_ACCESS, -1); -- info.mtime = QDateTime::fromMSecsSinceEpoch(1000 * entry.numberValue(KIO::UDSEntry::UDS_MODIFICATION_TIME, -1), Qt::UTC); -+ const auto timeVal = entry.numberValue(KIO::UDSEntry::UDS_MODIFICATION_TIME, -1); -+ if (timeVal != -1) { -+ info.mtime = QDateTime::fromMSecsSinceEpoch(1000 * timeVal, Qt::UTC); -+ } - info.ctime = QDateTime::fromMSecsSinceEpoch(1000 * entry.numberValue(KIO::UDSEntry::UDS_CREATION_TIME, -1), Qt::UTC); - info.size = static_cast(entry.numberValue(KIO::UDSEntry::UDS_SIZE, -1)); - --- -cgit v1.1 - diff --git a/kio-5.59.0.tar.xz b/kio-5.59.0.tar.xz deleted file mode 100644 index 4d67779..0000000 --- a/kio-5.59.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1960a44900d804727a235388c32ce95c903d439699469945d87602cd224709b9 -size 3169088 diff --git a/kio-5.60.0.tar.xz b/kio-5.60.0.tar.xz new file mode 100644 index 0000000..1a85f2d --- /dev/null +++ b/kio-5.60.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be433fcf665679671a2e320556c39b708ed0789271e76ebb6142df058260238d +size 3176868 diff --git a/kio.changes b/kio.changes index 4cc3161..a58c035 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Sun Jul 14 06:41:38 UTC 2019 - lbeltrame@kde.org + +- Update to 5.60.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.60.0.php +- Changes since 5.59.0: + * Fix KFileItemTest::testIconNameForUrl test to reflect different icon name + * Fix i18n number-of-arguments error in knewfilemenu warning message + * [ftp] Fix wrong access time in Ftp::ftpCopyGet() + * [CopyJob] Batch reporting processed amount + * [CopyJob] Report results after finishing copy (kde#407656) + * Move redundant logic in KIO::iconNameForUrl() into KFileItem::iconName() (kde#356045) + * Install KFileCustomDialog + * [Places panel] Don't show Root by default + * Downgrade "Could not change permissions" dialog box to a qWarning + * O_PATH is only available on linux. To prevent the compiler from throwing an error due to it's absence fallback to O_RDONLY. + * Show feedback inline when creating new files or folders + * Auth Support: Drop privileges if target is not owned by root + * Revert "Auth Support: Drop privileges if target is not owned by root" + * Auth Support: Drop privileges if target is not owned by root + * [copyjob] Only set modification time if the kio-slave provided it (kde#374420) + * Cancel privilege operation for read-only target with the current user as owner + * Install in new logging directory when we use kf5 5.59.0 + * Add KProtocolInfo::defaultMimetype + * Always save view settings when switching from one view mode to another + * Restore exclusive group for sorting menu items Otherwise the items in the sorting menu have checkboxes instead of radio buttons and more than one can be selected at once, which makes no sense + * Dolphin-style view modes in the file dialog (kde#86838) + * kio_ftp: improve error handling when copying to FTP fails + * kioexec: change the scary debug messages for delayed deletion +- Dropped patches, now upstream: + * copyjob-Only-set-modification-time-if-the-kio-slave-provided-it.patch + ------------------------------------------------------------------- Wed Jun 26 06:26:38 UTC 2019 - wbauer@tmo.at diff --git a/kio.spec b/kio.spec index a4c0ece..8130bd4 100644 --- a/kio.spec +++ b/kio.spec @@ -16,14 +16,14 @@ # -%define _tar_path 5.59 +%define _tar_path 5.60 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kio -Version: 5.59.0 +Version: 5.60.0 Release: 0 Summary: Network transparent access to files and data License: LGPL-2.1-or-later @@ -33,8 +33,6 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-% Source1: baselibs.conf # PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5 Patch0: kio_help-fallback-to-kde4-docs.patch -# PATCH-FIX-UPSTREAM -Patch1: copyjob-Only-set-modification-time-if-the-kio-slave-provided-it.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes