svn commit: r482610 - in head/devel/kf5-kio: . files

[Tobias C. Berner]

Author: tcberner
Date: Sat Oct 20 18:07:07 2018
New Revision: 482610
URL: https://svnweb.freebsd.org/changeset/ports/482610

Log:
  devel/kf5-kio: add upstream patch to fix crash when accessing help
  
  Obtained from:	https://cgit.kde.org/kio.git/commit/?id=cf3b0d102855a4a90db3fb65a99e0009fcdd3755

Added:
  head/devel/kf5-kio/files/
  head/devel/kf5-kio/files/patch-git_cf3b0d10   (contents, props changed)
Modified:
  head/devel/kf5-kio/Makefile

Modified: head/devel/kf5-kio/Makefile
==============================================================================
--- head/devel/kf5-kio/Makefile	Sat Oct 20 18:04:42 2018	(r482609)
+++ head/devel/kf5-kio/Makefile	Sat Oct 20 18:07:07 2018	(r482610)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kio
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde at FreeBSD.org

Added: head/devel/kf5-kio/files/patch-git_cf3b0d10
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/kf5-kio/files/patch-git_cf3b0d10	Sat Oct 20 18:07:07 2018	(r482610)
@@ -0,0 +1,44 @@
+From cf3b0d102855a4a90db3fb65a99e0009fcdd3755 Mon Sep 17 00:00:00 2001
+From: Michael Pyne <mpyne at 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
+--- src/ioslaves/help/main.cpp
++++ 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
+