summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2018-10-24 14:07:20 +0200
committer Eric Hameleers <alien@slackware.com>2018-10-24 14:07:20 +0200
commitda33bca8208d3134ebebac8e88d1010eabcda579 (patch)
tree267b48c764703a41caa0aa3e3fe42852e5ad9646
parentf8c0c8d872fd4d0b8920ecabf107a99044813099 (diff)
downloadktown-da33bca8208d3134ebebac8e88d1010eabcda579.tar.gz
ktown-da33bca8208d3134ebebac8e88d1010eabcda579.tar.xz
KIO: fix crash in QCoreApplication when accessing help://KDE-5_18.10
-rw-r--r--kde/build/kio1
-rw-r--r--kde/patch/kio.patch4
-rw-r--r--kde/patch/kio/kio_KDEBUG_399709.patch44
3 files changed, 49 insertions, 0 deletions
diff --git a/kde/build/kio b/kde/build/kio
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/kio
@@ -0,0 +1 @@
+2
diff --git a/kde/patch/kio.patch b/kde/patch/kio.patch
index 1caed00..54e775b 100644
--- a/kde/patch/kio.patch
+++ b/kde/patch/kio.patch
@@ -12,3 +12,7 @@
# Fixed in KIO 5.41:
#cat $CWD/patch/kio/kio_fix_url_setpath.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Fix crash when accessing help://
+# Fixed in KIO 5.52:
+cat $CWD/patch/kio/kio_KDEBUG_399709.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/kio/kio_KDEBUG_399709.patch b/kde/patch/kio/kio_KDEBUG_399709.patch
new file mode 100644
index 0000000..0a8cfdc
--- /dev/null
+++ b/kde/patch/kio/kio_KDEBUG_399709.patch
@@ -0,0 +1,44 @@
+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: 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 f09987a..f800a9d 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();
+--
+cgit v0.11.2
+