From d194423e08e8c69fcfedcb960c138df8b8310f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 11 Oct 2015 21:44:37 +0200 Subject: [PATCH] ark: fix build for session-less qtbase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-kde/apps/ark/ark.bb | 2 +- ...-build-with-QT_NO_SESSIONMANAGER-set.patch | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 recipes-kde/apps/ark/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch diff --git a/recipes-kde/apps/ark/ark.bb b/recipes-kde/apps/ark/ark.bb index fcdbe442..f3818676 100644 --- a/recipes-kde/apps/ark/ark.bb +++ b/recipes-kde/apps/ark/ark.bb @@ -26,7 +26,7 @@ DEPENDS += "\ PV = "${KDE_APP_VERSION}" SRC_URI[md5sum] = "b868106c24b5cecb98a18d09d7039943" SRC_URI[sha256sum] = "1496e70b0295054cfca217f6a80737c693be952bfa3873954fdb10d7708ab852" - +SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ ${datadir}/appdata \ 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 new file mode 100644 index 00000000..b6cec86e --- /dev/null +++ b/recipes-kde/apps/ark/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch @@ -0,0 +1,41 @@ +From b7285c71f5b04bc55441217bf963078b38d6bad4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 11 Oct 2015 21:41:27 +0200 +Subject: [PATCH] fix build with QT_NO_SESSIONMANAGER set +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 | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/app/main.cpp b/app/main.cpp +index 4a95063..c3d3a61 100644 +--- a/app/main.cpp ++++ b/app/main.cpp +@@ -175,6 +175,7 @@ int main(int argc, char **argv) + KDBusService dbusService(KDBusService::Multiple); + + //session restoring ++#ifndef QT_NO_SESSIONMANAGER + if (application.isSessionRestored()) { + if (!KMainWindow::canBeRestored(1)) { + return -1; +@@ -186,7 +187,9 @@ int main(int argc, char **argv) + delete window; + return -1; + } +- } else { //new ark window (no restored session) ++ } else ++#endif ++ { //new ark window (no restored session) + + // open any given URLs + const QStringList urls = parser.positionalArguments(); +-- +2.1.0 +