Hello community, here is the log from the commit of package kio for openSUSE:Factory checked in at 2016-01-20 09:45:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kio (Old) and /work/SRC/openSUSE:Factory/.kio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kio" Changes: -------- --- /work/SRC/openSUSE:Factory/kio/kio.changes 2015-12-29 12:53:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kio.new/kio.changes 2016-01-20 09:45:56.000000000 +0100 @@ -1,0 +2,24 @@ +Thu Jan 7 12:54:34 UTC 2016 - wba...@tmo.at + +- Added kio_ftp-fix-display-of-modification-time-date.patch: fixes + display of file/directory modification time in kio_ftp + (boo#960500, kde#354597) + +------------------------------------------------------------------- +Sat Jan 2 17:43:55 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.18.0 + * Fix kiod for Qt 5.6's threaded dbus: messageFilter must wait + until the module is loaded before returning + * Change the error code when pasting/moving into a subdirectory + * Fix emptyTrash blocked issue + * Fix wrong button in KUrlNavigator for remote URLs + * KUrlComboBox: fix returning an absolute path from urls() + * kiod: disable session management + * Add autocompletion for '.' input which offers all hidden + files/folders* (kde#354981) + * ktelnetservice: fix off by one in argc check + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.18.0.php + +------------------------------------------------------------------- Old: ---- kio-5.17.0.tar.xz New: ---- kio-5.18.0.tar.xz kio_ftp-fix-display-of-modification-time-date.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kio.spec ++++++ --- /var/tmp/diff_new_pack.RTa2Cl/_old 2016-01-20 09:45:58.000000000 +0100 +++ /var/tmp/diff_new_pack.RTa2Cl/_new 2016-01-20 09:45:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kio # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.17 +%define _tar_path 5.18 Name: kio -Version: 5.17.0 +Version: 5.18.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -75,6 +75,8 @@ 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 kio_ftp-fix-display-of-modification-time-date boo#960500, kde#354597 -- fixes display of file/dir modification time in kio_ftp +Patch1: kio_ftp-fix-display-of-modification-time-date.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -121,6 +123,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build ++++++ kio-5.17.0.tar.xz -> kio-5.18.0.tar.xz ++++++ ++++ 199050 lines of diff (skipped) ++++++ kio_ftp-fix-display-of-modification-time-date.patch ++++++ From: Wolfgang Bauer <wba...@tmo.at> Date: Thu, 07 Jan 2016 12:38:55 +0000 Subject: [kio_ftp] fix display of file/directory modification time/date X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=68af1d7e89b7fed136d4cc62b76c1c6ded2d94eb --- [kio_ftp] fix display of file/directory modification time/date - QDate() treats the year literally (i.e. 90 is really year 90, not 1990), so subtracting 1900 is wrong. - Use QDate::currentDate() instead of QDateTime::currentDateTime(), we only need the current date anyway - Initialize day, month, and year to the current date instead of 0. In the case when no year is mentioned in the server's reply (the year is implicit), it wasn't set to the current year at all, so the result was either 0 or -1. BUG: 354597 FIXED-IN: 5.19.0 REVIEW: 126659 --- --- a/src/ioslaves/ftp/ftp.cpp +++ b/src/ioslaves/ftp/ftp.cpp @@ -1763,18 +1763,16 @@ // Parsing the date is somewhat tricky // Examples : "Oct 6 22:49", "May 13 1999" - // First get current time - we need the current month and year - QDateTime currentTime(QDateTime::currentDateTime()); - int currentMonth = currentTime.date().month(); + // First get current date - we need the current month and year + QDate currentDate(QDate::currentDate()); + int currentMonth = currentDate.month(); //qDebug() << "Current time :" << asctime( tmptr ); - // Reset time fields - currentTime.setTime(QTime(0, 0, 0)); - // Get day number (always second field) - int day = 0; - int month = 0; - int year = 0; + int day = currentDate.day(); + int month = currentDate.month(); + int year = currentDate.year(); int minute = 0; int hour = 0; + // Get day number (always second field) if (p_date_2) { day = atoi(p_date_2); } @@ -1794,7 +1792,7 @@ // Parse third field if (qstrlen(p_date_3) == 4) { // 4 digits, looks like a year - year = atoi(p_date_3) - 1900; + year = atoi(p_date_3); } else { // otherwise, the year is implicit // according to man ls, this happens when it is between than 6 months
