KDE Frameworks 5.52.0
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=239
This commit is contained in:
parent
9429fa4bee
commit
ea9be01b99
@ -1,45 +0,0 @@
|
|||||||
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:c083dfb537e50f143770f0b50665da3779969ee3a1e38ba08e6ed3cc5c921cc7
|
|
||||||
size 3166752
|
|
3
kio-5.52.0.tar.xz
Normal file
3
kio-5.52.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:acb05d730f057a81a263d1b217019ffadc276929462c54add202de44313524a1
|
||||||
|
size 3159632
|
12
kio.changes
12
kio.changes
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Nov 11 19:48:05 UTC 2018 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
- Update to 5.52.0
|
||||||
|
* New feature release
|
||||||
|
* For more details please see:
|
||||||
|
* https://www.kde.org/announcements/kde-frameworks-5.52.0.php
|
||||||
|
- Changes since 5.51.0:
|
||||||
|
* Too many changes to list here
|
||||||
|
- Dropped patches, now upstream:
|
||||||
|
* 0001-kio_help-Fix-crash-in-QCoreApplication-when-accessin.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Oct 18 14:40:57 UTC 2018 - Fabian Vogt <fabian@ritter-vogt.de>
|
Thu Oct 18 14:40:57 UTC 2018 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
6
kio.spec
6
kio.spec
@ -16,14 +16,14 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define _tar_path 5.51
|
%define _tar_path 5.52
|
||||||
# Full KF5 version (e.g. 5.33.0)
|
# Full KF5 version (e.g. 5.33.0)
|
||||||
%{!?_kf5_version: %global _kf5_version %{version}}
|
%{!?_kf5_version: %global _kf5_version %{version}}
|
||||||
# Last major and minor KF5 version (e.g. 5.33)
|
# 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}')}
|
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
|
||||||
%bcond_without lang
|
%bcond_without lang
|
||||||
Name: kio
|
Name: kio
|
||||||
Version: 5.51.0
|
Version: 5.52.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Network transparent access to files and data
|
Summary: Network transparent access to files and data
|
||||||
License: LGPL-2.1-or-later
|
License: LGPL-2.1-or-later
|
||||||
@ -33,8 +33,6 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%
|
|||||||
Source1: baselibs.conf
|
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
|
# 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
|
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: cmake >= 3.0
|
||||||
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
|
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
Loading…
Reference in New Issue
Block a user