From 8015cc35fa025e6546794f0e26a538a62715d658e415f0f16e8eab584c32fcbb Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Tue, 16 Oct 2018 12:25:31 +0000 Subject: [PATCH 1/2] KDE Frameworks 5.51 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=236 --- kio-5.50.0.tar.xz | 3 --- kio-5.51.0.tar.xz | 3 +++ kio.changes | 15 +++++++++++++++ kio.spec | 9 +++++---- 4 files changed, 23 insertions(+), 7 deletions(-) delete mode 100644 kio-5.50.0.tar.xz create mode 100644 kio-5.51.0.tar.xz diff --git a/kio-5.50.0.tar.xz b/kio-5.50.0.tar.xz deleted file mode 100644 index 9004904..0000000 --- a/kio-5.50.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01423f94668756dc9f644c5ef93ace0b2e1624d7dd9483f9524bdf3c0855d2ae -size 3166632 diff --git a/kio-5.51.0.tar.xz b/kio-5.51.0.tar.xz new file mode 100644 index 0000000..f06bc91 --- /dev/null +++ b/kio-5.51.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c083dfb537e50f143770f0b50665da3779969ee3a1e38ba08e6ed3cc5c921cc7 +size 3166752 diff --git a/kio.changes b/kio.changes index 656a07c..201387a 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Oct 16 08:02:19 UTC 2018 - Luca Beltrame + +- Run spec-cleaner + +------------------------------------------------------------------- +Mon Oct 15 11:50:36 UTC 2018 - lbeltrame@kde.org + +- Update to 5.51.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.51.0.php +- Changes since 5.50.0: + * Too many changes to list here + ------------------------------------------------------------------- Thu Sep 13 21:58:45 UTC 2018 - lbeltrame@kde.org diff --git a/kio.spec b/kio.spec index a6a69dd..68ba72a 100644 --- a/kio.spec +++ b/kio.spec @@ -16,19 +16,19 @@ # -%define _tar_path 5.50 +%define _tar_path 5.51 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kio -Version: 5.50.0 +Version: 5.51.0 Release: 0 Summary: Network transparent access to files and data License: LGPL-2.1-or-later Group: System/GUI/KDE -URL: http://www.kde.org +URL: https://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz 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 @@ -41,6 +41,7 @@ BuildRequires: kbookmarks-devel >= %{_kf5_bugfix_version} BuildRequires: kcompletion-devel >= %{_kf5_bugfix_version} BuildRequires: kconfigwidgets-devel >= %{_kf5_bugfix_version} BuildRequires: kcoreaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kcrash-devel >= %{_kf5_bugfix_version} BuildRequires: kdbusaddons-devel >= %{_kf5_bugfix_version} BuildRequires: kdoctools-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem @@ -195,11 +196,11 @@ Development files. %{_kf5_sharedir}/dbus-1/services/org.kde.kioexecd.service %dir %{_kf5_sharedir}/kconf_update/ %{_kf5_sharedir}/kconf_update/filepicker.upd +%{_kf5_debugdir}/kio.categories %files %doc README* %license COPYING* -%{_kf5_debugdir}/kio.categories %{_kf5_libdir}/libKF5KIOGui.so.* %{_kf5_libdir}/libKF5KIOWidgets.so.* %{_kf5_libdir}/libKF5KIOFileWidgets.so.* From 9429fa4beeb6456058a3453055f87263afaa1b0b2a981ae14b4280049b76862e Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 18 Oct 2018 14:41:30 +0000 Subject: [PATCH 2/2] - Add patch to fix kio_help crashing on start: * 0001-kio_help-Fix-crash-in-QCoreApplication-when-accessin.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=237 --- ...sh-in-QCoreApplication-when-accessin.patch | 45 +++++++++++++++++++ kio.changes | 6 +++ kio.spec | 2 + 3 files changed, 53 insertions(+) create mode 100644 0001-kio_help-Fix-crash-in-QCoreApplication-when-accessin.patch diff --git a/0001-kio_help-Fix-crash-in-QCoreApplication-when-accessin.patch b/0001-kio_help-Fix-crash-in-QCoreApplication-when-accessin.patch new file mode 100644 index 0000000..c1bf59c --- /dev/null +++ b/0001-kio_help-Fix-crash-in-QCoreApplication-when-accessin.patch @@ -0,0 +1,45 @@ +From cf3b0d102855a4a90db3fb65a99e0009fcdd3755 Mon Sep 17 00:00:00 2001 +From: Michael Pyne +Date: Sat, 13 Oct 2018 19:09:50 -0400 +Subject: [PATCH] kio_help: Fix crash in QCoreApplication when accessing + help://. + +A recent commit d428fc8e6447ede81f1e1911d0b66b39265672f3 removed old +custom crash handling code in favor of KCrash. But this actually adds a +dependency on there being a valid QCoreApplication object. + +I took from the example of the similar kio_file to simply create the +QCoreApplication here. + +BUG:399709 + +Differential Revision: https://phabricator.kde.org/D16189 +--- + src/ioslaves/help/main.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/ioslaves/help/main.cpp b/src/ioslaves/help/main.cpp +index f09987aa..f800a9d0 100644 +--- a/src/ioslaves/help/main.cpp ++++ b/src/ioslaves/help/main.cpp +@@ -10,6 +10,7 @@ extern "C" int xmlLoadExtDtdDefaultValue; + + #include + ++#include + #include + + #include +@@ -40,6 +41,9 @@ extern "C" + { + 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(); +-- +2.19.0 + diff --git a/kio.changes b/kio.changes index 201387a..1c3dfc2 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 18 14:40:57 UTC 2018 - Fabian Vogt + +- Add patch to fix kio_help crashing on start: + * 0001-kio_help-Fix-crash-in-QCoreApplication-when-accessin.patch + ------------------------------------------------------------------- Tue Oct 16 08:02:19 UTC 2018 - Luca Beltrame diff --git a/kio.spec b/kio.spec index 68ba72a..f1f94fb 100644 --- a/kio.spec +++ b/kio.spec @@ -33,6 +33,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 +Patch1: 0001-kio_help-Fix-crash-in-QCoreApplication-when-accessin.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes