From 5c12ca52b6d70e7626a85311c72982e4d7492096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 4 Feb 2015 14:03:37 +0100
Subject: [PATCH] add khelpcenter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-kde/packagegroups/kde-world.bb        |  1 +
 ...or-qtbase-without-session-management.patch | 46 +++++++++++++++++++
 .../plasma/untier/khelpcenter/khelpcenter.bb  | 34 ++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 recipes-kde/plasma/untier/khelpcenter/files/0001-fix-build-for-qtbase-without-session-management.patch
 create mode 100644 recipes-kde/plasma/untier/khelpcenter/khelpcenter.bb

diff --git a/recipes-kde/packagegroups/kde-world.bb b/recipes-kde/packagegroups/kde-world.bb
index 87e8c8bb..4718a329 100644
--- a/recipes-kde/packagegroups/kde-world.bb
+++ b/recipes-kde/packagegroups/kde-world.bb
@@ -76,6 +76,7 @@ RDEPENDS_${PN} = "         \
     kde-gtk-config \
     kdeplasma-addons \
     khtml \
+    khelpcenter \
     \
     kwayland \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "kwin", "",d)} \
diff --git a/recipes-kde/plasma/untier/khelpcenter/files/0001-fix-build-for-qtbase-without-session-management.patch b/recipes-kde/plasma/untier/khelpcenter/files/0001-fix-build-for-qtbase-without-session-management.patch
new file mode 100644
index 00000000..1215ab1d
--- /dev/null
+++ b/recipes-kde/plasma/untier/khelpcenter/files/0001-fix-build-for-qtbase-without-session-management.patch
@@ -0,0 +1,46 @@
+From bf1ddc0831cf20839a4738b6b534e4e50691fd60 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 4 Feb 2015 13:54:14 +0100
+Subject: [PATCH] fix build for qtbase without session management
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ application.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/application.cpp b/application.cpp
+index d29234d..5570879 100644
+--- a/application.cpp
++++ b/application.cpp
+@@ -54,10 +54,12 @@ void Application::activate(const QStringList& args, const QString &workingDirect
+ 
+   if( !mMainWindow )
+   {
++#ifndef QT_NO_SESSIONMANAGER
+     if (qApp->isSessionRestored()) {
+         // The kRestoreMainWindows call will do the rest.
+         return;
+     }
++#endif
+     mMainWindow = new MainWindow;
+   }
+ 
+@@ -92,10 +94,12 @@ extern "C" int Q_DECL_EXPORT kdemain( int argc, char **argv )
+ 
+   app.activate(app.arguments(), QDir::currentPath());
+ 
++#ifndef QT_NO_SESSIONMANAGER
+   if ( app.isSessionRestored() )
+   {
+      kRestoreMainWindows<MainWindow>();
+   }
++#endif
+ 
+   return app.exec();
+ }
+-- 
+1.8.3.1
+
diff --git a/recipes-kde/plasma/untier/khelpcenter/khelpcenter.bb b/recipes-kde/plasma/untier/khelpcenter/khelpcenter.bb
new file mode 100644
index 00000000..80d731eb
--- /dev/null
+++ b/recipes-kde/plasma/untier/khelpcenter/khelpcenter.bb
@@ -0,0 +1,34 @@
+SUMMARY = "Application to show KDE Applications' documentation"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=7108e5acd7ce861dee282297d7c2f38c \
+"
+
+inherit kde-plasma
+
+DEPENDS += " \
+    kconfig \
+    kinit \
+    kcmutils \
+    khtml \
+    kdelibs4support \
+    \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
+"
+
+PV = "${PLASMA_VERSION}"
+SRC_URI[md5sum] = "f575d603c62a001c551a213398c46268"
+SRC_URI[sha256sum] = "3a0396118077af3b1e3df4654540a1d8cc900a3eae656f65409737d9f712bfa8"
+
+SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"
+
+# do not move so-libs to -dev package
+FILES_SOLIBSDEV = ""
+
+FILES_${PN} += " \
+    ${datadir}/config.kcfg \
+    ${datadir}/k*5 \
+    ${datadir}/dbus-1 \
+    ${datadir}/kde4 \
+    ${libdir}/libkdeinit5_khelpcenter.so \
+"