From 45188d6d0aab9ac11991b0e6ebb4b48dc87a8b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 26 Mar 2018 15:44:23 +0200 Subject: [PATCH] ark: refresh 0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...1-fix-build-with-QT_NO_SESSIONMANAGER-set.patch | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/recipes-kde/apps/ark/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch b/recipes-kde/apps/ark/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch index 6bfdcf39..b2482c65 100644 --- a/recipes-kde/apps/ark/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch +++ b/recipes-kde/apps/ark/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch @@ -6,26 +6,32 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + Upstream-Status: Pending Signed-off-by: Andreas Müller + --- app/main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/main.cpp b/app/main.cpp -index a9539b5..91f96ab 100644 +index 0396400..5924683 100644 --- a/app/main.cpp +++ b/app/main.cpp -@@ -178,6 +178,7 @@ int main(int argc, char **argv) +@@ -206,6 +206,7 @@ int main(int argc, char **argv) // This is needed to prevent Dolphin from freezing when opening an archive. - KDBusService dbusService(KDBusService::Multiple); + KDBusService dbusService(KDBusService::Multiple | KDBusService::NoExitOnFailure); +#ifndef QT_NO_SESSIONMANAGER // Session restoring. if (application.isSessionRestored()) { if (!KMainWindow::canBeRestored(1)) { -@@ -190,8 +191,9 @@ int main(int argc, char **argv) +@@ -218,8 +219,9 @@ int main(int argc, char **argv) delete window; return -1; }