From 2dec7aa0c63007801ee928f09426a5e7f9789dce70a0f769ada89fb6e751aae6 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 2 Jan 2016 17:44:01 +0000 Subject: [PATCH 1/4] start with 5.18.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=109 --- kio.changes | 7 +++++++ kio.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/kio.changes b/kio.changes index e53eacd..5f084ab 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Jan 2 17:43:55 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.18.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.18.0.php + ------------------------------------------------------------------- Thu Dec 10 23:06:56 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kio.spec b/kio.spec index a213960..ce9a733 100644 --- a/kio.spec +++ b/kio.spec @@ -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 From e3f1a3c744e607214f6e7b9788334591f9c12d0b183ced4345b86b67ea5812d6 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 2 Jan 2016 17:57:46 +0000 Subject: [PATCH 2/4] start with 5.18.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=110 --- kio-5.17.0.tar.xz | 3 --- kio-5.18.0.tar.xz | 3 +++ kio.spec | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 kio-5.17.0.tar.xz create mode 100644 kio-5.18.0.tar.xz diff --git a/kio-5.17.0.tar.xz b/kio-5.17.0.tar.xz deleted file mode 100644 index 3754a53..0000000 --- a/kio-5.17.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1491a8dfe12bef2b5e889a1fa61eab9c4247608db2934bd22a7b0270d714d0b5 -size 2868916 diff --git a/kio-5.18.0.tar.xz b/kio-5.18.0.tar.xz new file mode 100644 index 0000000..51ab97e --- /dev/null +++ b/kio-5.18.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da526bb9b7f02b9670cf6bea54645a89a5b32d008204a4f2253bdd5e74df0f08 +size 2877312 diff --git a/kio.spec b/kio.spec index ce9a733..4bddae4 100644 --- a/kio.spec +++ b/kio.spec @@ -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 From ed752621735ef83630da933f1002497a7e310b8558f3919b85e92bc8ac540540 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Thu, 7 Jan 2016 15:56:18 +0000 Subject: [PATCH 3/4] Accepting request 352446 from home:wolfi323:test - Added kio_ftp-fix-display-of-modification-time-date.patch: fixes display of file/directory modification time in kio_ftp (boo#960500, kde#354597) OBS-URL: https://build.opensuse.org/request/show/352446 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=111 --- kio.changes | 7 +++ kio.spec | 3 + ...ix-display-of-modification-time-date.patch | 60 +++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 kio_ftp-fix-display-of-modification-time-date.patch diff --git a/kio.changes b/kio.changes index 5f084ab..ec718ce 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 7 12:54:34 UTC 2016 - wbauer@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.senjan@gmail.com diff --git a/kio.spec b/kio.spec index 4bddae4..02ccccf 100644 --- a/kio.spec +++ b/kio.spec @@ -75,6 +75,8 @@ 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 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 @@ Development files. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build diff --git a/kio_ftp-fix-display-of-modification-time-date.patch b/kio_ftp-fix-display-of-modification-time-date.patch new file mode 100644 index 0000000..db6ec45 --- /dev/null +++ b/kio_ftp-fix-display-of-modification-time-date.patch @@ -0,0 +1,60 @@ +From: Wolfgang Bauer +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 + From 31a48718d059182acba6c490b7aa07f07b5d5d43f3e91d40c6dc2c37306b04d9 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 9 Jan 2016 18:02:28 +0000 Subject: [PATCH 4/4] changelogs OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=112 --- kio.changes | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/kio.changes b/kio.changes index ec718ce..ea4bc7a 100644 --- a/kio.changes +++ b/kio.changes @@ -9,6 +9,16 @@ Thu Jan 7 12:54:34 UTC 2016 - wbauer@tmo.at Sat Jan 2 17:43:55 UTC 2016 - hrvoje.senjan@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