Accepting request 352873 from KDE:Frameworks5
Update to 5.18.0 OBS-URL: https://build.opensuse.org/request/show/352873 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=27
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
074e7d7a8d
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1491a8dfe12bef2b5e889a1fa61eab9c4247608db2934bd22a7b0270d714d0b5
|
||||
size 2868916
|
||||
3
kio-5.18.0.tar.xz
Normal file
3
kio-5.18.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:da526bb9b7f02b9670cf6bea54645a89a5b32d008204a4f2253bdd5e74df0f08
|
||||
size 2877312
|
||||
24
kio.changes
24
kio.changes
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- 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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 10 23:06:56 UTC 2015 - hrvoje.senjan@gmail.com
|
||||
|
||||
|
||||
9
kio.spec
9
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
|
||||
@ -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 @@ 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
|
||||
|
||||
60
kio_ftp-fix-display-of-modification-time-date.patch
Normal file
60
kio_ftp-fix-display-of-modification-time-date.patch
Normal file
@ -0,0 +1,60 @@
|
||||
From: Wolfgang Bauer <wbauer@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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user