summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2015-12-15 19:44:24 +0100
committerMichael Palimaka <kensington@gentoo.org>2015-12-16 23:27:53 +1100
commit4bff875eca703cebcba799cca535f86a604c34fe (patch)
tree6bb5493a540176d39490422dad32e86667922dd1 /kde-apps/ark/files/ark-15.08.3-fix-lingering-processes.patch
parentMerge remote-tracking branch 'remotes/axelgenus/librsync-2.0' (diff)
downloadgentoo-4bff875eca703cebcba799cca535f86a604c34fe.tar.gz
gentoo-4bff875eca703cebcba799cca535f86a604c34fe.tar.bz2
gentoo-4bff875eca703cebcba799cca535f86a604c34fe.zip
kde-apps/ark: Fix bug with kde-frameworks 5.17
A change in kxmlgui causes lingering ark processes in the background. Package-Manager: portage-2.2.24
Diffstat (limited to 'kde-apps/ark/files/ark-15.08.3-fix-lingering-processes.patch')
-rw-r--r--kde-apps/ark/files/ark-15.08.3-fix-lingering-processes.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/kde-apps/ark/files/ark-15.08.3-fix-lingering-processes.patch b/kde-apps/ark/files/ark-15.08.3-fix-lingering-processes.patch
new file mode 100644
index 000000000000..3d83c1bf02a0
--- /dev/null
+++ b/kde-apps/ark/files/ark-15.08.3-fix-lingering-processes.patch
@@ -0,0 +1,42 @@
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Tue, 15 Dec 2015 07:40:43 +0000
+Subject: Fix ark doesn't exit with kxmlgui 5.17.
+X-Git-Url: http://quickgit.kde.org/?p=ark.git&a=commitdiff&h=f7312a26d31cdc31776a09df600327ca86d3daea
+---
+Fix ark doesn't exit with kxmlgui 5.17.
+
+Previously setQuitOnLastWindowClosed is reset by KMainWindow::init but
+now it's removed in 5.17. Change to use setQuitOnLastWindowClosed in ark
+only when it's using a kjob and connect quit() to finished signal.
+
+REVIEW: 126358
+---
+
+
+--- a/app/main.cpp
++++ b/app/main.cpp
+@@ -119,7 +119,6 @@
+ QStringLiteral("http://littlesvr.ca/misc/contactandrew.php"));
+
+ application.setWindowIcon(QIcon::fromTheme(QStringLiteral("ark")));
+- application.setQuitOnLastWindowClosed(false);
+
+ QCommandLineParser parser;
+ parser.setApplicationDescription(aboutData.shortDescription());
+@@ -196,6 +195,7 @@
+ parser.isSet(QStringLiteral("add-to"))) {
+
+ AddToArchive *addToArchiveJob = new AddToArchive(&application);
++ application.setQuitOnLastWindowClosed(false);
+ application.connect(addToArchiveJob, SIGNAL(result(KJob*)), SLOT(quit()), Qt::QueuedConnection);
+
+ if (parser.isSet(QStringLiteral("changetofirstpath"))) {
+@@ -233,6 +233,7 @@
+ } else if (parser.isSet(QStringLiteral("batch"))) {
+
+ BatchExtract *batchJob = new BatchExtract(&application);
++ application.setQuitOnLastWindowClosed(false);
+ application.connect(batchJob, SIGNAL(result(KJob*)), SLOT(quit()), Qt::QueuedConnection);
+
+ for (int i = 0; i < urls.count(); ++i) {
+