From 7da048e911f4e776a0c325972fb33fb5890e1221b260c55cda5f6b4a6822e0a4 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 6 Feb 2016 18:20:59 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=120 --- fix-kcookiejar-autoload.patch | 25 -------- kio.changes | 2 + ...ix-display-of-modification-time-date.patch | 60 ------------------- 3 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 fix-kcookiejar-autoload.patch delete mode 100644 kio_ftp-fix-display-of-modification-time-date.patch diff --git a/fix-kcookiejar-autoload.patch b/fix-kcookiejar-autoload.patch deleted file mode 100644 index 91d4df8..0000000 --- a/fix-kcookiejar-autoload.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: David Faure -Date: Sun, 10 Jan 2016 19:05:04 +0000 -Subject: Repair kcookiejar autoload, the values got swapped in 6db255388532a4 -X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=c9f29601c444f174604eca0a4998d2f97436ecec ---- -Repair kcookiejar autoload, the values got swapped in 6db255388532a4 - -Change-Id: Ide7bb18ea6b24b8c9221900b04040f0b6d743ce8 ---- - - ---- a/src/ioslaves/http/kcookiejar/kcookiejar.json -+++ b/src/ioslaves/http/kcookiejar/kcookiejar.json -@@ -62,6 +62,6 @@ - ] - }, - "X-KDE-DBus-ModuleName": "kcookiejar", -- "X-KDE-Kded-autoload": true, -- "X-KDE-Kded-load-on-demand": false --} -\ No newline at end of file -+ "X-KDE-Kded-autoload": false, -+ "X-KDE-Kded-load-on-demand": true -+} - diff --git a/kio.changes b/kio.changes index 0537d11..56159a5 100644 --- a/kio.changes +++ b/kio.changes @@ -4,6 +4,8 @@ Sat Feb 6 18:03:41 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.19.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.19.0.php +- Drop upstreamed patches: fix-kcookiejar-autoload.patch and + kio_ftp-fix-display-of-modification-time-date.patch ------------------------------------------------------------------- Mon Jan 24 09:00:34 UTC 2016 - tittiatcoke@gmail.com diff --git a/kio_ftp-fix-display-of-modification-time-date.patch b/kio_ftp-fix-display-of-modification-time-date.patch deleted file mode 100644 index db6ec45..0000000 --- a/kio_ftp-fix-display-of-modification-time-date.patch +++ /dev/null @@ -1,60 +0,0 @@ -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 -