Accepting request 642972 from KDE:Frameworks5
- Add patch to fix kio_help crashing on start: * 0001-kio_help-Fix-crash-in-QCoreApplication-when-accessin.patch - Run spec-cleaner - 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 OBS-URL: https://build.opensuse.org/request/show/642972 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=70
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
81d881032d
@ -0,0 +1,45 @@
|
||||
From cf3b0d102855a4a90db3fb65a99e0009fcdd3755 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Pyne <mpyne@kde.org>
|
||||
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 <QDebug>
|
||||
|
||||
+#include <QCoreApplication>
|
||||
#include <QString>
|
||||
|
||||
#include <stdlib.h>
|
||||
@@ -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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:01423f94668756dc9f644c5ef93ace0b2e1624d7dd9483f9524bdf3c0855d2ae
|
||||
size 3166632
|
||||
3
kio-5.51.0.tar.xz
Normal file
3
kio-5.51.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c083dfb537e50f143770f0b50665da3779969ee3a1e38ba08e6ed3cc5c921cc7
|
||||
size 3166752
|
||||
21
kio.changes
21
kio.changes
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 18 14:40:57 UTC 2018 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- 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 <lbeltrame@kde.org>
|
||||
|
||||
- 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
|
||||
|
||||
|
||||
11
kio.spec
11
kio.spec
@ -16,23 +16,25 @@
|
||||
#
|
||||
|
||||
|
||||
%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
|
||||
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
|
||||
@ -41,6 +43,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 +198,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.*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user