diff --git a/.gitignore b/.gitignore index f9df93d..8ebfc10 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kio-5.41.0.tar.xz +/kio-5.42.0.tar.xz diff --git a/0012-forward-socket-error-string-to-KTcpSocket.patch b/0012-forward-socket-error-string-to-KTcpSocket.patch deleted file mode 100644 index ed7b872..0000000 --- a/0012-forward-socket-error-string-to-KTcpSocket.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 84f290a2659d4e8704282d186cfa3a1093bcd133 Mon Sep 17 00:00:00 2001 -From: Martin Koller -Date: Fri, 8 Dec 2017 14:37:41 +0100 -Subject: [PATCH 12/25] forward socket error string to KTcpSocket - -KTcpSocket is a QIODevice, internally using a Qt socket - however it did -not set the error string of itself when the internal socket -signals some error condition. Now it does. - -Differential Revision: https://phabricator.kde.org/D9249 ---- - src/core/ktcpsocket.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/core/ktcpsocket.cpp b/src/core/ktcpsocket.cpp -index a3e70c4b..439e9022 100644 ---- a/src/core/ktcpsocket.cpp -+++ b/src/core/ktcpsocket.cpp -@@ -349,11 +349,13 @@ public: - //private slots - void reemitSocketError(QAbstractSocket::SocketError e) - { -+ q->setErrorString(sock.errorString()); - emit q->error(errorFromAbsSocket(e)); - } - - void reemitSslErrors(const QList &errors) - { -+ q->setErrorString(sock.errorString()); - q->showSslErrors(); //H4X - QList kErrors; - foreach (const QSslError &e, errors) { --- -2.14.3 - diff --git a/kf5-kio.spec b/kf5-kio.spec index cee618c..f73b700 100644 --- a/kf5-kio.spec +++ b/kf5-kio.spec @@ -1,8 +1,8 @@ %global framework kio Name: kf5-%{framework} -Version: 5.41.0 -Release: 3%{?dist} +Version: 5.42.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction License: GPLv2+ and MIT and BSD @@ -18,7 +18,6 @@ URL: https://cgit.kde.org/%{framework}.git Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz ## upstream patches -Patch12: 0012-forward-socket-error-string-to-KTcpSocket.patch ## upstreamable patches # revert part of https://cgit.kde.org/kio.git/commit/src/core/slave.cpp?id=e2a4517f099d809bd53c6a10769ebfddc0f28a8b @@ -276,6 +275,9 @@ fi %changelog +* Mon Jan 08 2018 Rex Dieter - 5.42.0-1 +- 5.42.0 + * Tue Dec 19 2017 Rex Dieter - 5.41.0-3 - backport upstream fix: forwardsocket errors (D9249) diff --git a/sources b/sources index 402e8ed..a257228 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kio-5.41.0.tar.xz) = 8f7072bf6268bf07c0c1266cdbee58aacdf43721d193aaa7574c683a4339de3d9701977c8bdd604f301d11393b8d2031e0b90e9ccc42a2c5e62050f41bc04216 +SHA512 (kio-5.42.0.tar.xz) = bff5b0dd393586a4da8f077298b51002c7accf4f72646557b5e1f68fe496003932e133c977980d5816dca73aa2e35fa8629cba87886518c319d4450edae323cb