diff --git a/.gitignore b/.gitignore index 0f726cb..c90bac9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /kio-5.49.0.tar.xz /kio-5.50.0.tar.xz /kio-5.51.0.tar.xz +/kio-5.52.0.tar.xz diff --git a/D16189.diff b/D16189.diff deleted file mode 100644 index c668d63..0000000 --- a/D16189.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/ioslaves/help/main.cpp b/src/ioslaves/help/main.cpp ---- a/src/ioslaves/help/main.cpp -+++ b/src/ioslaves/help/main.cpp -@@ -10,6 +10,7 @@ - - #include - -+#include - #include - - #include -@@ -40,6 +41,9 @@ - { - Q_DECL_EXPORT int kdemain(int argc, char **argv) - { -+ QCoreApplication app(argc, argv); // needed for KCrash -+ app.setApplicationName(QStringLiteral("kio_help")); -+ - KDocTools::setupStandardDirs(); - - //qDebug() << "Starting " << getpid(); - diff --git a/kf5-kio.spec b/kf5-kio.spec index 3a71d57..b1071a4 100644 --- a/kf5-kio.spec +++ b/kf5-kio.spec @@ -1,8 +1,8 @@ %global framework kio Name: kf5-%{framework} -Version: 5.51.0 -Release: 2%{?dist} +Version: 5.52.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction License: GPLv2+ and MIT and BSD @@ -18,8 +18,6 @@ URL: https://cgit.kde.org/%{framework}.git Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz ## upstream patches -# https://bugs.kde.org/show_bug.cgi?id=399709 -Patch1: https://phabricator.kde.org/file/data/urfdkfaejxk5cramlzsa/PHID-FILE-zvoxdndirubfjokq2rd6/D16189.diff ## upstreamable patches # revert part of https://cgit.kde.org/kio.git/commit/src/core/slave.cpp?id=e2a4517f099d809bd53c6a10769ebfddc0f28a8b @@ -305,6 +303,9 @@ fi %changelog +* Sun Nov 04 2018 Rex Dieter - 5.52.0-1 +- 5.52.0 + * Sat Oct 13 2018 Rex Dieter - 5.51.0-2 - pull in candidate fix for kio_help regression (kde#399709) diff --git a/sources b/sources index 7c58fcf..fb3e249 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kio-5.51.0.tar.xz) = f723030a0d60f9e2532a07a34e9bd1e88230b929464e759d9382011995e3704bf5edbfd47dd929e9029937e4315e887049ce692a299d13c2a8e48e167fd24dd6 +SHA512 (kio-5.52.0.tar.xz) = b5a91c9eedc91eb933f16874163b2882986975c67ef329497b2ae936926292241d05f4dae022054d5db673e195e80159ad1cb70a26a5c23a192223bbe6b28c36