Merge pull request #11 from Tarnyko/jethro

kactivites: fix build

README

@@ -14,4 +14,4 @@ URI: git://git.openembedded.org/meta-openembedded
 branch: master
 revision: HEAD
 
-Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
+Layer maintainer: Andreas Müller <schnitzeltony@googlemail.com>

TODO

@@ -0,0 +1,101 @@
+kde missing:
+* plasma-sdk
+
+..........
+
+issues:
+
+plasma-desktop:
+* crashing as non priviledged user
+* kwin crashing / window decorations not repainted / compositng disabled (only for OpenGL ES > 2.0??)
+
+hawaii:
+* unable to start session
+
+antimony:
+* not finding python modules
+
+..........
+
+misc:
+* proper gpgme solution see commit 618331ae
+
+
+* Optionals / PACKAGECONFIG / CMAKE_DISABLE_FIND_PACKAGE_<PackageName>:
+
+superandy@localhost cortexa8t2hf-vfp-neon-angstrom-linux-gnueabi]$ grep -r 'The following OPTIONAL packages have been found' `find -name log.do_configure`
+./plasma-nm/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kded/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kde-cli-tools/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./libksysguard/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kmenuedit/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdesu/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./ktexteditor/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdesignerplugin/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kfilemetadata/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./networkmanager-qt/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./plasma-framework/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./frameworkintegration/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kwallet/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kwallet/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdeplasma-addons/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./modemmanager-qt/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./ksysguard/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./plasma-workspace/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./sddm-kcm/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./muon/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kwayland-integration/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdeclarative/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kpeople/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kio-extras/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./libkscreen/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kcoreaddons/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kcrash/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kde-gtk-config/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./plasma-desktop/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./plasma-desktop/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./karchive/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kjobwidgets/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./khtml/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kidletime/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kjs/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kpackage/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kitemmodels/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kio/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kxmlgui/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./bluez-qt/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kinit/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kimageformats/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./marble/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdbusaddons/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdenlive/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kwindowsystem/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./ksshaskpass/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./filelight/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdoctools/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kservice/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./solid/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kwin/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kguiaddons/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./khotkeys/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./powerdevil/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./ark/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./plasma-mediacenter/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdelibs4support/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./sddm/0.13.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kglobalaccel/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kate/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./knotifications/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./dolphin/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./konsole/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./knotifyconfig/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kactivities/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./breeze/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdnssd/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kconfigwidgets/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./user-manager/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kinfocenter/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kinfocenter/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kwayland/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./oxygen/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+

classes/cmake-auto-align-paths.bbclass

@@ -1,14 +1,19 @@
-CMAKE_ALIGN_FILES_FIND ??= "*Targets.cmake"
+# do_configure_append_class-cross does not work so hack
+do_configure_prepend_class-native() {
+    no_cmake_auto_align_paths=true
+}
+
+do_configure_prepend_class-nativesdk() {
+    no_cmake_auto_align_paths=true
+}
 
 do_configure_append() {
     # remove absolute paths from exported cmake files
-    for f in `find ${B} -name '${CMAKE_ALIGN_FILES_FIND}'` ${CMAKE_ADD_ALIGN_FILES} ; do
+    for f in `find ${B}/CMakeFiles/Export -name '*.cmake'` ; do
         sed -i 's:${STAGING_INCDIR_NATIVE}:${includedir}:g' "$f"
         sed -i 's:${STAGING_INCDIR}:${includedir}:g' "$f"
         sed -i 's:${STAGING_LIBDIR_NATIVE}:${libdir}:g' "$f"
         sed -i 's:${STAGING_LIBDIR}:${libdir}:g' "$f"
-        sed -i 's:${STAGING_BASELIBDIR_NATIVE}:${base_libdir}:g' "$f"
-        sed -i 's:${STAGING_BASELIBDIR}:${base_libdir}:g' "$f"
     done
 }
 

classes/cmake-extra-sanity.bbclass

@@ -1,5 +1,3 @@
-inherit cmake_sysroot
-
 # do_install_append_class-cross does not work so hack
 do_install_prepend_class-native() {
     no_staging_check=true
@@ -24,19 +22,18 @@ do_install_append() {
         error=
         # check for genarated sources
         for f in `find ${B} -name '*.h' -o -name '*.cpp'` ; do
-            if grep -q 'recipe-sysroot' $f ; then
-                bbwarn "$f contains links to build sysroot!"
+            if grep -q '${STAGING_DIR}' $f ; then
+                bbwarn "$f contains links to build host sysroot!"
                 error=true
             fi
         done
 
         # check installed cmake files
         for f in `find ${D} -name '*.cmake'` ; do
-            if grep -q 'recipe-sysroot' "$f" ; then
+            if grep -q '${STAGING_DIR}' "$f" ; then
                 bbwarn "$f contains links to build host sysroot!"
                 error=true
             fi
-
         done
 
         if [ x != x$error ] ; then
@@ -44,32 +41,3 @@ do_install_append() {
         fi
     fi
 }
-
-do_populate_sysroot[postfuncs] += "do_sysroot_cmake_sanity "
-
-# check sysroot cmake files for links not relative and not to sysroots
-
-do_sysroot_cmake_sanity() {
-    error=
-    for f in `cat ${CMAKEINSTALLED}` ; do
-        if grep -q ';${libdir}' "$f" ; then
-            bbwarn "$f contains links to ${libdir}!"
-            error=true
-        fi
-        if grep -q '\"${libdir}/lib' "$f" ; then
-            bbwarn "$f contains links to ${libdir}!"
-            error=true
-        fi
-        if grep -q ';${includedir}' "$f" ; then
-            bbwarn "$f contains links to ${includedir}!"
-            error=true
-        fi
-        if grep -q '\"${includedir}' "$f" ; then
-            bbwarn "$f contains links to ${includedir}!"
-            error=true
-        fi
-    done
-    if [ x != x$error ] ; then
-        bbfatal "One or more files in sysroot contain links to ${prefix}"
-    fi
-}

classes/cmake-lib.bbclass

@@ -55,9 +55,9 @@
 #   CMAKE_ALIGN_SYSROOT[<unique-id>] = "ignore"
 #
 
-inherit cmake_sysroot
 
-SSTATE_SYSROOT = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}"
+# filename for the file containg full names of all cmakefiles staged
+CMAKEINSTALLED = "${WORKDIR}/staged_cmake_files"
 
 # global helper to get CMAKE_ALIGN_SYSROOT array
 def get_align_flags(d):
@@ -70,7 +70,7 @@ def get_align_flags(d):
 
 # global helper to check CMAKE_ALIGN_SYSROOT array contains 'ignore'
 def get_flags_ignore(flags):
-    if flags and list(flags.values()).count('ignore') > 0:
+    if flags and flags.values().count('ignore') > 0:
         return True
     return False
 
@@ -89,10 +89,25 @@ python () {
             if num != 3:
                 bb.fatal('CMAKE_ALIGN_SYSROOT[%s] requires 3 parameters (dir, search, replace) in %s' % (flag, pn))
     else:
-        bb.fatal('The recipe %s inherits cmake_lib but does not set CMAKE_ALIGN_SYSROOT' % pn)
+        bb.fatal('The recipe %s inherits cmake-lib but does not set CMAKE_ALIGN_SYSROOT' % pn)
 }
 
-# 2. 3. in cmake_sysroot
+# 2. remove tmp file from last build
+python do_populate_sysroot_prepend() {
+    tmpfile = d.getVar('CMAKEINSTALLED', True)
+    if os.path.isfile(tmpfile):
+        os.remove(tmpfile)
+}
+
+# 3. keep cmake files staged to sysroot
+sysroot_stage_dir_append() {
+    # avoid doubles causing double replacement
+    for file in `find $dest -name '*.cmake'`; do
+        if ! grep -q "$file" ${CMAKEINSTALLED} ; then
+            echo "$file" >> ${CMAKEINSTALLED}
+        fi
+    done
+}
 
 # 4. Handle CMAKE_ALIGN_SYSROOT
 python do_populate_sysroot_append() {

classes/cmake-native-dummy.bbclass

@@ -0,0 +1,22 @@
+#
+# Class to create dummy native binaries so cmake can reference them
+# Inspired by binconfig-disabled.bbclass
+#
+
+inherit native
+
+# The list of scripts which should be disabled.
+CMAKE_DUMMY_BINARIES ?= ""
+
+do_install () {
+    install -d ${D}${bindir}
+    for x in ${CMAKE_DUMMY_BINARIES}; do
+        echo "#!/bin/sh" > ${D}${bindir}/$x
+        # Make the disabled script emit invalid parameters for those configure
+        # scripts which call it without checking the return code.
+        echo "echo '--should-not-have-used-$x'" >> ${D}${bindir}/$x
+        echo "exit 1" >> ${D}${bindir}/$x
+        chmod 755 ${D}${bindir}/$x
+    done
+}
+

classes/cmake_qt5_extra.bbclass

@@ -1,7 +0,0 @@
-inherit cmake_qt5 cmake_extra_sanity
-
-EXTRA_OECMAKE += " \
-    -DCMAKE_QT5_EX_PATH_HOST_HEADERS=${STAGING_INCDIR} \
-"
-
-FILES_${PN}-dev += "${datadir}/cmake ${libdir}/cmake"

classes/cmake_sysroot.bbclass

@@ -1,22 +0,0 @@
-# class to keep cmake files staged to sysroot for modifications/checks
-
-# filename for the file containg full names of all cmakefiles staged
-CMAKEINSTALLED = "${WORKDIR}/staged_cmake_files"
-
-# 1. remove tmp file from last build
-python do_populate_sysroot_prepend() {
-    tmpfile = d.getVar('CMAKEINSTALLED', True)
-    if os.path.isfile(tmpfile):
-        os.remove(tmpfile)
-}
-
-# 2. keep cmake files staged to sysroot
-sysroot_stage_dir_append() {
-    # avoid doubles causing double replacement
-    for file in `find $dest -name '*.cmake'`; do
-        if ! grep -q "$file" ${CMAKEINSTALLED} ; then
-            echo "$file" >> ${CMAKEINSTALLED}
-        fi
-    done
-}
-

classes/hawaii.bbclass

@@ -0,0 +1,9 @@
+SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
+
+DEPENDS += "qtbase qtdeclarative qtquickcontrols extra-cmake-modules-native"
+
+inherit cmake_qt5 cmake-extra-sanity pkgconfig
+
+EXTRA_OECMAKE += " \
+    -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \
+"

classes/kde-apps.bbclass

@@ -1,6 +1,6 @@
 inherit kde-base
 
-KDE_APP_VERSION = "18.08.0"
+KDE_APP_VERSION = "15.12.0"
 
 SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"
 

classes/kde-base.bbclass

@@ -17,15 +17,11 @@ ${KDE_MIRROR}	http://kde.c3sl.ufpr.br \n \
 SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
 
 # extra-cmake-modules cause dependent to check for python
-inherit cmake_qt5_extra pythonnative
+inherit cmake_qt5 cmake-extra-sanity pythonnative
 
-do_compile_prepend() {
-    export XDG_DATA_HOME=${STAGING_DATADIR}
-}
-
-FILES_${PN} += "${libdir}/plugins/kf5 ${datadir}/kf5 ${libexecdir}/kf5"
+FILES_${PN} += "${libdir}/plugins/kf5 ${datadir}/kf5"
 FILES_${PN}-dev += "${libdir}/cmake"
-FILES_${PN}-dbg += "${libdir}/plugins/kf5/.debug ${libexecdir}/kf5/.debug"
+FILES_${PN}-dbg += "${libdir}/plugins/kf5/.debug"
 
 EXTRA_OECMAKE += " \
     -DECM_MKSPECS_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \
@@ -33,13 +29,5 @@ EXTRA_OECMAKE += " \
     -DCMAKE_INSTALL_DBUSINTERFACEDIR=share/dbus-1/interfaces \
     -DKDE_INSTALL_QTPLUGINDIR=${OE_QMAKE_PATH_PLUGINS} \
     -DKDE_INSTALL_QMLDIR=${OE_QMAKE_PATH_QML} \
-    -DKDE_PATH_EXTERNAL_HOST_LIBEXECS=${STAGING_LIBEXECDIR_NATIVE} \
-    -DKDE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} \
 "
-
-FILES_${PN} += " \
-    ${datadir}/appdata \
-    ${datadir}/metainfo \
-"
-
 FILES_${PN}-dev += "${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs"

classes/kde-kf5-porting-aids.bbclass

@@ -1,3 +1,3 @@
 inherit kde-kf5
 
-SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.49/portingAids/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.18/portingAids/${BPN}-${PV}.tar.xz"

classes/kde-kf5.bbclass

@@ -1,5 +1,5 @@
 inherit kde-base
 
-KF5_VERSION = "5.49.0"
+KF5_VERSION = "5.18.0"
 
-SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.49/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.18/${BPN}-${PV}.tar.xz"

classes/kde-plasma.bbclass

@@ -1,9 +1,5 @@
 inherit kde-base
 
-PLASMA_VERSION = "5.13.5"
+PLASMA_VERSION = "5.5.3"
 
 SRC_URI = "${KDE_MIRROR}/stable/plasma/${PV}/${BPN}-${PV}.tar.xz"
-
-DEPENDS += " \
-    kwayland \
-"

classes/liri.bbclass

@@ -1,14 +0,0 @@
-LIRI_GIT_BRANCH ?= "develop"
-
-SRC_URI = "git://github.com/lirios/${@'${BPN}'.replace('liri-', '')}.git;protocol=git;branch=${LIRI_GIT_BRANCH}"
-
-DEPENDS += "qtbase qtdeclarative extra-cmake-modules-native"
-
-inherit cmake_qt5_extra pkgconfig
-
-EXTRA_OECMAKE += " \
-    -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \
-    -DECM_MKSPECS_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \
-    -DPLUGIN_INSTALL_DIR=${OE_QMAKE_PATH_PLUGINS} \
-    -DQT_PLUGIN_INSTALL_DIR=${OE_QMAKE_PATH_PLUGINS} \
-"

classes/lv2-postinst-helper.bbclass

@@ -1,53 +0,0 @@
-# Helper class to handle ontarget-postinst creation of lv2 turtle files
-
-# File created during compile usually. To create this file makefiles have to be
-# aligned - see do_configure_prepend at zynaddsubfx or distrho-ports. The file
-# is expected with the following format
-# lv2-ttl-generator <path>/plugin.so
-LV2-TURTLE-BUILD-DATA = "${WORKDIR}/lv2-ttl-generator-data"
-
-# E.g zynaddsubfx needs to create dummy lv2 turtle files to keep install sane.
-# To delete them automatically (see below) the contain a dummy string:
-LV2-DUMMY-TURTLE-STR = "lv2-dummy-turtle-string"
-
-# To make ontarget postinst/prerm happen, the names of all plugins with their
-# paths as installed on target a stored in a file called lv2-postinst-manifest
-LV2-POSTINST-MANIFEST = "${datadir}/${BPN}/lv2-postinst-manifest"
-
-do_install_append() {
-    # remove dummy lv2-turtles again
-    cd ${D}/${libdir}/lv2
-    for tfile in `grep -rl ${LV2-DUMMY-TURTLE-STR}`; do
-        rm $tfile
-    done
-
-    # create postinst manifest
-    install -d ${D}`dirname ${LV2-POSTINST-MANIFEST}`
-    for sofile in `cat ${LV2-TURTLE-BUILD-DATA} | awk '{ print $2 }'`; do
-        sofile=`basename $sofile`
-        installed=`find ${D}${libdir}/lv2 -name $sofile | sed 's|${D}||g'`
-        echo $installed >> ${D}${LV2-POSTINST-MANIFEST}
-    done
-}
-
-
-pkg_postinst_ontarget_${PN}() {
-    oldpath=`pwd`
-    for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
-        cd `dirname "$sofile"`
-        lv2-ttl-generator "$sofile"
-    done
-    cd $oldpath
-}
-
-pkg_prerm_${PN}() {
-    for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
-        path=`dirname "$sofile"`
-        for turtle in `find $path -name '*.ttl'`; do
-            rm $turtle
-        done
-    done
-}
-
-RDEPENDS_${PN} += "lv2-ttl-generator"
-

classes/lxqt.bbclass

@@ -1,15 +1,11 @@
-inherit cmake_qt5_extra
+inherit cmake_qt5 cmake-extra-sanity qt5-translation
 
 HOMEPAGE = "http://lxqt.org/"
 
-DEPENDS += "lxqt-build-tools qtbase qttools-native"
+DEPENDS += "qtbase"
 
 SRC_URI = "git://github.com/lxde/${BPN}.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
-EXTRA_OECMAKE += " \
-    -DPULL_TRANSLATIONS=Off \
-    -DCLEAN_TRANSLATIONS=Off \
-"
-
+# REVISIT: configure to use only ${libdir}/cmake
 FILES_${PN}-dev += "${datadir}/cmake ${libdir}/cmake"

classes/qemu-ext.bbclass

@@ -1,22 +0,0 @@
-inherit qemu
-
-DEPENDS += "qemu-native"
-
-# This is an extended/modified qemu.bbclass tailored four our needs:
-#
-# * add qemu-native to DEPENDS: we can do that because there is no
-#   introspection/interception delayed qemu usage here
-# * The executable binary is set by absolute path: oe-core's qemu.bbclass
-#   expects it in sysroot. Here we usually run binaries in builddir which are
-#   not yet installed.
-# * A recipe can set an extra library path in 'QEMU_EXTRA_LIBDIR'. This path is
-#   an absolute path.
-
-def qemu_run_binary_local(data, rootfs_path, binary):
-    libdir = rootfs_path + data.getVar("libdir", False)
-    base_libdir = rootfs_path + data.getVar("base_libdir", False)
-    extra_libdir = data.getVar("QEMU_EXTRA_LIBDIR", False)
-    if extra_libdir:
-        return qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir, extra_libdir]) + binary
-    else:
-        return qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir]) + binary

classes/qt5-translation.bbclass

@@ -1,7 +1,5 @@
 # translations -> locale packages
 
-DEPENDS += "qttools-native"
-
 # default location
 QT_TRANSLATION_FILES ??= "${datadir}/*/translations/*.qm ${datadir}/*/translations/*/*.qm ${datadir}/*/translations/*/*/*.qm"
 
@@ -36,7 +34,7 @@ python qt_do_split_locales() {
         translocation = '%s%s' % (dvar, transvar)
         transfiles = glob.glob(translocation)
         for l in sorted(transfiles):
-            lib, locale = os.path.basename(l.replace('.qm', '')).split("_",1)
+            lib, locale = l.replace('.qm', '').split("_",1)
             if not locale in locales:
                 locales.append(locale)
 

conf/layer.conf

@@ -8,15 +8,6 @@ BBFILES += "${LAYERDIR}/extends-*/*.bb ${LAYERDIR}/extends-*/*.bbappend"
 
 BBFILE_COLLECTIONS += "meta-qt5-extra"
 BBFILE_PATTERN_meta-qt5-extra := "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-qt5-extra = "20"
+BBFILE_PRIORITY_meta-qt5-extra = "7"
 
-LAYERDEPENDS_meta-qt5-extra = "core qt5-layer openembedded-layer networking-layer multimedia-layer"
-LAYERSERIES_COMPAT_meta-qt5-extra = "sumo"
-
-LICENSE_PATH += "${LAYERDIR}/files/licenses"
-
-# required for fluxbox - supplied by e.g fedora glibc-common
-HOSTTOOLS_NONFATAL += "gencat"
-
-
-PREFERRED_PROVIDER_zyn = "${@bb.utils.contains("DISTRO_FEATURES", "opengl", "zyn-fusion", "zynaddsubfx",d)}"
+LAYERDEPENDS_meta-qt5-extra = "core qt5-layer openembedded-layer networking-layer"

extends-meta-oe/networkmanager_%.bbappend

@@ -0,0 +1,6 @@
+PACKAGECONFIG ?= " \
+    ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
+    modemmanager \
+    bluez5 \
+"
+

extends-meta-qt5/qtbase/0002-qdbusxml2cpp-prepare-commandline-string-manipulation.patch

@@ -17,13 +17,12 @@ diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qd
 index 76401da..3a712d2 100644
 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
 +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
-@@ -289,9 +289,12 @@ static QString moc(const QString &name)
+@@ -289,9 +289,11 @@ static QString moc(const QString &name)
  
  static QTextStream &writeHeader(QTextStream &ts, bool changesWillBeLost)
  {
 +	QString strCmdLine = commandLine;
 +	strCmdLine.replace(QStringLiteral("STRING_FULL_PATH"), QStringLiteral("STRING_PATH"));
-+	strCmdLine.replace(QStringLiteral("recipe-sysroot"), QStringLiteral("recipe--sysroot"));
      ts << "/*" << endl
         << " * This file was generated by " PROGRAMNAME " version " PROGRAMVERSION << endl
 -       << " * Command line was: " << commandLine << endl

extends-meta-qt5/qtbase_git.bbappend

@@ -1,12 +1,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
-PACKAGECONFIG_FONTS = "fontconfig"
-
 # session management only for x11 environment
-PACKAGECONFIG_DISTRO += " \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "sm", "", d)} \
-    accessibility \
-    sql-sqlite \
-    cups \
-    libinput \
-"
+PACKAGECONFIG_DISTRO += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "sm", "", d)}"

extends-meta-qt5/qttools_git.bbappend

@@ -1,17 +1,16 @@
-inherit cmake_lib
+inherit cmake-lib
 
 DEPENDS += "${BPN}-native"
 
 
-# It's really time for us to publish cmake_lib.bbclass
+# It's really time for us to publish cmake-lib.bbclass
 SRC_URI_remove = " \
-    file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
+    file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \
 "
 
 # native ignore
 CMAKE_ALIGN_SYSROOT_class-native[1] = "ignore"
-CMAKE_ALIGN_SYSROOT_class-nativesdk[1] = "ignore"
 
 # cross -> native binaries
-CMAKE_ALIGN_SYSROOT[1] = "Qt5Help, -S${bindir}${QT_DIR_NAME}, -s${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}"
-CMAKE_ALIGN_SYSROOT[2] = "Qt5LinguistTools, -S${bindir}${QT_DIR_NAME}, -s${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}"
+CMAKE_ALIGN_SYSROOT[1] = "Qt5Help, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[2] = "Qt5LinguistTools, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"

extends-oe-core/boost_%.bbappend

@@ -0,0 +1,2 @@
+PACKAGECONFIG ?= "python"
+

extends-oe-core/gpgme/0001-return-unknown-as-host.patch

@@ -0,0 +1,33 @@
+From 84427b2fd68f6c56f3919fdddad63cf5b5541730 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 4 Dec 2014 13:31:15 +0100
+Subject: [PATCH] return unknown as host
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+this is intended for native build which cannot know target host
+
+Upstream-Status: Inappropriate [cross build specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 92375e6..4564c05 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -989,7 +989,7 @@ AH_BOTTOM([
+ # Substitution used for gpgme-config
+ GPGME_CONFIG_LIBS="-lgpgme"
+ GPGME_CONFIG_CFLAGS=""
+-GPGME_CONFIG_HOST="$host"
++GPGME_CONFIG_HOST="unknown"
+ AC_SUBST(GPGME_CONFIG_API_VERSION)
+ AC_SUBST(GPGME_CONFIG_LIBS)
+ AC_SUBST(GPGME_CONFIG_CFLAGS)
+-- 
+1.8.3.1
+

extends-oe-core/gpgme/gpgme.pc

@@ -0,0 +1,10 @@
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: gpgme
+Description: GNU Privacy Guard Made Easy
+Version: 1.4.3
+Requires:
+Libs: -L${libdir} -lgpgme -lassuan -lgpg-error
+Cflags: -I${includedir}

extends-oe-core/gpgme_%.bbappend

@@ -1,6 +0,0 @@
-inherit cmake_lib
-
-CMAKE_ALIGN_SYSROOT_class-native[1] = "ignore"
-
-CMAKE_ALIGN_SYSROOT[1] = "Gpgmepp, -S${includedir}, -s${CMAKE_QT5_EX_PATH_HOST_HEADERS}"
-CMAKE_ALIGN_SYSROOT[2] = "Gpgmepp, -S${libdir}, -s${OE_QMAKE_PATH_HOST_LIBS}/"

extends-oe-core/gpgme_1.4.3.bb

@@ -0,0 +1,45 @@
+SUMMARY = "High-level GnuPG encryption/signing API"
+DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management"
+HOMEPAGE = "http://www.gnupg.org/gpgme.html"
+BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
+
+LICENSE = "GPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \
+                    file://src/gpgme.h.in;endline=23;md5=dccb4bb624011e36513c61ef0422d054 \
+                    file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
+           file://gpgme.pc"
+
+SRC_URI_append_class-native = " file://0001-return-unknown-as-host.patch"
+
+SRC_URI[md5sum] = "334e524cffa8af4e2f43ae8afe585672"
+SRC_URI[sha256sum] = "2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60120496"
+
+DEPENDS = "libgpg-error libassuan"
+
+EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm --with-gpgconf=no --with-g13=no"
+
+inherit autotools texinfo pkgconfig
+
+PACKAGES =+ "${PN}-pthread"
+FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"
+FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*"
+
+do_configure_prepend () {
+	# Else these could be used in preference to those in aclocal-copy
+	rm -f ${S}/m4/gpg-error.m4
+	rm -f ${S}/m4/libassuan.m4
+}
+
+do_install_append () {
+        install -d ${D}${libdir}/pkgconfig
+        install -m 0644 ${WORKDIR}/gpgme.pc ${D}${libdir}/pkgconfig/
+}
+
+do_install_append_class-native () {
+	sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}${bindir}/gpgme-config
+}
+
+BBCLASSEXTEND = "native"

files/licenses/CC-BY-SA-4.0

@@ -1,396 +0,0 @@
-Attribution 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
-	wiki.creativecommons.org/Considerations_for_licensors
-
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More_considerations
-     for the public: 
-	wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution 4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution 4.0 International Public License ("Public License"). To the
-extent this Public License may be interpreted as a contract, You are
-granted the Licensed Rights in consideration of Your acceptance of
-these terms and conditions, and the Licensor grants You such rights in
-consideration of benefits the Licensor receives from making the
-Licensed Material available under these terms and conditions.
-
-
-Section 1 -- Definitions.
-
-  a. Adapted Material means material subject to Copyright and Similar
-     Rights that is derived from or based upon the Licensed Material
-     and in which the Licensed Material is translated, altered,
-     arranged, transformed, or otherwise modified in a manner requiring
-     permission under the Copyright and Similar Rights held by the
-     Licensor. For purposes of this Public License, where the Licensed
-     Material is a musical work, performance, or sound recording,
-     Adapted Material is always produced where the Licensed Material is
-     synched in timed relation with a moving image.
-
-  b. Adapter's License means the license You apply to Your Copyright
-     and Similar Rights in Your contributions to Adapted Material in
-     accordance with the terms and conditions of this Public License.
-
-  c. Copyright and Similar Rights means copyright and/or similar rights
-     closely related to copyright including, without limitation,
-     performance, broadcast, sound recording, and Sui Generis Database
-     Rights, without regard to how the rights are labeled or
-     categorized. For purposes of this Public License, the rights
-     specified in Section 2(b)(1)-(2) are not Copyright and Similar
-     Rights.
-
-  d. Effective Technological Measures means those measures that, in the
-     absence of proper authority, may not be circumvented under laws
-     fulfilling obligations under Article 11 of the WIPO Copyright
-     Treaty adopted on December 20, 1996, and/or similar international
-     agreements.
-
-  e. Exceptions and Limitations means fair use, fair dealing, and/or
-     any other exception or limitation to Copyright and Similar Rights
-     that applies to Your use of the Licensed Material.
-
-  f. Licensed Material means the artistic or literary work, database,
-     or other material to which the Licensor applied this Public
-     License.
-
-  g. Licensed Rights means the rights granted to You subject to the
-     terms and conditions of this Public License, which are limited to
-     all Copyright and Similar Rights that apply to Your use of the
-     Licensed Material and that the Licensor has authority to license.
-
-  h. Licensor means the individual(s) or entity(ies) granting rights
-     under this Public License.
-
-  i. Share means to provide material to the public by any means or
-     process that requires permission under the Licensed Rights, such
-     as reproduction, public display, public performance, distribution,
-     dissemination, communication, or importation, and to make material
-     available to the public including in ways that members of the
-     public may access the material from a place and at a time
-     individually chosen by them.
-
-  j. Sui Generis Database Rights means rights other than copyright
-     resulting from Directive 96/9/EC of the European Parliament and of
-     the Council of 11 March 1996 on the legal protection of databases,
-     as amended and/or succeeded, as well as other essentially
-     equivalent rights anywhere in the world.
-
-  k. You means the individual or entity exercising the Licensed Rights
-     under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
-  a. License grant.
-
-       1. Subject to the terms and conditions of this Public License,
-          the Licensor hereby grants You a worldwide, royalty-free,
-          non-sublicensable, non-exclusive, irrevocable license to
-          exercise the Licensed Rights in the Licensed Material to:
-
-            a. reproduce and Share the Licensed Material, in whole or
-               in part; and
-
-            b. produce, reproduce, and Share Adapted Material.
-
-       2. Exceptions and Limitations. For the avoidance of doubt, where
-          Exceptions and Limitations apply to Your use, this Public
-          License does not apply, and You do not need to comply with
-          its terms and conditions.
-
-       3. Term. The term of this Public License is specified in Section
-          6(a).
-
-       4. Media and formats; technical modifications allowed. The
-          Licensor authorizes You to exercise the Licensed Rights in
-          all media and formats whether now known or hereafter created,
-          and to make technical modifications necessary to do so. The
-          Licensor waives and/or agrees not to assert any right or
-          authority to forbid You from making technical modifications
-          necessary to exercise the Licensed Rights, including
-          technical modifications necessary to circumvent Effective
-          Technological Measures. For purposes of this Public License,
-          simply making modifications authorized by this Section 2(a)
-          (4) never produces Adapted Material.
-
-       5. Downstream recipients.
-
-            a. Offer from the Licensor -- Licensed Material. Every
-               recipient of the Licensed Material automatically
-               receives an offer from the Licensor to exercise the
-               Licensed Rights under the terms and conditions of this
-               Public License.
-
-            b. No downstream restrictions. You may not offer or impose
-               any additional or different terms or conditions on, or
-               apply any Effective Technological Measures to, the
-               Licensed Material if doing so restricts exercise of the
-               Licensed Rights by any recipient of the Licensed
-               Material.
-
-       6. No endorsement. Nothing in this Public License constitutes or
-          may be construed as permission to assert or imply that You
-          are, or that Your use of the Licensed Material is, connected
-          with, or sponsored, endorsed, or granted official status by,
-          the Licensor or others designated to receive attribution as
-          provided in Section 3(a)(1)(A)(i).
-
-  b. Other rights.
-
-       1. Moral rights, such as the right of integrity, are not
-          licensed under this Public License, nor are publicity,
-          privacy, and/or other similar personality rights; however, to
-          the extent possible, the Licensor waives and/or agrees not to
-          assert any such rights held by the Licensor to the limited
-          extent necessary to allow You to exercise the Licensed
-          Rights, but not otherwise.
-
-       2. Patent and trademark rights are not licensed under this
-          Public License.
-
-       3. To the extent possible, the Licensor waives any right to
-          collect royalties from You for the exercise of the Licensed
-          Rights, whether directly or through a collecting society
-          under any voluntary or waivable statutory or compulsory
-          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
-  a. Attribution.
-
-       1. If You Share the Licensed Material (including in modified
-          form), You must:
-
-            a. retain the following if it is supplied by the Licensor
-               with the Licensed Material:
-
-                 i. identification of the creator(s) of the Licensed
-                    Material and any others designated to receive
-                    attribution, in any reasonable manner requested by
-                    the Licensor (including by pseudonym if
-                    designated);
-
-                ii. a copyright notice;
-
-               iii. a notice that refers to this Public License;
-
-                iv. a notice that refers to the disclaimer of
-                    warranties;
-
-                 v. a URI or hyperlink to the Licensed Material to the
-                    extent reasonably practicable;
-
-            b. indicate if You modified the Licensed Material and
-               retain an indication of any previous modifications; and
-
-            c. indicate the Licensed Material is licensed under this
-               Public License, and include the text of, or the URI or
-               hyperlink to, this Public License.
-
-       2. You may satisfy the conditions in Section 3(a)(1) in any
-          reasonable manner based on the medium, means, and context in
-          which You Share the Licensed Material. For example, it may be
-          reasonable to satisfy the conditions by providing a URI or
-          hyperlink to a resource that includes the required
-          information.
-
-       3. If requested by the Licensor, You must remove any of the
-          information required by Section 3(a)(1)(A) to the extent
-          reasonably practicable.
-
-       4. If You Share Adapted Material You produce, the Adapter's
-          License You apply must not prevent recipients of the Adapted
-          Material from complying with this Public License.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
-  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
-     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database;
-
-  b. if You include all or a substantial portion of the database
-     contents in a database in which You have Sui Generis Database
-     Rights, then the database in which You have Sui Generis Database
-     Rights (but not its individual contents) is Adapted Material; and
-
-  c. You must comply with the conditions in Section 3(a) if You Share
-     all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
-  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-  c. The disclaimer of warranties and limitation of liability provided
-     above shall be interpreted in a manner that, to the extent
-     possible, most closely approximates an absolute disclaimer and
-     waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
-  a. This Public License applies for the term of the Copyright and
-     Similar Rights licensed here. However, if You fail to comply with
-     this Public License, then Your rights under this Public License
-     terminate automatically.
-
-  b. Where Your right to use the Licensed Material has terminated under
-     Section 6(a), it reinstates:
-
-       1. automatically as of the date the violation is cured, provided
-          it is cured within 30 days of Your discovery of the
-          violation; or
-
-       2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any
-     right the Licensor may have to seek remedies for Your violations
-     of this Public License.
-
-  c. For the avoidance of doubt, the Licensor may also offer the
-     Licensed Material under separate terms or conditions or stop
-     distributing the Licensed Material at any time; however, doing so
-     will not terminate this Public License.
-
-  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
-     License.
-
-
-Section 7 -- Other Terms and Conditions.
-
-  a. The Licensor shall not be bound by any additional or different
-     terms or conditions communicated by You unless expressly agreed.
-
-  b. Any arrangements, understandings, or agreements regarding the
-     Licensed Material not stated herein are separate from and
-     independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
-  a. For the avoidance of doubt, this Public License does not, and
-     shall not be interpreted to, reduce, limit, restrict, or impose
-     conditions on any use of the Licensed Material that could lawfully
-     be made without permission under this Public License.
-
-  b. To the extent possible, if any provision of this Public License is
-     deemed unenforceable, it shall be automatically reformed to the
-     minimum extent necessary to make it enforceable. If the provision
-     cannot be reformed, it shall be severed from this Public License
-     without affecting the enforceability of the remaining terms and
-     conditions.
-
-  c. No term or condition of this Public License will be waived and no
-     failure to comply consented to unless expressly agreed to by the
-     Licensor.
-
-  d. Nothing in this Public License constitutes or may be interpreted
-     as a limitation upon, or waiver of, any privileges and immunities
-     that apply to the Licensor or You, including from the legal
-     processes of any jurisdiction or authority.
-
-
-=======================================================================
-
-Creative Commons is not a party to its public
-licenses. Notwithstanding, Creative Commons may elect to apply one of
-its public licenses to material it publishes and in those instances
-will be considered the “Licensor.” The text of the Creative Commons
-public licenses is dedicated to the public domain under the CC0 Public
-Domain Dedication. Except for the limited purpose of indicating that
-material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the
-public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
-

recipes-hawaii/cinema/cinema_git.bb

@@ -0,0 +1,15 @@
+SUMMARY = "Simple video player for the Hawaii desktop environment"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://src/main.cpp;beginline=9;endline=24;md5=abd5b11c017f98f28850382a61e02a30"
+
+inherit qmake5
+
+DEPENDS = "qtbase qtdeclarative qtquickcontrols qtmultimedia"
+SRC_URI = " \
+	git://github.com/plfiorini/${BPN}.git;protocol=git;branch=master \
+	file://0001-Make-install-work.patch \
+"
+SRCREV = "66290bce6b5a9074f13886b42370f95677ef50d6"
+PV = "git${SRCPV}"
+
+S = "${WORKDIR}/git"

recipes-hawaii/cinema/files/0001-Make-install-work.patch

@@ -0,0 +1,27 @@
+From 39d0534a47ade0b83348ad789d3a75fbaf8fb868 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 8 Jan 2014 22:36:35 +0100
+Subject: [PATCH] Make install work
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/src.pro | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/src.pro b/src/src.pro
+index 8045652..9ad4e2f 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -19,3 +19,6 @@ OTHER_FILES += \
+     qml/ControlBar.qml \
+     qml/Utils.js \
+     qml/SeekControl.qml
++
++target.path = /usr/bin
++INSTALLS += target
+-- 
+1.8.3.1
+

recipes-hawaii/eyesight/eyesight_git.bb

@@ -0,0 +1,14 @@
+SUMMARY = "Image viewer for the Hawaii desktop environment"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+inherit hawaii
+
+DEPENDS += "qttools-native"
+
+SRCREV = "7ff55701dde114df2911c937143499f73d0f4e09"
+PV = "0.1.4+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "${datadir}/appdata"

recipes-hawaii/greenisland/greenisland_git.bb

@@ -0,0 +1,45 @@
+SUMMARY = "Support library to make Qt-based Wayland compositors development easier"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
+
+inherit hawaii cmake-lib pythonnative pkgconfig
+
+DEPENDS += " \
+    ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+    wayland \
+    qtwayland \
+    libkscreen \
+    virtual/egl \
+"
+SRC_URI = " \
+    git://github.com/greenisland/${BPN}.git;protocol=git;branch=master \
+"
+
+SRCREV = "9c3ce026da4249346c4e85ff9215eab66522444d"
+PV = "0.6.0"
+
+S = "${WORKDIR}/git"
+
+# make it find qtwaylandscanner
+EXTRA_OECMAKE += " \
+    -DCMAKE_PROGRAM_PATH=${STAGING_DIR_NATIVE}/$bindir/qt5 \
+"
+
+PACKAGECONFIG ??= " \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xwayland", "",d)} \
+"
+PACKAGECONFIG[xawayland] = "-DENABLE_XWAYLAND=ON,-DENABLE_XWAYLAND=OFF,libxcb"
+
+# cross libs / headers
+CMAKE_ALIGN_SYSROOT[1] = "GreenIsland, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "GreenIsland, -S${includedir}, -S${STAGING_INCDIR}"
+
+FILES_${PN} += " \
+    ${OE_QMAKE_PATH_QML}/GreenIsland \
+    ${libdir}/plugins/greenisland \
+"
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_QML}/GreenIsland/.debug \
+    ${libdir}/plugins/greenisland/.debug \
+"
+FILES_${PN}-dev += "${libdir}/cmake"

recipes-hawaii/hawaii-baseapps/hawaii-baseapps_git.bb

@@ -0,0 +1,14 @@
+SUMMARY = "Base applications for the Hawaii desktop environment"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+	file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit hawaii pkgconfig
+
+DEPENDS += "polkit-qt-1"
+
+SRCREV = "b913c123f87d59e584a96d3d4c31dffaeb8dca24"
+PV = "0.4.90+git${SRCPV}"
+S = "${WORKDIR}/git"

recipes-hawaii/hawaii-icon-themes/hawaii-icon-themes_git.bb

@@ -0,0 +1,20 @@
+SUMMARY = "Icon themes for the Hawaii desktop environment"
+LICENSE = "LGPLv3 | CC-BY-SA-3.0"
+LIC_FILES_CHKSUM = " \
+    file://src/cursors/COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
+    file://src/cursors/COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \
+    file://src/cursors/COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://src/symbolic/COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
+    file://src/symbolic/COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \
+    file://src/symbolic/COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+"
+
+inherit hawaii
+
+SRCREV = "1ff24655d3881762294e9dde4a83770e6ff80c3b"
+PV = "0.4.0+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+PACKAGE_ARCH = "all"
+
+FILES_${PN} += "${datadir}/icons"

recipes-hawaii/hawaii-shell/hawaii-shell_git.bb

@@ -0,0 +1,74 @@
+SUMMARY = "Hawaii desktop environment shell"
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = " \
+	file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit hawaii pythonnative cmake-lib distro_features_check
+#inherit systemd
+
+# weston fails for missing wayland-egl
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+SRC_URI += " \
+    file://0001-find-host-s-git.patch \
+"
+SRCREV = "8a33b1b5a292db4bac87943515586d32259d5ada"
+PV = "0.5.91+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+DEPENDS += " \
+    qtwayland-native \
+    wayland \
+    libqtxdg \
+    solid \
+    greenisland \
+    networkmanager-qt \
+    modemmanager-qt \
+"
+
+# REVISIT optionals
+DEPENDS += " \
+    alsa-lib \
+    pulseaudio \
+"
+
+PACKAGECONFIG[nm_qt] = "-DENABLE_NETWORK_MANAGER=ON,-DENABLE_NETWORK_MANAGER=OFF,networkmanager-qt"
+PACKAGECONFIG ??= "nm_qt"
+
+# REVISIT/HACK: for unkown reasons libqtxdg libs are not found
+LDFLAGS += "-lQt5Xdg"
+
+# starter scripts rely on bash qdbus catchsegv
+RDEPENDS_${PN} = "bash qttools-tools qtwayland-plugins catchsegv"
+
+# REVISIT optionals
+RRECOMMENDS_${PN} += " \
+    hawaii-wallpapers \
+    hawaii-icon-themes \
+    weston \
+"
+
+FILES_${PN} += " \
+    ${datadir} \
+    ${OE_QMAKE_PATH_QML} \
+    ${libdir}/plugins \
+    ${libdir}/systemd \
+"
+
+FILES_${PN}-dbg += " \
+    ${libdir}/plugins/*/.debug \
+    ${OE_QMAKE_PATH_QML}/*/*/.debug \
+    ${OE_QMAKE_PATH_QML}/*/*/*/.debug \
+"
+
+FILES_${PN}-dev += " \
+    ${libdir}/cmake \
+"
+
+# cross libs / headers
+CMAKE_ALIGN_SYSROOT[1] = "Hawaii, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "Hawaii, -S${includedir}, -S${STAGING_INCDIR}"
+

recipes-hawaii/hawaii-system-preferences/hawaii-system-preferences_git.bb

@@ -0,0 +1,24 @@
+SUMMARY = "System preferences for the Hawaii desktop environment"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+	file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit hawaii
+
+DEPENDS += "polkit-qt-1 kscreen"
+
+SRCREV = "5d9d32762151f7306fcb0c6798d2e4a940f57f2f"
+PV = "0.4.0+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += "-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools"
+
+FILES_${PN} += " \
+    ${OE_QMAKE_PATH_QML} \
+"
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_QML}/org/hawaii/systempreferences/*/.debug \
+"

recipes-hawaii/hawaii-terminal/hawaii-terminal_git.bb

@@ -0,0 +1,19 @@
+SUMMARY = "Terminal emulator for the Hawaii desktop environment"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+inherit hawaii
+
+SRCREV = "fc35b8a44e55334dcecdec8cf6e80047fe056727"
+PV = "0.5.91+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+FILES_${PN} += " \
+    ${datadir}/appdata \
+    ${OE_QMAKE_PATH_QML}/Hawaii/Terminal \
+"
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_QML}/Hawaii/Terminal/*/.debug \
+"

recipes-hawaii/hawaii-wallpapers/hawaii-wallpapers_git.bb

@@ -0,0 +1,12 @@
+SUMMARY = "Wallpapers for the Hawaii desktop environment"
+LICENSE = "LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
+
+inherit hawaii
+
+SRCREV = "ffca94dc6917ba0109dbd837cc3579fd0cde6357"
+PV = "0.4.90+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "${datadir}"

recipes-hawaii/hawaii-widget-styles/hawaii-widget-styles_git.bb

@@ -0,0 +1,15 @@
+SUMMARY = "Styles for applications using QtQuick Controls"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
+
+inherit hawaii
+
+SRCREV = "bc6678a242a8439488e0f57ddefdbb1eed5eabf2"
+PV = "0.5.0+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+FILES_${PN} += " \
+    ${datadir}/color-schemes \
+    ${OE_QMAKE_PATH_QML} \
+"

recipes-hawaii/packagegroups/hawaii-world.bb

@@ -0,0 +1,25 @@
+SUMMARY = "Hawaii desktop package collection"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+
+inherit packagegroup
+
+RDEPENDS_${PN} = " \
+    cinema \
+    eyesight \
+    greenisland \
+    hawaii-baseapps \
+    hawaii-icon-themes \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "hawaii-shell", "",d)} \
+    hawaii-system-preferences \
+    hawaii-terminal \
+    hawaii-wallpapers \
+    hawaii-widget-styles \
+    qtaccountsservice \
+    qtconfiguration \
+    swordfish \
+"
+
+# wind was a X11 mauios approach. For dependencies (kdeclarative does not build 
+# for raspi) keep out
+# wind

recipes-hawaii/qtaccountsservice/qtaccountsservice_git.bb

@@ -0,0 +1,20 @@
+SUMMARY = "Qt-style API to use freedesktop.org's AccountsService DBus service"
+LICENSE = "GPLv2 & LGPLv2.1 & GFDL-1.3"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit hawaii
+
+SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
+SRCREV = "2624cc812ae14bf9abee9634de0f4cc0ee0a5926"
+
+S = "${WORKDIR}/git"
+PV = "0.6.0"
+
+FILES_${PN} += "${OE_QMAKE_PATH_QML}/QtAccountsService"
+FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/QtAccountsService/.debug"
+FILES_${PN}-dev += "${libdir}/cmake"
+
+CMAKE_ALIGN_SYSROOT[1] = "QtAccountsService, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[2] = "QtAccountsService, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"

recipes-hawaii/qtconfiguration/files/0001-fix-build-with-qt-5.5.patch

@@ -0,0 +1,36 @@
+From 9d6d7a17b26935658c8fc546712e423fbd2cfad3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 13 Sep 2015 23:36:56 +0200
+Subject: [PATCH] fix build with qt 5.5
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+src/configuration/qgvariantutils.cpp:99:26: error: variable 'QDataStream s' has initializer but incomplete type
+             QDataStream s(&a, QIODevice::ReadOnly);
+                          ^
+
+Upstream-Status: Submitted [1]
+
+[1] https://github.com/hawaii-desktop/qtconfiguration/pull/1
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/configuration/qgvariantutils.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/configuration/qgvariantutils.cpp b/src/configuration/qgvariantutils.cpp
+index 757f56d..b5add00 100644
+--- a/src/configuration/qgvariantutils.cpp
++++ b/src/configuration/qgvariantutils.cpp
+@@ -39,6 +39,7 @@
+ #include <QtCore/QDebug>
+ #include <QtCore/QUrl>
+ #include <QtCore/QStringList>
++#include <QDataStream>
+ 
+ #include "qgvariantutils.h"
+ 
+-- 
+2.1.0
+

recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb

@@ -0,0 +1,28 @@
+SUMMARY = "Modules for fluid and dynamic applications development with QtQuick"
+LICENSE = "BSD & GFDL-1.3 & GPLv3 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+	file://LICENSE.BSD;md5=5bd3079664b3473c826ea30fd8d55687 \
+	file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
+	file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit hawaii cmake-lib
+
+DEPENDS += "dconf"
+
+SRC_URI = " \
+    git://github.com/hawaii-desktop/${BPN}.git \
+    file://0001-fix-build-with-qt-5.5.patch \
+"
+SRCREV = "804739d73de982fc144ff45653c243cefcfa79cb"
+
+S = "${WORKDIR}/git"
+
+CMAKE_ALIGN_SYSROOT[1] = "QtConfiguration, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+
+FILES_${PN} += "${libdir}/hawaii/qml/Hawaii/Configuration"
+FILES_${PN}-dbg += "${libdir}/hawaii/qml/Hawaii/Configuration/.debug"
+FILES_${PN}-dev += "${libdir}/cmake"
+
+

recipes-hawaii/swordfish/swordfish_git.bb

@@ -0,0 +1,19 @@
+SUMMARY = "File manager"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+inherit hawaii
+
+DEPENDS += "qttools"
+
+SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git;protocol=git;branch=master"
+SRCREV = "0f1d9294cbf9d4ac235c31d10b0c7166845e098f"
+PV = "0.1.90+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+CXXFLAGS += "-fPIC"
+EXTRA_OECMAKE += "-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools"
+
+FILES_${PN} += "${libdir}/hawaii/qml ${datadir}"
+FILES_${PN}-dbg += "${libdir}/hawaii/qml/Swordfish/.debug"

recipes-hawaii/wind/wind_0.4.0.bb

@@ -0,0 +1,28 @@
+SUMMARY = "Wind theme for Maui and Hawaii"
+LICENSE = "GPLv2 & BSD & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://COPYING.BSD;md5=9e96e13a1a76211bcdb0255a5d42b01d \
+	file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit hawaii
+
+DEPENDS += "plasma-framework"
+
+SRC_URI = "git://github.com/mauios/${BPN}.git;protocol=git;branch=master"
+SRCREV = "cc5d4de41aaeb63611701c0a739a93bc31bccf50"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += "-DENABLE_WIDGETS_FACTORY:bool=ON"
+
+PACKAGES =+ "${PN}-grub ${PN}-plymouth ${PN}-widget-factory"
+
+FILES_${PN}-grub = "/boot"
+FILES_${PN}-plymouth = "${datadir}/plymouth/themes"
+FILES_${PN}-widget-factory = "${bindir}/*widget-factory"
+FILES_${PN} += " \
+    ${datadir} \
+    ${OE_QMAKE_PATH_QML} \
+"

recipes-kdab/hotspot/hotspot_git.bb

@@ -1,31 +0,0 @@
-SUMMARY = "The Linux perf GUI for performance analysis"
-LICENSE = "GPLv2+ | KDAB-Commercial"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.txt;md5=a6b8a64054f1549420f27724acd2337a \
-    file://LICENSE.GPL.txt;md5=eed541e1ee57f0373b3cb5824dfe6b93 \
-    file://LICENSE.US.txt;md5=1cf6e30372544be558f7146a7e229cdd \
-"
-
-inherit kde-base pkgconfig gettext gtk-icon-cache
-
-DEPENDS += " \
-    elfutils \
-    ki18n-native \
-    kcoreaddons-native \
-    kauth-native \
-    kconfig-native \
-    threadweaver \
-    kconfigwidgets \
-    kitemviews \
-    kitemmodels \
-    kio \
-    solid \
-"
-SRC_URI = "gitsm://github.com/KDAB/hotspot.git"
-SRCREV = "a41a0a5ba1fead202bfdcb2198f192114d030484"
-S = "${WORKDIR}/git"
-PV = "1.1.0+git${SRCPV}"
-
-FILES_${PN} += "${datadir}/icons"
-
-RDEPENDS_${PN} += "perf"

recipes-kde/apps/ark/ark.bb

@@ -10,12 +10,10 @@ inherit kde-apps gtk-icon-cache
 DEPENDS += "\
     libarchive \
     karchive \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
+    kconfig \
     kcrash \
     kdbusaddons \
-    kdoctools-native \
+    kdoctools \
     ki18n \
     kiconthemes \
     khtml \
@@ -23,25 +21,22 @@ DEPENDS += "\
     kservice \
     kpty \
     kwidgetsaddons \
-    kitemmodels \
-    sonnet-native \
-"
+" 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "ca6926e80afc64f8ab1b3a0adb5286e1"
-SRC_URI[sha256sum] = "e544c3433350fb837570b62e14faeb1033ef31458084a819d49c630b58a6e736"
+SRC_URI[md5sum] = "2fe131a931d51603eff33b80d45a73b7"
+SRC_URI[sha256sum] = "c3a67c3a1c377989d567dc9c0228b684dc475612405d3c4638f40d0dbd87bd7c"
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 FILES_${PN} += " \
+    ${datadir}/appdata \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
-    ${datadir}/mime \
     ${datadir}/k*5 \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_PLUGINS}/.debug \
-    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
     ${OE_QMAKE_PATH_PLUGINS}/kf5/kio_dnd/.debug \
 "

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

@@ -6,43 +6,36 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
 Upstream-Status: Pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
-
 ---
- app/main.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ app/main.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/app/main.cpp b/app/main.cpp
-index 0396400..5924683 100644
+index 4a95063..c3d3a61 100644
 --- a/app/main.cpp
 +++ b/app/main.cpp
-@@ -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::NoExitOnFailure);
+@@ -175,6 +175,7 @@ int main(int argc, char **argv)
+     KDBusService dbusService(KDBusService::Multiple);
  
+     //session restoring
 +#ifndef QT_NO_SESSIONMANAGER
-     // Session restoring.
      if (application.isSessionRestored()) {
          if (!KMainWindow::canBeRestored(1)) {
-@@ -218,8 +219,9 @@ int main(int argc, char **argv)
+             return -1;
+@@ -186,7 +187,9 @@ int main(int argc, char **argv)
              delete window;
              return -1;
          }
--    } else { // New ark window (no restored session).
--
-+    } else // New ark window (no restored session).
+-    } else { //new ark window (no restored session)
++    } else
 +#endif
-+    {
-         // Open any given URLs.
-         const QStringList urls = parser.positionalArguments();
++    { //new ark window (no restored session)
  
+         // open any given URLs
+         const QStringList urls = parser.positionalArguments();
 -- 
-2.5.5
+2.1.0
 

recipes-kde/apps/baloo-widgets/baloo-widgets.bb

@@ -5,24 +5,23 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit kde-apps gettext
+inherit kde-apps cmake-lib
 
 DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
+    kconfig \
     kio \
     ki18n \
     kservice \
     kfilemetadata \
     baloo \
-"
+    kdelibs4support \
+" 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "5d27fce69637836b315c9d6baf30da14"
-SRC_URI[sha256sum] = "4903d58bf747e5d2898c750f179bb5539eaabcd77fbbc7a70a18dd752aaad408"
+SRC_URI[md5sum] = "2ffa70cbc5259a2f502c6853fb45e240"
+SRC_URI[sha256sum] = "e17e97a5989b0ccfc68a65b093db340bc4962a23ebbcc825f93c975916b77251"
+
+# cross libs / headers
+CMAKE_ALIGN_SYSROOT[1] = "KF5BalooWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5BalooWidgets, -S${includedir}, -S${STAGING_INCDIR}"
 
-FILES_${PN} += " \
-    ${datadir}/kservices5 \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"

recipes-kde/apps/bovo/bovo.bb

@@ -9,20 +9,19 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps gtk-icon-cache
 
 DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
+    kcoreaddons \
     kdbusaddons \
-    kdoctools-native \
+    kdoctools \
     kxmlgui \
     libkdegames \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "780378835e74c5924c5a59a30680b5d7"
-SRC_URI[sha256sum] = "6a1f4b97dc623ff8d25561dd75ab688d9d1aac56ab45f0d1dc2c078018a8732d"
+SRC_URI[md5sum] = "6e6bdcf59c591c4499b2c26c05e0702b"
+SRC_URI[sha256sum] = "f346055908a9c3c3670a7cc493e1d5903225d901e1171eeb01b8ddbd1aebda08"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
+    ${datadir}/appdata \
 "

recipes-kde/apps/calligra/kdb_3.1.0.bb

@@ -1,22 +0,0 @@
-SUMMARY = "Database Connectivity and Creation Framework"
-HOMEPAGE = "https://community.kde.org/KDb"
-LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
-LIC_FILES_CHKSUM = " \
-    file://COPYING.LIB;md5=a9cc0417b6424a8311f616fa527d0755 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-    file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
-"
-
-inherit kde-apps
-
-DEPENDS += " \
-    icu \
-    kcoreaddons-native \
-    kcoreaddons \
-"
-
-SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "25651209050396a76d660856f109cf04"
-SRC_URI[sha256sum] = "175645a149ae4d758ff2746900f6eabe4734b2bdac4d8c95893c650be4f929f2"
-
-FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"

recipes-kde/apps/calligra/kexi/0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch

@@ -1,48 +0,0 @@
-From 11f1c4adc5141a66552f6862d943c7af3c8972b3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 18 Jun 2018 23:31:15 +0200
-Subject: [PATCH] replace try_run by try_compile in breeze-icon-check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-try_run does not work in cross environments
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- cmake/modules/CheckGlobalBreezeIcons.cmake | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/cmake/modules/CheckGlobalBreezeIcons.cmake b/cmake/modules/CheckGlobalBreezeIcons.cmake
-index 9763213..46a218a 100644
---- a/cmake/modules/CheckGlobalBreezeIcons.cmake
-+++ b/cmake/modules/CheckGlobalBreezeIcons.cmake
-@@ -24,21 +24,14 @@ else()
-     set(CheckGlobalBreezeIcons_libs Qt5::Xml)
- endif()
- 
--try_run(RUN_RESULT COMPILE_OK
-+try_compile(COMPILE_OK
-     ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp
-     ${CMAKE_SOURCE_DIR}/cmake/modules/CheckGlobalBreezeIcons.cpp
-     COMPILE_DEFINITIONS ${CheckGlobalBreezeIcons_defs}
-     LINK_LIBRARIES ${CheckGlobalBreezeIcons_libs}
-     CMAKE_FLAGS ${CheckGlobalBreezeIcons_flags}
--    COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT
--    RUN_OUTPUT_VARIABLE RUN_OUTPUT)
-+    OUTPUT_VARIABLE COMPILE_OUTPUT)
- 
- if(NOT COMPILE_OK)
-     message(FATAL_ERROR "${COMPILE_OUTPUT}")
- endif()
--
--if(NOT ${RUN_RESULT} EQUAL 0)
--    message(FATAL_ERROR "No valid breeze-icons.rcc resource file found. \
--The CheckGlobalBreezeIcons.cmake script returned ${RUN_RESULT}.\n \
--Result: ${RUN_OUTPUT}")
--endif()
--- 
-2.14.3
-

recipes-kde/apps/calligra/kexi/0002-Add-missing-include-to-fix-build-with-Qt-5.11.patch

@@ -1,30 +0,0 @@
-From e915c66f94921aaf07232a454404e157b65bbb5f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 22 Jun 2018 22:49:17 +0200
-Subject: [PATCH] Add missing include to fix build with Qt 5.11
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/main/startup/KexiNewProjectAssistant.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/main/startup/KexiNewProjectAssistant.cpp b/src/main/startup/KexiNewProjectAssistant.cpp
-index 59e819a..afacc17 100644
---- a/src/main/startup/KexiNewProjectAssistant.cpp
-+++ b/src/main/startup/KexiNewProjectAssistant.cpp
-@@ -54,6 +54,7 @@
- #include <QProgressBar>
- #include <QFileInfo>
- #include <QFileDialog>
-+#include <QAction>
- 
- class KexiServerDBNamePage : public QWidget, public Ui::KexiServerDBNamePage
- {
--- 
-2.14.3
-

recipes-kde/apps/calligra/kexi_3.1.0.bb

@@ -1,67 +0,0 @@
-SUMMARY = "Kexi is a visual database applications creator"
-HOMEPAGE = "https://www.calligra.org/kexi/"
-LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2 & BSD"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=8608b1f74c58ebcb11718f46e8619749 \
-    file://COPYING.LIB;md5=7537f2f34ef162007ae9f34b9f256dcb \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-    file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
-"
-
-inherit kde-apps gtk-icon-cache
-
-DEPENDS += " \
-    qtwebkit \
-    \
-    kdb \
-    kreport \
-    \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    karchive \
-    kcodecs \
-    kconfigwidgets \
-    kguiaddons \
-    ki18n \
-    kiconthemes \
-    kitemviews \
-    kwidgetsaddons \
-    ktextwidgets \
-    kxmlgui \
-    kcompletion \
-    kio \
-    ktexteditor \
-    marble \
-"
-
-SRC_URI = " \
-    ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
-    file://0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch \
-    file://0002-Add-missing-include-to-fix-build-with-Qt-5.11.patch \
-"
-SRC_URI[md5sum] = "22d6c4739109441f5274da584f67f1c8"
-SRC_URI[sha256sum] = "6d55cd4af177bcb060673a0977d52bc91cc2dd1b1420d008a78f9783312152fb"
-
-do_install_append() {
-    install -d "${D}/${datadir}/pixmaps"
-    install ${S}/src/pics/icons/breeze/apps/48/kexi.svg ${D}/${datadir}/pixmaps/
-}
-
-FILES_${PN} += " \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"
-
-RDEPENDS_${PN} += "breeze-icons-binres"
-
-# REVISIT
-#-- The following RECOMMENDED packages have not been found:
-#
-# * KexiMarble (required version >= 0.19.2), KDE World Globe Widget library, <https://marble.kde.org>
-#   Required by Kexi form map widget
-# * MySQL, MySQL Client Library (libmysqlclient), <http://www.mysql.com>
-#   Required by Kexi MySQL migration driver
-# * PostgreSQL, C API to PostgreSQL (libpq), <http://www.postgresql.org>
-#   Required by Kexi PostgreSQL migration driver
-

recipes-kde/apps/calligra/kproperty_3.1.0.bb

@@ -1,29 +0,0 @@
-SUMMARY = "Property editing framework with editor widget"
-HOMEPAGE = "https://community.kde.org/KProperty"
-LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
-LIC_FILES_CHKSUM = " \
-    file://COPYING.LIB;md5=3dcc9b0b0118292a0c5d1c18927ef176 \
-    file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
-"
-
-inherit kde-apps
-
-DEPENDS += " \
-    kcoreaddons-native \
-    kcoreaddons \
-    kconfig-native \
-    kconfig \
-    kwidgetsaddons \
-    kguiaddons \
-"
-
-SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "ee888d41a677ddc6b8c63f0f71e82026"
-SRC_URI[sha256sum] = "7ede8ee868ba480e4666a32b4b26d279b1e45177f83b0ada32a15fa9cee514a3"
-
-FILES_${PN} += " \
-    ${datadir}/kpropertywidgets3 \
-    ${datadir}/kservicetypes5 \
-    ${datadir}/kreport3 \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"

recipes-kde/apps/calligra/kreport_3.1.0.bb

@@ -1,34 +0,0 @@
-SUMMARY = "Framework for creation and generation of reports"
-HOMEPAGE = "https://community.kde.org/KReport"
-LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
-LIC_FILES_CHKSUM = " \
-    file://COPYING.LIB;md5=1634220ce20ef95161c3b8401908638c \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-    file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
-"
-
-inherit kde-apps
-
-DEPENDS += " \
-    kproperty \
-    \
-    kcoreaddons-native \
-    kcoreaddons \
-    kconfig-native \
-    kconfig \
-    kwidgetsaddons \
-    kguiaddons \
-    \
-    marble \
-    qtwebkit \
-"
-
-SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "48216d8f83a48c93bed9acd0081daa92"
-SRC_URI[sha256sum] = "3b6485629b5e4343b7ddf42efb1927310d60b143a22afe79925147d0ddcdf36c"
-
-FILES_${PN} += " \
-    ${datadir}/kservicetypes5 \
-    ${datadir}/kreport3 \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"

recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb

@@ -2,25 +2,19 @@ SUMMARY = "Plugins for Dolphin"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
 
-inherit kde-apps gettext
+inherit kde-apps
 
 DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdesignerplugin-native \
-    kdelibs4support-native \
-    kdelibs4support \
-    sonnet-native \
     kxmlgui \
     ki18n \
     kio \
+    kdelibs4support \
     dolphin \
-"
+" 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "898477ec482c80eeda7784fd57bf1fe4"
-SRC_URI[sha256sum] = "3bea72ffe16aac221e2ffa2f91c910b78912dca557aba4866204aa3ed85c26c9"
+SRC_URI[md5sum] = "b91bdc4a0883bbcecb34bedee59ae142"
+SRC_URI[sha256sum] = "7baa4a65398925032e852e3cc1bb09ab7b4c2232f837cd6d0f71e25236f8e450"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \

recipes-kde/apps/dolphin/dolphin.bb

@@ -5,21 +5,18 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps gettext
+inherit kde-apps cmake-lib
 
 DEPENDS += " \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    sonnet-native \
-    \
+    kdoctools \
     kinit \
     kcmutils \
     knewstuff \
+    kcoreaddons \
     ki18n \
     kdbusaddons \
     kbookmarks \
+    kconfig \
     kio \
     kparts \
     solid \
@@ -36,16 +33,25 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "645ecbd2896ef47ac5ce7a7f1fd3b738"
-SRC_URI[sha256sum] = "5efb4c5dc304a6d179915b6553ad0f5232dc4e6b38a9d4dbd80a72a5351e6fe4"
-SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"
+SRC_URI[md5sum] = "30f452fd08914cd302b37c29143428f9"
+SRC_URI[sha256sum] = "0a2a7a265fb542e1ed461d9111143fdc61559a398e4fa0c47e1e0b822ccf73a5"
+SRC_URI += " \
+    file://0001-align-paths-to-phonon.patch \
+    file://0002-fix-build-for-qtbase-without-session-management.patch \
+"
 
 FILES_SOLIBSDEV = "${libdir}/libdolphin*${SOLIBSDEV}"
 
 FILES_${PN} += " \
-    ${datadir}/config.kcfg \
-    ${datadir}/k*5 \
-    ${datadir}/dbus-1 \
+    ${datadir} \
     ${libdir}/libkdeinit5_dolphin.so \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+"
+
+# cross libs / headers
+CMAKE_ALIGN_SYSROOT[1] = "DolphinVcs, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "DolphinVcs, -S${includedir}, -S${STAGING_INCDIR}"

recipes-kde/apps/dolphin/files/0001-align-paths-to-phonon.patch

@@ -0,0 +1,69 @@
+From ed293f192c85976efdff4d8253a63a9d1a801d11 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 23 Aug 2015 22:59:27 +0200
+Subject: [PATCH 1/2] align paths to phonon
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/panels/information/informationpanelcontent.cpp |  6 +++---
+ src/panels/information/phononwidget.cpp            | 10 +++++-----
+ src/panels/information/phononwidget.h              |  2 +-
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
+index c18d473..97962de 100644
+--- a/src/panels/information/informationpanelcontent.cpp
++++ b/src/panels/information/informationpanelcontent.cpp
+@@ -41,9 +41,9 @@
+ #include <panels/places/placesitem.h>
+ #include <panels/places/placesitemmodel.h>
+ 
+-#include <Phonon/BackendCapabilities>
+-#include <Phonon/MediaObject>
+-#include <Phonon/SeekSlider>
++#include <phonon/BackendCapabilities>
++#include <phonon/MediaObject>
++#include <phonon/SeekSlider>
+ 
+ #include <QEvent>
+ #include <QLabel>
+diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
+index 1d6361f..24f3ffc 100644
+--- a/src/panels/information/phononwidget.cpp
++++ b/src/panels/information/phononwidget.cpp
+@@ -20,11 +20,11 @@
+ 
+ #include "phononwidget.h"
+ 
+-#include <Phonon/AudioOutput>
+-#include <Phonon/Global>
+-#include <Phonon/MediaObject>
+-#include <Phonon/SeekSlider>
+-#include <Phonon/VideoWidget>
++#include <phonon/AudioOutput>
++#include <phonon/Global>
++#include <phonon/MediaObject>
++#include <phonon/SeekSlider>
++#include <phonon/VideoWidget>
+ 
+ #include <QVBoxLayout>
+ #include <QHBoxLayout>
+diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h
+index 837a668..1fb9543 100644
+--- a/src/panels/information/phononwidget.h
++++ b/src/panels/information/phononwidget.h
+@@ -25,7 +25,7 @@
+ #include <QSize>
+ #include <QWidget>
+ 
+-#include <Phonon/Global>
++#include <phonon/Global>
+ 
+ namespace Phonon
+ {
+-- 
+2.1.0
+

recipes-kde/apps/dolphin/files/0002-fix-build-for-qtbase-without-session-management.patch

@@ -21,7 +21,7 @@ index f7a7613..127cd85 100644
      // by the session manager because the session is closed
      bool closedByUser = true;
 +#ifndef QT_NO_SESSIONMANAGER
-     if (qApp->isSavingSession()) {
+     if (qApp->isSessionRestored()) {
          closedByUser = false;
      }
 +#endif

recipes-kde/apps/dragon/dragon.bb

@@ -1,46 +0,0 @@
-SUMMARY = "Simple KDE multimedia player"
-LICENSE = "GPLv2 & GFDL-1.2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-"
-
-inherit kde-apps gettext
-
-DEPENDS += " \
-    phonon \
-    \
-    kauth-native \
-    kconfig-native \
-    kconfigwidgets \
-    kcoreaddons-native \
-    kcrash \
-    kdbusaddons \
-    kdoctools-native \
-    sonnet-native \
-    ki18n \
-    kjobwidgets \
-    kio \
-    kparts \
-    solid \
-    kwidgetsaddons \
-    kwindowsystem \
-    kxmlgui \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "06baf39ea96ece188be9157e12ce9e6c"
-SRC_URI[sha256sum] = "a6f7ae038b3f7f753bec5e99e9b257225f48000cc4b1d5d0ce3bb3d3beb51b08"
-
-CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
-
-FILES_${PN} += " \
-    ${datadir}/k*5 \
-    ${datadir}/solid \
-    ${datadir}/icons \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"
-
-FILES_${PN}-dbg += " \
-    ${OE_QMAKE_PATH_PLUGINS}/.debug \
-"

recipes-kde/apps/filelight/filelight.bb

@@ -5,26 +5,24 @@ LIC_FILES_CHKSUM = " \
     file://COPYING-DOCS;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps gettext
+inherit kde-apps
 
 DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    sonnet-native \
     kio \
     kparts \
     solid \
     kxmlgui \
+    kcoreaddons \
+    kdoctools \
     ki18n \
-"
+" 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "5973b0176f48e80a52ea1eca33ec4bc7"
-SRC_URI[sha256sum] = "69de0bafa3e407cc6c9b52cb942cbb414db526fee7e99154498f7e821fc0a6f3"
+SRC_URI[md5sum] = "19cf21112e411c4adda7cc89c9630240"
+SRC_URI[sha256sum] = "a67164444e7056f1fcdaa4c781f128e0da09e657a0fa621d71e5aa6545e49d60"
 SRC_URI += " \
-    file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
+    file://0001-do-not-build-docs.patch \
+    file://0002-fix-build-for-qtbase-build-without-session-support-Q.patch \
 "
 
 FILES_${PN} += " \

recipes-kde/apps/filelight/files/0001-do-not-build-docs.patch

@@ -0,0 +1,41 @@
+From 517853035c99b29006a7b757651161859c6e9db5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 24 Apr 2015 11:26:38 +0200
+Subject: [PATCH] do not build docs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+docs creation fails with
+
+index.docbook:2: element para: validity error : ID gnu-fdl already defined
+...
+element div: validity error : ID header already defined
+element div: validity error : ID header_content already defined
+element div: validity error : ID header_left already defined
+element div: validity error : ID header_right already defined
+element div: validity error : ID header already defined
+element div: validity error : ID header_content already defined
+...
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 834282f..35e51b6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,5 +60,5 @@ include_directories(src/)
+ 
+ add_subdirectory(src)
+ add_subdirectory(misc)
+-add_subdirectory(doc)
++#add_subdirectory(doc)
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-- 
+1.9.3
+

recipes-kde/apps/filelight/files/0002-fix-build-for-qtbase-build-without-session-support-Q.patch

@@ -9,13 +9,13 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- src/main.cpp | 5 ++++-
+ src/app/main.cpp | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/src/main.cpp b/src/main.cpp
+diff --git a/src/app/main.cpp b/src/app/main.cpp
 index 2463a29..1709717 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
+--- a/src/app/main.cpp
++++ b/src/app/main.cpp
 @@ -78,6 +78,7 @@ int main(int argc, char *argv[])
      options.process(app);
      about.processCommandLine(&options);

recipes-kde/apps/granatier/granatier.bb

@@ -1,34 +0,0 @@
-SUMMARY = "Granatier is a clone of the classic Bomberman game"
-DESCRIPTION = "Granatier is a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"
-LICENSE = "GPLv2 & GFDL-1.2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-"
-
-inherit kde-apps gtk-icon-cache
-
-DEPENDS += " \
-    kauth-native \
-    kcoreaddons-native \
-    kconfig-native \
-    kdoctools-native \
-    kcrash \
-    kdbusaddons  \
-    kwidgetsaddons  \
-    ki18n \
-    kconfigwidgets \
-    kxmlgui \
-    knewstuff \
-    libkdegames \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "fa563c48468f03dcc6be6605402ccc7c"
-SRC_URI[sha256sum] = "5898f962dfde9f124c9967c75581c2e2d8015fecac765f1c3470edb7f97ddf1a"
-
-FILES_${PN} += " \
-    ${datadir}/config.kcfg \
-    ${datadir}/icons \
-    ${datadir}/kxmlgui5 \
-"

recipes-kde/apps/gwenview/files/0001-Set-Kipi-package-properties.patch

@@ -1,30 +0,0 @@
-From 06f07a9b331bec4ff51c2a5174e758b1bffba10c Mon Sep 17 00:00:00 2001
-From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
-Date: Wed, 6 Apr 2016 19:23:55 +0000
-Subject: [PATCH 2/3] Set Kipi package properties
-
-This change make Kipi optional.
-
-Upstream-Status: Pending
-
-Signed-off-by: Luis Gustavo S. Barreto <gustavo@ossystems.com.br>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a18ca16..d855192 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -75,7 +75,7 @@ find_package(KF5Kipi)
- if (KF5Kipi_FOUND)
-    set(KIPI_FOUND true)
- endif()
--# set_package_properties(Kipi PROPERTIES URL"http://www.kipi-plugins.org" DESCRIPTION "Provides various image manipulation and export features" TYPE OPTIONAL)
-+set_package_properties(KF5Kipi PROPERTIES URL "http://www.kipi-plugins.org" DESCRIPTION "Provides various image manipulation and export features" TYPE OPTIONAL)
- 
- find_package(LCMS2)
- set_package_properties(LCMS2 PROPERTIES URL "http://www.littlecms.com" DESCRIPTION "Color management engine" TYPE REQUIRED)
--- 
-2.1.4
-

recipes-kde/apps/gwenview/files/0002-Avoid-try_run.patch

@@ -1,108 +0,0 @@
-From e5170c60d0443d8f50b5bf6a85bea64bea29fbc0 Mon Sep 17 00:00:00 2001
-From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
-Date: Wed, 6 Apr 2016 19:42:07 +0000
-Subject: [PATCH 3/3] Avoid try_run
-
-When cross compiling, the executable compiled in the first step usually
-cannot be run on the build host. For this reason, we use try_compile()
-to determine what version of libjpeg is available.
-
-Upstream-Status: Pending
-
-Signed-off-by: Luis Gustavo S. Barreto <gustavo@ossystems.com.br>
----
- lib/CMakeLists.txt | 71 ++++++++++++++++++++++++++++++++----------------------
- 1 file changed, 42 insertions(+), 29 deletions(-)
-
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index d51b80d..db3ac7b 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -10,42 +10,55 @@ message(STATUS "Looking for libjpeg version in ${JPEG_INCLUDE_DIR}/jpeglib.h")
- # found in (between libjpeg, libjpeg-turbo and various multilib header
- # forwarding schemes seen in distros), have a simple program print out the
- # right version.
--set(JPEGLIB_VERSION_CHECK_PATH "${CMAKE_CURRENT_BINARY_DIR}/jpeglib-version-check.c")
--file(WRITE ${JPEGLIB_VERSION_CHECK_PATH} "
--#include <stdio.h>
--#include <stdlib.h>
--#include <jpeglib.h>
-+function(JPEGVersionCheck Ret Op Version)
-+    set(JPEGLIB_VERSION_CHECK_PATH "${CMAKE_CURRENT_BINARY_DIR}/jpeglib-version-check.c")
-+    file(WRITE ${JPEGLIB_VERSION_CHECK_PATH} "
-+    #include <stddef.h>
-+    #include <stdio.h>
-+    #include <jpeglib.h>
-+    int main()
-+    {
-+    #if (JPEG_LIB_VERSION ${Op} ${Version})
-+    #error JPEG_LIB_VERSION ${Op} ${Version}
-+    #endif
-+    return 0;
-+    }
-+    ")
- 
--int main(void) { printf(\"%d\\\n\", JPEG_LIB_VERSION); }
--")
-+try_compile(COMPILE_RESULT_VAR
-+     "${CMAKE_BINARY_DIR}" "${JPEGLIB_VERSION_CHECK_PATH}"
-+      COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS}"
-+      OUTPUT_VARIABLE COMPILE_OUT)
- 
--try_run(JPEGLIB_RUN_RESULT JPEGLIB_COMPILE_RESULT
--    ${CMAKE_CURRENT_BINARY_DIR} ${JPEGLIB_VERSION_CHECK_PATH}
--    CMAKE_FLAGS -DINCLUDE_DIRECTORIES:PATH=${JPEG_INCLUDE_DIR}
--    RUN_OUTPUT_VARIABLE jpeglib_version)
-+    set(${Ret} ${COMPILE_OUT} PARENT_SCOPE)
-+endfunction()
- 
--if ((${JPEGLIB_COMPILE_RESULT} EQUAL FALSE) OR ("${JPEGLIB_RUN_RESULT}" EQUAL FAILED_TO_RUN) OR "${jpeglib_version}" STREQUAL "")
--    message(FATAL_ERROR "Could not find jpeglib.h. This file comes with libjpeg.")
--endif()
-+find_package(JPEG REQUIRED)
-+if(JPEG_FOUND)
-+    JPEGVersionCheck(JPEG_LIB_VERSION < 80)
-+    if (${JPEG_LIB_VERSION} MATCHES "#error")
-+      set(GV_JPEG_DIR libjpeg-62)
-+    endif()
- 
--if ("${jpeglib_version}" LESS 80)
--    set(GV_JPEG_DIR libjpeg-62)
--endif()
-+    JPEGVersionCheck(JPEG_LIB_VERSION == 80)
-+    if (${JPEG_LIB_VERSION} MATCHES "#error")
-+      set(GV_JPEG_DIR libjpeg-80)
-+    endif()
- 
--if ("${jpeglib_version}" EQUAL 80)
--    set(GV_JPEG_DIR libjpeg-80)
--endif()
-+    JPEGVersionCheck(JPEG_LIB_VERSION == 90)
-+    if (${JPEG_LIB_VERSION} MATCHES "#error")
-+      set(GV_JPEG_DIR libjpeg-90)
-+    endif()
- 
--if ("${jpeglib_version}" EQUAL 90)
--    set(GV_JPEG_DIR libjpeg-90)
--endif()
--
--if ("${GV_JPEG_DIR}" STREQUAL "")
--    message(FATAL_ERROR "Unknown libjpeg version: ${jpeglib_version}")
-+    if ("${GV_JPEG_DIR}" STREQUAL "")
-+        message(FATAL_ERROR "Unknown libjpeg version")
-+    else()
-+        message(STATUS "using ${GV_JPEG_DIR}")
-+    endif()
-+else(JPEG_FOUND)
-+    message(FATAL_ERROR "Could not find jpeglib.h. This file comes with libjpeg.")
- endif()
--
--message(STATUS "libjpeg version: ${jpeglib_version}")
--
-+ 
- add_definitions(-Dlibjpeg_EXPORTS)
- include_directories(
-     ${CMAKE_CURRENT_SOURCE_DIR}/${GV_JPEG_DIR}
--- 
-2.5.5
-

recipes-kde/apps/gwenview/gwenview.bb

@@ -1,48 +0,0 @@
-SUMMARY = "A fast and easy to use image viewer for KDE"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b"
-
-inherit kde-apps gettext
-
-DEPENDS += " \
-    jpeg \
-    exiv2 \
-    lcms \
-    phonon \
-    kdelibs4support \
-    kdelibs4support-native \
-    kded \
-    kactivities \
-    kcoreaddons-native \
-    kconfig-native \
-    kauth-native \
-    kdesignerplugin-native \
-    sonnet-native \
-    kxmlgui \
-    kfilemetadata \
-    baloo \
-    libkdcraw \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "702ea798307dbb07f7216df928c1be78"
-SRC_URI[sha256sum] = "d4b22bd4a3935c84e9aaa7eb8437ee43df12efe07200ff3b1f554020ef5169db"
-
-SRC_URI += " \
-    file://0001-Set-Kipi-package-properties.patch  \
-    file://0002-Avoid-try_run.patch \
-"
-
-CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
-
-FILES_${PN} += " \
-    ${datadir}/k*5 \
-    ${datadir}/icons \
-    ${datadir}/solid \
-    ${datadir}/kconf_update \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"
-
-FILES_${PN}-dbg += " \
-    ${OE_QMAKE_PATH_PLUGINS}/.debug \
-"

recipes-kde/apps/kalzium/kalzium.bb

@@ -1,40 +0,0 @@
-SUMMARY = "Periodic Table of Elements"
-LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-    file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
-"
-
-inherit kde-apps pythonnative gettext pkgconfig gtk-icon-cache
-
-DEPENDS += " \
-    qtsvg \
-    libeigen \
-    openbabel \
-    avogadrolibs \
-    \
-    karchive \
-    kconfig \
-    kcoreaddons \
-    kdoctools \
-    ki18n \
-    kdelibs4support \
-    khtml \
-    knewstuff \
-    kparts \
-    kplotting \
-    solid \
-    kunitconversion \
-    kwidgetsaddons \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "72bde526067b7f54ba7d13a69cac5fc7"
-SRC_URI[sha256sum] = "50050c85fb1760a99b7bbd0ed0f1047b4456139eb8d3f012005f6106e16a880e"
-
-FILES_${PN} += " \
-    ${datadir}/config.kcfg \
-    ${datadir}/kxmlgui5 \
-    ${datadir}/libkdeedu \
-"

recipes-kde/apps/kapman/kapman.bb

@@ -8,13 +8,11 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps gettext
+inherit kde-apps
 
 DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
+    kcoreaddons \
+    kconfig \
     kwindowsystem \
     ki18n \
     kconfigwidgets \
@@ -26,10 +24,11 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "d14c511fd51e6dee50d6cc110bdf2e51"
-SRC_URI[sha256sum] = "7004a0ab08e017fc02425c0c1ac72c4c8506a2e2ef3b53969a2d4ef691edd00d"
+SRC_URI[md5sum] = "fc9a511409d12da3273ca040a9802ac3"
+SRC_URI[sha256sum] = "340d5f206705f955990f1d5742ac37adb2874e6ee6529df6f8e4ade3aefeedd4"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
+    ${datadir}/appdata \
 "

recipes-kde/apps/kate/kate.bb

@@ -6,17 +6,13 @@ LIC_FILES_CHKSUM = " \
     file://COPYING-LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
-inherit kde-apps gettext
+inherit kde-apps
 
 DEPENDS += " \
     qtscript \
     \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    sonnet-native \
-    kdoctools-native \
-    kpackage-native \
+    kconfig \
+    kdoctools \
     kguiaddons \
     ki18n \
     kinit \
@@ -34,8 +30,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "4a825ea7da1e8102031d82f99576399e"
-SRC_URI[sha256sum] = "c7fc7ebab1c9ce8933bcf6bf6fc265e20b3a858a21d379ae7259b34f5dbe2cd2"
+SRC_URI[md5sum] = "80a3a02c3ab25f614e523b881e5483b8"
+SRC_URI[sha256sum] = "ae979ac3b5c18ddb2a9701e59cf0e70b9e366c1fa08325bb771a95de3a12526f"
 
 SRC_URI += " \
     file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
@@ -50,6 +46,7 @@ FILES_${PN} += " \
     ${datadir}/plasma \
     ${datadir}/katexmltools \
     ${datadir}/icons \
+    ${datadir}/appdata \
     \
     ${libdir}/libkdeinit5*.so \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/katomic/files/0001-fix-build-for-qtbase-build-without-session-support-Q.patch

@@ -13,23 +13,23 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/main.cpp b/main.cpp
-index ec62c67..fd0c921 100644
+index 826f6f8..a0e66e6 100644
 --- a/main.cpp
 +++ b/main.cpp
-@@ -89,9 +89,12 @@ int main(int argc, char **argv)
-     }
-     else
-     {
+@@ -86,9 +86,12 @@ int main(int argc, char **argv)
+   }
+   else
+   {
 +#ifndef QT_NO_SESSIONMANAGER
-         if ( app.isSessionRestored() )
-             RESTORE(AtomTopLevel)
--        else {
-+        else
+       if ( app.isSessionRestored() )
+           RESTORE(AtomTopLevel)
+-      else {
++      else
 +#endif
-+        {
-             AtomTopLevel *top = new AtomTopLevel;
-             if ( parser.isSet( QStringLiteral("hackmode") ) )
-                 top->enableHackMode();
++      {
+           AtomTopLevel *top = new AtomTopLevel;
+           if ( parser.isSet( "hackmode" ) )
+               top->enableHackMode();
 -- 
-2.5.5
+1.9.3
 

recipes-kde/apps/katomic/katomic.bb

@@ -6,13 +6,11 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps gtk-icon-cache
+inherit kde-apps
 
 DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
+    kcoreaddons \
+    kconfig \
     kwidgetsaddons \
     ki18n \
     kguiaddons \
@@ -27,12 +25,10 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "afebac9c1ac7e77aa281ef72ef44919b"
-SRC_URI[sha256sum] = "9ad461b3470eab3c5d8c59af41ecbccf042265ae628de850a094ab8c5f8ea91d"
+SRC_URI[md5sum] = "3af891e3527a254a901fa1ca88412f63"
+SRC_URI[sha256sum] = "1a85acea5ce335cb111bf34f1f4f281e08e737698795eaf3f05a148c9721fa69"
 SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
 
 FILES_${PN} += " \
-    ${datadir}/kxmlgui5 \
-    ${datadir}/kconf_update \
-    ${datadir}/icons \
+    ${datadir} \
 "

recipes-kde/apps/kblocks/kblocks.bb

@@ -1,32 +0,0 @@
-SUMMARY = "KBlocks - Falling Blocks Game"
-LICENSE = "GPLv2 & GFDL-1.2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-"
-
-inherit kde-apps gtk-icon-cache
-
-DEPENDS += " \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    kcrash \
-    kdbusaddons  \
-    kwidgetsaddons  \
-    ki18n \
-    kconfigwidgets \
-    kxmlgui \
-    libkdegames \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "0a9e9609035e68add688d47e3d4e66ed"
-SRC_URI[sha256sum] = "41451d1e296b83cd82591e84b0a81917187e258f20eab6e44a08b435aefbddde"
-
-FILES_${PN} += " \
-    ${datadir}/config.kcfg \
-    ${datadir}/icons \
-    ${datadir}/kxmlgui5 \
-"

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

@@ -14,23 +14,23 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/main.cpp b/main.cpp
-index 311268d..e0257f1 100644
+index 0a02928..9614c70 100644
 --- a/main.cpp
 +++ b/main.cpp
-@@ -84,9 +84,12 @@ int main(int argc, char **argv)
+@@ -78,9 +78,12 @@ int main(int argc, char **argv)
  
-     KDBusService service;
+   KDBusService service;
  
 +#ifndef QT_NO_SESSIONMANAGER
-     if (app.isSessionRestored())
-         RESTORE(KBounceMainWindow)
--    else {
-+    else
+   if (app.isSessionRestored())
+       RESTORE(KBounceMainWindow)
+-  else {
++  else
 +#endif
-+    {
-         KBounceMainWindow *w = new KBounceMainWindow;
-         w->show();
-     }
++  {
+       KBounceMainWindow *w = new KBounceMainWindow;
+       w->show();
+   }
 -- 
-2.5.5
+2.1.0
 

recipes-kde/apps/kbounce/kbounce.bb

@@ -7,13 +7,11 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps gettext
+inherit kde-apps
 
 DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
+    kcoreaddons \
+    kconfig \
     kdbusaddons  \
     ki18n \
     kguiaddons \
@@ -28,8 +26,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "93c0a879432f8fa4f35685b2d09e628d"
-SRC_URI[sha256sum] = "d5febbc2d1410e8cc7155410e1429bb5aa13a01fc0aadb6a9a82a61b71a70774"
+SRC_URI[md5sum] = "87eb036391a6cd78e1ea1a70f995cac3"
+SRC_URI[sha256sum] = "47904cc34aeff65b1340a5371b3e81ccc7959b6d0bb66d6a0ed298948f94ed49"
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 FILES_${PN} += " \

recipes-kde/apps/kcalc/kcalc.bb

@@ -1,36 +0,0 @@
-SUMMARY = "KDE's calculator application"
-LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-"
-
-inherit kde-apps gettext
-
-DEPENDS += "\
-    gmp \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    kconfigwidgets \
-    kguiaddons \
-    ki18n \
-    kinit \
-    knotifications \
-    kxmlgui \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "d2aca9d304748cb5c1434f146446db1d"
-SRC_URI[sha256sum] = "66494c778cad6a422136cca755f04f79bf31854bdcd4d940347ed2c47c5b6d11"
-
-FILES_SOLIBSDEV = ""
-
-FILES_${PN} += " \
-    ${datadir}/config.kcfg \
-    ${datadir}/kxmlgui5 \
-    ${datadir}/kconf_update \
-    ${libdir}/libkdeinit5_kcalc.so \
-"
-

recipes-kde/apps/kcolorchooser/kcolorchooser.bb

@@ -1,24 +0,0 @@
-SUMMARY = "A very small utility to select a color"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=838c366f69b72c5df05c96dff79b35f2 \
-"
-
-inherit kde-apps gtk-icon-cache
-
-DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    ki18n \
-    kwidgetsaddons \
-    kxmlgui \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "7876e108b9fb2ff0deea2a18f33bd1f2"
-SRC_URI[sha256sum] = "741cf9f7a6e59bcf2118f9eb69db7f35384d8153f886b9f2721ed46b99e9b4eb"
-
-FILES_${PN} += " \
-    ${datadir}/icons \
-"

recipes-kde/apps/kdenlive/files/0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch

@@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d33b65e..2c1c376 100644
+index b5a646d..7018636 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -108,7 +108,7 @@ set_package_properties(MLT PROPERTIES
+@@ -82,7 +82,7 @@ set_package_properties(MLT PROPERTIES
                  TYPE RUNTIME
                  PURPOSE "Required to do video processing")
  
 -set(MLT_PREFIX ${MLT_ROOT_DIR})
-+set(MLT_PREFIX ${MLT_ROOT_DIR} CACHE STRING "mlt prefix")
++SET(MLT_PREFIX "/usr" CACHE STRING "mlt prefix")
  
  add_subdirectory(data)
- if(KF5DocTools_FOUND)
+ add_subdirectory(doc)
 -- 
-2.14.3
+2.1.0
 

recipes-kde/apps/kdenlive/kdenlive.bb

@@ -9,16 +9,12 @@ inherit kde-apps gtk-icon-cache
 DEPENDS += "\
     mlt \
     qtsvg \
-    qtwebkit \
     karchive \
-    kauth-native \
-    sonnet-native \
     kbookmarks \
-    kcoreaddons-native \
-    kconfig-native \
+    kcoreaddons \
+    kconfig \
     kconfigwidgets \
     kdbusaddons \
-    kfilemetadata \
     kio \
     kwidgetsaddons \
     kplotting \
@@ -29,20 +25,16 @@ DEPENDS += "\
     kguiaddons \
     ktextwidgets \
     kiconthemes \
-    kdoctools-native \
-    xapian-core \
-    purpose \
-    shared-mime-info-native \
+    kdoctools \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "4cda25856cd790a5e9c1face9f2be7c5"
-SRC_URI[sha256sum] = "43247d070e6898c26271235b915b45422ee8668e512f38f6df711e5571dca019"
+SRC_URI[md5sum] = "62fc024bc9616756b5ad6444308e636f"
+SRC_URI[sha256sum] = "5a6f4ae4bd07c64b90a3ebe88775b457c9c1d8b3a23820203d86df114183fbf8"
 
 SRC_URI += " \
     file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \
 "
-
 EXTRA_OECMAKE += "-DMLT_PREFIX=${prefix}"
 
 FILES_${PN} += " \
@@ -51,11 +43,10 @@ FILES_${PN} += " \
     ${datadir}/mime \
     ${datadir}/menu \
     ${datadir}/icons \
+    ${datadir}/appdata \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_PLUGINS}/.debug \
 "
-
-RRECOMMENDS_${PN} += "ffmpeg"

recipes-kde/apps/kdf/kdf.bb

@@ -1,32 +0,0 @@
-SUMMARY = "KDiskFree displays the file devices' information"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-"
-
-inherit kde-apps gtk-icon-cache
-
-DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kconfigwidgets \
-    kcoreaddons-native \
-    kdoctools-native \
-    ki18n \
-    kiconthemes \
-    kio \
-    kcmutils \
-    knotifications \
-    kwidgetsaddons \
-    kxmlgui \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "9f4d7830df288b41f61d26438c4a891e"
-SRC_URI[sha256sum] = "0fe329bde6014d4d536e91c211933c57f8e4b1111eeacc8a64ce8cb424369bba"
-
-FILES_${PN} += " \
-    ${datadir}/k*5 \
-    ${datadir}/icons \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"

recipes-kde/apps/kdiamond/kdiamond.bb

@@ -6,14 +6,13 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps gettext
+inherit kde-apps
 
 DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
+    kcoreaddons \
+    kconfig \
     kdbusaddons \
-    kdoctools-native \
+    kdoctools \
     kwidgetsaddons \
     ki18n \
     kguiaddons \
@@ -26,8 +25,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "d04bdd512bc79fed8ca308e3d3f68d51"
-SRC_URI[sha256sum] = "f873786448548bf7ffd084b977a03fcfed4424ceb4a4ef1c9e9be9249d888591"
+SRC_URI[md5sum] = "7c94647e942d75ff1b10bf83cdc6973d"
+SRC_URI[sha256sum] = "e504c5b15e55f80afcc3da7ea4cec1efb5a56b906d8badf0db39382604d38713"
 SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 FILES_${PN} += " \

recipes-kde/apps/khelpcenter/khelpcenter.bb

@@ -1,47 +0,0 @@
-SUMMARY = "Application to show KDE Applications' documentation"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=7108e5acd7ce861dee282297d7c2f38c \
-"
-
-inherit kde-apps gettext
-
-DEPENDS += " \
-    grantlee \
-    xapian-core \
-    \
-    kauth-native \
-    karchive \
-    kbookmarks \
-    kconfig-native \
-    kcoreaddons-native \
-    kdbusaddons \
-    kdoctools-native \
-    ki18n \
-    kinit \
-    khtml \
-    kservice \
-    kwindowsystem \
-    sonnet-native \
-    \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "7a9b73167ce946a011673f8f60c6ec20"
-SRC_URI[sha256sum] = "5e251e62c52260424c023989eb51eb4f2e805722b5536f881925151e74487cfa"
-
-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 \
-"

recipes-kde/apps/kio-extras/kio-extras.bb

@@ -9,34 +9,27 @@ LIC_FILES_CHKSUM = " \
     file://man/LICENSE;md5=d975629b732b61cb58f9595c6baa9379 \
 "
 
-inherit kde-apps gettext
+inherit kde-apps
 
 DEPENDS += " \
-    libssh \
     qtsvg \
-    qtwebengine \
     \
-    exiv2 \
-    kactivities \
     karchive \
-    kauth-native \
-    kconfig-native \
+    kconfig \
     kconfigwidgets \
-    kcoreaddons-native \
+    kcoreaddons \
     kdbusaddons \
-    kdoctools-native \
-    kdesignerplugin-native \
-    sonnet-native \
+    kdoctools \
     kdnssd \
     kiconthemes \
     ki18n \
     kio \
     khtml \
+    kdelibs4support \
     kpty \
     solid \
     kbookmarks \
     kguiaddons \
-    shared-mime-info-native \
 "
 
 # REVISIT optionals
@@ -49,13 +42,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "39eb2427a4af8b12457a8214590406f0"
-SRC_URI[sha256sum] = "764cb0e970da6df0e775d8eb793930005e893e8a2093fdb4a54ef36fc4ffaacc"
-
-# gperf creates hard #line links
-do_install_prepend() {
-    no_staging_check=true
-}
+SRC_URI[md5sum] = "819bf5ec77953460993529076e0b9023"
+SRC_URI[sha256sum] = "e7409ae4b788d0484f8d026580ae821487993d791a48bd14f435b447e93fc950"
 
 FILES_${PN} += " \
     ${datadir}/kio_bookmarks \

recipes-kde/apps/kmag/kmag.bb

@@ -1,28 +0,0 @@
-SUMMARY = "KMag is a screen magnifier"
-LICENSE = "GPLv2 & GFDL-1.2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=38adfe5a9f2953129da1774430b28adf \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-"
-
-inherit kde-apps gtk-icon-cache
-
-DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    kdoctools \
-    ki18n \
-    kio \
-    kxmlgui \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "dd41241a1b421f967b1314c383a1a012"
-SRC_URI[sha256sum] = "ee4c754245f8c8e9c429a3551f65c715cbb234bdaf5ae5c53299f1772933d102"
-
-FILES_${PN} += " \
-    ${datadir}/kxmlgui5 \
-    ${datadir}/icons \
-"

recipes-kde/apps/kmahjongg/kmahjongg.bb

@@ -1,33 +0,0 @@
-SUMMARY = "KBlocks - Falling Blocks Game"
-LICENSE = "GPLv2 & GFDL-1.2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-"
-
-inherit kde-apps gtk-icon-cache
-
-DEPENDS += " \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    kpackage-native \
-    kcrash \
-    kdbusaddons \
-    kdeclarative \
-    knewstuff \
-    kxmlgui \
-    libkmahjongg \
-    libkdegames \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "bd68f0c992a83443d2e8a7553a13b4b7"
-SRC_URI[sha256sum] = "2bf392334c9c9a2fd07326a562b65fd03f526899ab72eef53adb8bd925ead451"
-
-FILES_${PN} += " \
-    ${datadir}/config.kcfg \
-    ${datadir}/icons \
-    ${datadir}/kxmlgui5 \
-"

recipes-kde/apps/kmines/kmines.bb

@@ -1,32 +0,0 @@
-SUMMARY = "KMines is the classic Minesweeper game"
-LICENSE = "GPLv2 & GFDL-1.2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-"
-
-inherit kde-apps gtk-icon-cache
-
-DEPENDS += " \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    kconfigwidgets \
-    kcrash \
-    kdbusaddons  \
-    ki18n \
-    ktextwidgets \
-    kwidgetsaddons  \
-    kxmlgui \
-    libkdegames \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "5ea8467d386e1137405cbebdd984d74e"
-SRC_URI[sha256sum] = "d6a312be8e3d0c13bc5b14d33f2177b54c9f22cfdfbbd7ea4e6e82cb688b0e7c"
-
-FILES_${PN} += " \
-    ${datadir}/icons \
-    ${datadir}/knotifications5 \
-"

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

@@ -1,44 +0,0 @@
-From 9757ed6c44884eb7890f31e015f5788de88891ac Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 21 Dec 2017 00:22:43 +0100
-Subject: [PATCH] Fix build with QT_NO_SESSIONMANAGER set
-
----
- apps/KMixApp.cpp | 4 ++++
- apps/kmix.cpp    | 2 ++
- 2 files changed, 6 insertions(+)
-
-diff --git a/apps/KMixApp.cpp b/apps/KMixApp.cpp
-index d00309b..b00f27a 100644
---- a/apps/KMixApp.cpp
-+++ b/apps/KMixApp.cpp
-@@ -87,7 +87,11 @@ bool KMixApp::restoreSessionIfApplicable(bool hasArgKeepvisibility, bool reset)
- 	 */
- 	creationLock.lock();
- 
-+#ifndef QT_NO_SESSIONMANAGER
- 	bool restore = qApp->isSessionRestored(); // && KMainWindow::canBeRestored(0);
-+#else
-+	bool restore = false;
-+#endif
- 	qCDebug(KMIX_LOG) << "Starting KMix using keepvisibility=" << hasArgKeepvisibility << ", failsafe=" << reset << ", sessionRestore=" << restore;
- 	int createCount = 0;
- 	if (restore)
-diff --git a/apps/kmix.cpp b/apps/kmix.cpp
-index b97852c..cd74d03 100644
---- a/apps/kmix.cpp
-+++ b/apps/kmix.cpp
-@@ -99,8 +99,10 @@ KMixWindow::KMixWindow(bool invisible, bool reset) :
- 		recreateGUI(false, QString(), true, reset);
- 	}
- 
-+#ifndef QT_NO_SESSIONMANAGER
- 	if (!qApp->isSessionRestored() ) // done by the session manager otherwise
- 		setInitialSize();
-+#endif
- 
- 	fixConfigAfterRead();
- 	theKMixDeviceManager->initHotplug();
--- 
-2.9.5
-

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

@@ -6,22 +6,15 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
 "
 
-inherit kde-apps gettext
+inherit kde-apps
 
 DEPENDS += " \
     alsa-lib \
     libcanberra \
     \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
     kconfigwidgets \
-    kpackage-native \
-    kdesignerplugin-native \
-    sonnet-native \
     kdbusaddons \
     kdelibs4support \
-    kdelibs4support-native \
     kglobalaccel \
     ki18n \
     kiconthemes \
@@ -33,10 +26,10 @@ PACKAGECONFIG = "pulseaudio"
 PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "cc77bb8af8cfdec36a3666296ec1c9b7"
-SRC_URI[sha256sum] = "f075a162cc8b0d7f06cea2727159a75f76480ac8d8769250e3d2085d6f2b9420"
+SRC_URI[md5sum] = "f9d015862b40c9bb28307233ee012bd8"
+SRC_URI[sha256sum] = "e0e3ca3dac5605faaf7b447288675f557e1fd4205574885e2c1bfb205f37da31"
 
-SRC_URI += "file://0001-Fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
+SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 EXTRA_OECMAKE += "-DKMIX_KF5_BUILD=1"
 
@@ -54,5 +47,6 @@ FILES_${PN} += " \
 
 FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_PLUGINS}/.debug \
-    ${OE_QMAKE_PATH_PLUGINS}/plasma/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/plasma/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/plasma/dataengine/.debug \
 "

recipes-kde/apps/kolourpaint/kolourpaint.bb

@@ -1,39 +0,0 @@
-SUMMARY = "KolourPaint - Paint Program"
-LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2 & MIT"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=7549f6da638b0246572ed9cf4275b860 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-    file://COPYING.LIB;md5=3214f080875748938ba060314b4f727d \
-"
-
-inherit kde-apps gtk-icon-cache
-
-DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kdesignerplugin-native \
-    sonnet-native \
-    kdelibs4support \
-    kdelibs4support-native \
-    kconfigwidgets \
-    kcoreaddons-native \
-    kdoctools \
-    ki18n \
-    kiconthemes \
-    kio \
-    kcmutils \
-    knotifications \
-    kwidgetsaddons \
-    kxmlgui \
-    libkexiv2 \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "288c52f48ed3ae35d9e245d1b43a7aa3"
-SRC_URI[sha256sum] = "f1e2e5d0bb1086037517c691c6bfb1159c7dd9ef86eccadba29485a810eb085c"
-
-FILES_${PN} += " \
-    ${datadir}/k*5 \
-    ${datadir}/icons \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"

recipes-kde/apps/konsole/files/0001-fix-build-for-qtbase-build-without-session-support-Q.patch

@@ -0,0 +1,53 @@
+From 1cf0d1c36834d7c326c8fd1c51f9f075f0785fcf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 5 May 2015 15:19:52 +0200
+Subject: [PATCH] fix build for qtbase build without session support
+ QT_NO_SESSIONMANAGER
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/Application.cpp | 7 ++++++-
+ src/main.cpp        | 2 ++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/Application.cpp b/src/Application.cpp
+index 0857eaf..6abaa84 100644
+--- a/src/Application.cpp
++++ b/src/Application.cpp
+@@ -100,7 +100,12 @@ int Application::newInstance()
+     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+ 
+     // handle session management
+-    if ((args->count() != 0) || !firstInstance || !isSessionRestored()) {
++    if ((args->count() != 0) || !firstInstance
++#ifndef QT_NO_SESSIONMANAGER
++		|| !isSessionRestored()) {
++#else
++		) {
++#endif
+         // check for arguments to print help or other information to the
+         // terminal, quit if such an argument was found
+         if (processHelpArgs(args))
+diff --git a/src/main.cpp b/src/main.cpp
+index b6ba2dc..90bdbe1 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -288,10 +288,12 @@ void fillAboutData(K4AboutData& aboutData)
+ 
+ void restoreSession(Application& app)
+ {
++#ifndef QT_NO_SESSIONMANAGER
+     if (app.isSessionRestored()) {
+         int n = 1;
+         while (KMainWindow::canBeRestored(n))
+             app.newMainWindow()->restore(n++);
+     }
++#endif
+ }
+ 
+-- 
+1.9.3
+

recipes-kde/apps/konsole/konsole.bb

@@ -7,23 +7,20 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.Unicode;md5=ca09fbc4ba99ecc01ce41d513908dcd3 \
 "
 
-inherit kde-apps gettext
+inherit kde-apps
 
 DEPENDS += " \
-    kauth-native \
     kbookmarks \
     kcompletion \
     kconfig \
-    kconfig-native \
     kconfigwidgets \
     kcoreaddons \
-    kcoreaddons-native \
     kdoctools \
-    kdoctools-native \
     kguiaddons \
     ki18n \
     kiconthemes \
     kinit \
+    kdelibs4support \
     kio \
     knotifications \
     knotifyconfig \
@@ -34,22 +31,25 @@ DEPENDS += " \
     kwidgetsaddons \
     kwindowsystem \
     kxmlgui \
-    sonnet-native \
-    knewstuff \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
 "
 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "5273faf4b6fb3ecce8df30620cf84b2c"
-SRC_URI[sha256sum] = "e778feebc01850e3965f5b2e173011c1b0205ea6d3d98e0045b17f74fc4c21dc"
+SRC_URI[md5sum] = "4051b1535fb79632951f6dfbc3c2de6a"
+SRC_URI[sha256sum] = "90eb9c6635f067ab7236be472a5051366b18a0b9533e910a2a25957a47864bd5"
+SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
 
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
-    ${datadir}/khotkeys \
+    ${datadir}/appdata \
     ${OE_QMAKE_PATH_PLUGINS} \
     ${libdir}/libkdeinit5_konsole.so \
 "
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+"

recipes-kde/apps/kpat/kpat.bb

@@ -1,41 +0,0 @@
-SUMMARY = "KPat offers a selection of solitaire card games"
-LICENSE = "GPLv2 & GFDL-1.2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=dcd3ae65d2d4ac9f347f0614d3fd4794 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-"
-
-inherit kde-apps gtk-icon-cache mime
-
-DEPENDS += " \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    kcompletion \
-    kconfigwidgets \
-    kcrash \
-    kdbusaddons  \
-    kguiaddons  \
-    ki18n \
-    kio \
-    knewstuff \
-    kwidgetsaddons  \
-    kxmlgui \
-    libkdegames \
-    freecell-solver \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "89d1f7917d73e21363ad05c12a22919a"
-SRC_URI[sha256sum] = "b4ba00d0d90ccb60a8b9328d22f0ce31413abe8a4ead775d712b8a5b2355a936"
-
-FILES_SOLIBSDEV = ""
-
-FILES_${PN} += " \
-    ${datadir}/config.kcfg \
-    ${datadir}/icons \
-    ${datadir}/mime \
-    ${datadir}/kxmlgui5 \
-    ${libdir}/libkcardgame.so \
-"

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

@@ -1,36 +0,0 @@
-From 14dad713bde33b66476e80dc8a13edd010925800 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Wed, 27 Sep 2017 20:39:15 +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 <schnitzeltony@googlemail.com>
----
- main.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/main.cpp b/main.cpp
-index 5cff693..f72afc9 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -73,9 +73,12 @@ int main(int argc, char **argv)
-     aboutData.processCommandLine(&parser);
- 
-     KDBusService service;
-+#ifndef QT_NO_SESSIONMANAGER
-     if (application.isSessionRestored()) {
-         RESTORE(KReversiMainWindow)
--    } else {
-+    } else
-+#endif
-+    {
-         KReversiMainWindow *mainWin = new KReversiMainWindow(0, parser.isSet(QStringLiteral("demo")));
-         mainWin->show();
-     }
--- 
-2.9.5
-

recipes-kde/apps/kreversi/kreversi.bb

@@ -1,40 +0,0 @@
-SUMMARY = "KReversi is is a simple strategy game played against the computer"
-DESCRIPTION = "KReversi is is a simple one player strategy game played against the computer"
-LICENSE = "GPLv2 & GFDL-1.2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-"
-
-inherit kde-apps gettext
-
-DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kpackage-native \
-    kdoctools-native \
-    kconfig \
-    kconfigwidgets \
-    kcoreaddons \
-    kcrash \
-    kdbusaddons \
-    kdeclarative \
-    ki18n \
-    kiconthemes \
-    kio \
-    kxmlgui \
-    kwidgetsaddons \
-    kdoctools \
-    libkdegames \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "80cc1a875d5b2aadf53a4c493353e311"
-SRC_URI[sha256sum] = "153fb85f036496e1e17f48e5230bda3be43a21f802a6df98f96091b1ba7218a3"
-SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
-
-FILES_${PN} += " \
-    ${datadir}/k*5 \
-    ${datadir}/icons \
-"

recipes-kde/apps/krita/krita_4.1.0.bb

@@ -1,62 +0,0 @@
-SUMMARY = "Krita is a free digital painting application"
-LICENSE = "GPLv3 & BSD"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-    file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
-"
-
-inherit kde-apps python3native gtk-icon-cache
-
-DEPENDS += " \
-    qtmultimedia \
-    curl \
-    poppler \
-    boost \
-    libraw \
-    libeigen \
-    exiv2 \
-    fftw \
-    \
-    kauth-native \
-    karchive \
-    kconfig-native \
-    kwidgetsaddons \
-    kcompletion \
-    kcoreaddons-native \
-    kguiaddons \
-    ki18n \
-    kitemmodels \
-    kitemviews \
-    kwindowsystem \
-    kio \
-    kcrash \
-"
-
-SRC_URI = " \
-    ${KDE_MIRROR}/stable/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "ec8933f055944598fd05a331929d8776"
-SRC_URI[sha256sum] = "78792df8165b986b806dcf9960a2679f683f2263e06f3ad5a24b0f78d8f27ed5"
-
-OECMAKE_GENERATOR="Unix Makefiles"
-
-# krita has lots of include_directories(SYSTEM ${FOO_DIR})
-# have no better way to make gcc6 happy
-do_configure_append() {
-     for makefile in `find ${B} -name *.make` ; do
-         sed -i 's:-isystem:-I:g' $makefile
-     done
-}
-
-# HACK - but overidable by BSP
-LDFLAGSGL = "-lGLESv2"
-LDFLAGS += "${LDFLAGSGL}"
-
-FILES_${PN} += " \
-    ${datadir}/color \
-    ${datadir}/color-schemes \
-    ${datadir}/icons \
-    ${datadir}/kritaplugins \
-    ${libdir}/kritaplugins \
-    ${OE_QMAKE_PATH_QML}/org/krita \
-"