Merge pull request #11 from Tarnyko/jethro

kactivites: fix build

recipes-kde/apps/kmix/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch

@@ -0,0 +1,26 @@
+--- a/apps/KMixApp.cpp	2016-06-07 16:48:58.967601212 +0200
++++ b/apps/KMixApp.cpp	2016-06-07 16:49:47.720048427 +0200
+@@ -80,7 +80,11 @@
+ 	 */
+ 	creationLock.lock();
+ 
++#ifndef QT_NO_SESSIONMANAGER
+ 	bool restore = isSessionRestored(); // && KMainWindow::canBeRestored(0);
++#else
++	bool restore = false;
++#endif
+ 	kDebug() << "Starting KMix using kepvisibility=" << hasArgKeepvisibility << ", failsafe=" << reset << ", sessionRestore=" << restore;
+ 	int createCount = 0;
+ 	if (restore)
+--- a/apps/kmix.cpp	2016-06-07 16:50:51.464632922 +0200
++++ b/apps/kmix.cpp	2016-06-07 16:50:24.112382155 +0200
+@@ -116,9 +116,11 @@
+ 		recreateGUI(false, QString(), true, reset);
+ 	}
+ 
++#ifndef QT_NO_SESSIONMANAGER
+ 	if (!kapp->isSessionRestored() ) // done by the session manager otherwise
++#endif
+ 	setInitialSize();
+ 
+ 	fixConfigAfterRead();

recipes-kde/apps/kmix/kmix.bb

@@ -0,0 +1,52 @@
+SUMMARY = "KDE's audio mixer"
+LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
+    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+"
+
+inherit kde-apps
+
+DEPENDS += " \
+    alsa-lib \
+    libcanberra \
+    \
+    kconfigwidgets \
+    kdbusaddons \
+    kdelibs4support \
+    kglobalaccel \
+    ki18n \
+    kiconthemes \
+    kxmlgui \
+    plasma-framework \
+"
+
+PACKAGECONFIG = "pulseaudio"    
+PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "f9d015862b40c9bb28307233ee012bd8"
+SRC_URI[sha256sum] = "e0e3ca3dac5605faaf7b447288675f557e1fd4205574885e2c1bfb205f37da31"
+
+SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
+
+EXTRA_OECMAKE += "-DKMIX_KF5_BUILD=1"
+
+FILES_SOLIBSDEV = ""
+
+FILES_${PN} += " \
+    ${datadir}/k*5 \
+    ${datadir}/plasma \
+    ${datadir}/icons \
+    ${datadir}/dbus-1 \
+    \
+    ${libdir}/libkdeinit5*.so \
+    ${OE_QMAKE_PATH_PLUGINS} \
+"
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/plasma/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/plasma/dataengine/.debug \
+"

recipes-kde/kf5/tier1/sonnet/files/0003-make-build-of-hunspell-optional.patch

@@ -0,0 +1,43 @@
+From e0b2cd6d9a7339f5e73d4fe19a4a0ad07223f571 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 29 Jan 2016 22:23:11 +0100
+Subject: [PATCH] make build of hunspell optional
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Finding hunspell is done by a taylored solution which does not seem to
+support disable.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/plugins/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
+index f275f63..dbad160 100644
+--- a/src/plugins/CMakeLists.txt
++++ b/src/plugins/CMakeLists.txt
+@@ -35,6 +35,9 @@ endif ()
+ #   add_subdirectory( enchant )
+ #endif ()
+ 
++option(BUILD_HUNSPELL "Build hunspell" OFF)
++
++if(BUILD_HUNSPELL)
+ find_package(HUNSPELL)
+ set_package_properties(HUNSPELL PROPERTIES
+     URL "http://hunspell.sourceforge.net/"
+@@ -44,6 +47,7 @@ set_package_properties(HUNSPELL PROPERTIES
+ if (HUNSPELL_FOUND)
+    add_subdirectory( hunspell )
+ endif ()
++endif ()
+ 
+ 
+ find_package(VOIKKO)
+-- 
+2.5.0
+

recipes-kde/kf5/tier1/sonnet/sonnet.bb

@@ -22,3 +22,6 @@ FILES_${PN}-dbg += " \
 CMAKE_ALIGN_SYSROOT[1] = "KF5Sonnet, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Sonnet, -S${includedir}, -S${STAGING_INCDIR}"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[hunspell] = "-DBUILD_HUNSPELL=ON,-DBUILD_HUNSPELL=OFF, hunspell"
+

recipes-kde/kf5/tier1/sonnet/sonnet.inc

@@ -7,3 +7,4 @@ inherit kde-kf5
 PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "8fb3c2fac12e7c2671c3318f41bc4161"
 SRC_URI[sha256sum] = "6ffa49bab59dba0080c03a8b7863efd53006239350f634575b4aabe9f496009d"
+SRC_URI += "file://0003-make-build-of-hunspell-optional.patch"

recipes-kde/kf5/tier3/kactivities/kactivities.bb

@@ -14,6 +14,11 @@ SRC_URI[sha256sum] = "b95e76570963a9f8797f103e32ddf58382c104e935fc27de3f48eea3db
 
 SRC_URI += "file://0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch"
 
+do_compile_prepend() {
+    # Error: Could not locate service type file kservicetypes5/ "kfileitemactionplugin.desktop" , tried ...
+    export XDG_DATA_HOME=${STAGING_DATADIR}
+}
+
 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5Activities, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Activities, -S${includedir}, -S${STAGING_INCDIR}"

recipes-lxqt/libqtxdg/files/0001-xdgdesktopfile-handle-Path-entry-for-working-directo.patch

@@ -0,0 +1,55 @@
+From 242089585196bab92cb7d0ff04b1cc6926d7d43d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 18 Jan 2016 21:08:22 +0100
+Subject: [PATCH] xdgdesktopfile: handle 'Path' entry for working directory
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+it is an optional enty of the specification [1]
+
+http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html
+
+Upstream-Status: Submitted [2]
+
+[2] https://github.com/lxde/libqtxdg/pull/69
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ xdgdesktopfile.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/xdgdesktopfile.cpp b/xdgdesktopfile.cpp
+index 75a80bf..61c4449 100644
+--- a/xdgdesktopfile.cpp
++++ b/xdgdesktopfile.cpp
+@@ -383,12 +383,17 @@ bool XdgDesktopFileData::startApplicationDetached(const XdgDesktopFile *q, const
+     }
+ 
+     QString cmd = args.takeFirst();
++    QString workingDir = q->value("Path").toString();
++    if (!workingDir.isEmpty() && !QDir(workingDir).exists())
++	    workingDir = QString();
+ 
+     if (nonDetach)
+     {
+         QScopedPointer<QProcess> p(new QProcess);
+         p->setStandardInputFile(QProcess::nullDevice());
+         p->setProcessChannelMode(QProcess::ForwardedChannels);
++        if (!workingDir.isEmpty())
++            p->setWorkingDirectory(workingDir);
+         p->start(cmd, args);
+         bool started = p->waitForStarted();
+         if (started)
+@@ -400,7 +405,7 @@ bool XdgDesktopFileData::startApplicationDetached(const XdgDesktopFile *q, const
+     }
+     else
+     {
+-        return QProcess::startDetached(cmd, args);
++        return QProcess::startDetached(cmd, args, workingDir);
+     }
+ }
+ 
+-- 
+2.5.0
+

recipes-lxqt/libqtxdg/libqtxdg_git.bb

@@ -7,6 +7,7 @@ inherit lxqt cmake-lib
 # libmagic is supplied by file
 DEPENDS += "file"
 
+SRC_URI += "file://0001-xdgdesktopfile-handle-Path-entry-for-working-directo.patch"
 SRCREV = "b65a324bcd2fc498f8a01eb56dfb54ae05e9b0b2"
 PV = "1.3.0"