sddm-autologin.pam: remove pam_permit.so

Not the best idea to just trust what people send...

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

classes/cmake_auto_align_paths.bbclass

@@ -1,19 +1,14 @@
-# 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
-}
+CMAKE_ALIGN_FILES_FIND ??= "*Targets.cmake"
 
 do_configure_append() {
     # remove absolute paths from exported cmake files
-    for f in `find ${B}/CMakeFiles/Export -name '*.cmake'` ${CMAKE_ADD_ALIGN_FILES} ; do
+    for f in `find ${B} -name '${CMAKE_ALIGN_FILES_FIND}'` ${CMAKE_ADD_ALIGN_FILES} ; 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,3 +1,5 @@
+inherit cmake_sysroot
+
 # do_install_append_class-cross does not work so hack
 do_install_prepend_class-native() {
     no_staging_check=true
@@ -34,6 +36,7 @@ do_install_append() {
                 bbwarn "$f contains links to build host sysroot!"
                 error=true
             fi
+
         done
 
         if [ x != x$error ] ; then
@@ -41,3 +44,32 @@ 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,7 @@
 #   CMAKE_ALIGN_SYSROOT[<unique-id>] = "ignore"
 #
 
-
-# filename for the file containg full names of all cmakefiles staged
-CMAKEINSTALLED = "${WORKDIR}/staged_cmake_files"
+inherit cmake_sysroot
 
 # global helper to get CMAKE_ALIGN_SYSROOT array
 def get_align_flags(d):
@@ -89,25 +87,10 @@ 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. 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
-}
+# 2. 3. in cmake_sysroot
 
 # 4. Handle CMAKE_ALIGN_SYSROOT
 python do_populate_sysroot_append() {

classes/cmake_sysroot.bbclass

@@ -0,0 +1,22 @@
+# 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

@@ -2,7 +2,7 @@ SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
 
 DEPENDS += "qtbase qtdeclarative qtquickcontrols extra-cmake-modules-native"
 
-inherit cmake_qt5 cmake-extra-sanity pkgconfig
+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 = "16.04.3"
+KDE_APP_VERSION = "16.12.1"
 
 SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"
 

classes/kde-base.bbclass

@@ -17,7 +17,7 @@ ${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 cmake-extra-sanity pythonnative
+inherit cmake_qt5 cmake_extra_sanity pythonnative
 
 do_compile_prepend() {
     export XDG_DATA_HOME=${STAGING_DATADIR}

classes/kde-kf5-porting-aids.bbclass

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

classes/kde-kf5.bbclass

@@ -1,5 +1,5 @@
 inherit kde-base
 
-KF5_VERSION = "5.25.0"
+KF5_VERSION = "5.30.0"
 
-SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.25/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/Attic/frameworks/5.30/${BPN}-${PV}.tar.xz"

classes/kde-plasma.bbclass

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

classes/lxqt.bbclass

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

classes/qt5-translation.bbclass

@@ -1,5 +1,7 @@
 # translations -> locale packages
 
+DEPENDS += "qttools-native"
+
 # default location
 QT_TRANSLATION_FILES ??= "${datadir}/*/translations/*.qm ${datadir}/*/translations/*/*.qm ${datadir}/*/translations/*/*/*.qm"
 

conf/layer.conf

@@ -8,6 +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 = "7"
+BBFILE_PRIORITY_meta-qt5-extra = "20"
 
 LAYERDEPENDS_meta-qt5-extra = "core qt5-layer openembedded-layer networking-layer"

extends-meta-qt5/qtbase_git.bbappend

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

extends-meta-qt5/qttools_git.bbappend

@@ -1,9 +1,9 @@
-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://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \
 "

recipes-greenisland/greenisland/greenisland.bb

@@ -1,6 +1,6 @@
 require greenisland.inc
 
-inherit cmake-lib cmake-auto-align-paths
+inherit cmake_lib cmake_auto_align_paths
 
 DEPENDS += " \
     ${BPN}-native \
@@ -11,10 +11,9 @@ DEPENDS += " \
     virtual/egl \
     libinput \
 "
-SRC_URI = " \
-    git://github.com/greenisland/${BPN}.git;protocol=git;branch=master \
+SRC_URI += " \
     file://0001-find-native-greenisland-wayland-scanner.patch \
-    file://0002-RaspberryPi-Don-t-suggest-closed-source-gles-driver-.patch \
+    file://0002-compositorlauncher-work-corrrectly-with-RaspberryPi-.patch \
 "
 
 # we don't have wayland-protocols yet - revisit
@@ -31,11 +30,12 @@ do_compile_append() {
 PACKAGECONFIG ??= " \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xwayland", "",d)} \
 "
-PACKAGECONFIG[xwayland] = "-DENABLE_XWAYLAND=ON,-DENABLE_XWAYLAND=OFF,libxcb"
+PACKAGECONFIG[xwayland] = "-DENABLE_XWAYLAND=ON,-DENABLE_XWAYLAND=OFF,libxcb,xserver-xorg-xwayland"
 
 # 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}"
+CMAKE_ALIGN_SYSROOT[2] = "GreenIsland, -S;${base_libdir}/lib, -S;${STAGING_BASELIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[3] = "GreenIsland, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-greenisland/greenisland/greenisland.inc

@@ -9,11 +9,14 @@ LIC_FILES_CHKSUM = " \
 
 inherit hawaii pythonnative pkgconfig
 
+DEPENDS += " \
+    extra-cmake-modules-native \
+"
 SRC_URI = " \
-    git://github.com/greenisland/${BPN}.git;protocol=git;branch=master \
+    git://github.com/greenisland/${BPN}.git;protocol=git;branch=develop \
 "
 
-SRCREV = "dd195ada375bb0927d544999471fbb9bdc67d9c2"
-PV = "0.7.90+git${SRCPV}"
+SRCREV = "10e55c545177d037769e277bdbd8b4e3008f285d"
+PV = "0.8.1+git${SRCPV}"
 
 S = "${WORKDIR}/git"

recipes-greenisland/greenisland/greenisland/0002-compositorlauncher-work-corrrectly-with-RaspberryPi-.patch

@@ -0,0 +1,52 @@
+From 0689d84ea92dc35c69f97c4051844a4181ac2d19 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 15 Aug 2016 23:42:41 +0200
+Subject: [PATCH] compositorlauncher: work corrrectly with RaspberryPi VC4 drm
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ launcher/compositorlauncher.cpp | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/launcher/compositorlauncher.cpp b/launcher/compositorlauncher.cpp
+index fd68c66..de9b86c 100644
+--- a/launcher/compositorlauncher.cpp
++++ b/launcher/compositorlauncher.cpp
+@@ -169,6 +169,15 @@ void CompositorLauncher::detectMode()
+ 
+ void CompositorLauncher::detectHardware()
+ {
++    // TODO: Detect Mali
++    // TODO: Detect Vivante
++
++    // Detect DRM
++    if (QDir(QStringLiteral("/sys/class/drm")).exists()) {
++        m_hardware = DrmHardware;
++        return;
++    }
++
+     // Detect Broadcom
+     bool found = deviceModel().startsWith(QStringLiteral("Raspberry"));
+     if (!found) {
+@@ -183,15 +192,6 @@ void CompositorLauncher::detectHardware()
+         return;
+     }
+ 
+-    // TODO: Detect Mali
+-    // TODO: Detect Vivante
+-
+-    // Detect DRM
+-    if (QDir(QStringLiteral("/sys/class/drm")).exists()) {
+-        m_hardware = DrmHardware;
+-        return;
+-    }
+-
+     // Unknown hardware
+     m_hardware = UnknownHardware;
+ }
+-- 
+2.5.5
+

recipes-hawaii/fluid/fluid_git.bb

@@ -0,0 +1,15 @@
+SUMMARY = "Library for QtQuick applications"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.LGPLv21;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit hawaii
+
+PV = "0.8.0"
+
+SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
+SRCREV = "ab6f40ddc7e38c7eb49e8afbe4ddaf2d13c49146"
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "${OE_QMAKE_PATH_QML}"

recipes-hawaii/greenisland/greenisland/0002-RaspberryPi-Don-t-suggest-closed-source-gles-driver-.patch

@@ -1,65 +0,0 @@
-From eee96e00715613232465319071d0b7ac20cd41c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sat, 9 Apr 2016 23:01:18 +0200
-Subject: [PATCH] RaspberryPi: Don't suggest closed source gles driver when
- using open source vc4
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When building greenisland for RaspberryPi with open source GL drivers (vc4),
-cmake does not find closed source drivers (which is correct)
-
-| -- The following OPTIONAL packages have not been found:
-|
-| * BcmHost , Broadcom OpenGLES graphics libraries. , <http://www.broadcom.com/>
-
-Launching a hawaii session reports:
-
-| greenisland.qpa.deviceintegration: Preferred EGL device integration based on the hardware configuration: "brcm"
-
-which does not make sense - there were no integration libs for closed source
-RaspberryPi GLES built.
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- cmake/FindBcmHost.cmake                                | 2 ++
- src/platform/deviceintegration/deviceintegration_p.cpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/cmake/FindBcmHost.cmake b/cmake/FindBcmHost.cmake
-index 99e5127..0322b1d 100644
---- a/cmake/FindBcmHost.cmake
-+++ b/cmake/FindBcmHost.cmake
-@@ -90,6 +90,8 @@ find_package_handle_standard_args(BcmHost
- if(BcmHost_FOUND)
-     set(BcmHost_LIBRARY_DIRS "${BcmHost_PREFIX}/lib")
-     set(BcmHost_INCLUDE_DIR ${BcmHost_INCLUDE_DIR} ${BcmHost_INCLUDE_DIR}/interface ${BcmHost_INCLUDE_DIR}/interface/vcos/pthreads)
-+else()
-+    add_definitions(-DWITHOUT_BRCM)
- endif()
- 
- if(BcmHost_FOUND)
-diff --git a/src/platform/deviceintegration/deviceintegration_p.cpp b/src/platform/deviceintegration/deviceintegration_p.cpp
-index 369f43d..278210e 100644
---- a/src/platform/deviceintegration/deviceintegration_p.cpp
-+++ b/src/platform/deviceintegration/deviceintegration_p.cpp
-@@ -56,6 +56,7 @@ public:
-         if (!qEnvironmentVariableIsEmpty("DISPLAY"))
-             return QStringLiteral("x11");
- 
-+#ifndef WITHOUT_BRCM
-         // Detect Broadcom
-         bool found = deviceModel().startsWith(QLatin1String("Raspberry"));
-         if (!found) {
-@@ -67,6 +68,7 @@ public:
-         }
-         if (found)
-             return QStringLiteral("brcm");
-+#endif
- 
-         // TODO: Detect Mali
-         // TODO: Detect Vivante
--- 
-2.5.5
-

recipes-hawaii/hawaii-icon-theme/hawaii-icon-theme_git.bb

@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \
 
 inherit hawaii gtk-icon-cache
 
-SRCREV = "dfa9938a4ccc47c7b8ce7974afe1f6836b1e58cf"
-PV = "v0.6.90+git${SRCPV}"
+SRCREV = "4a0d806c28f25aa072d9c5b849ec48a565721b30"
+PV = "v0.8.0"
 S = "${WORKDIR}/git"
 
 FILES_${PN} += "${datadir}/icons"

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

@@ -12,8 +12,8 @@ REQUIRED_DISTRO_FEATURES = "wayland"
 SRC_URI += " \
     file://0001-find-host-s-git.patch \
 "
-SRCREV = "2c4fc11957193263c02dead910a2ca1b3a383d7a"
-PV = "0.6.90+git${SRCPV}"
+SRCREV = "d02a209082819e3bfa3edd167328b4ed52ebf6e1"
+PV = "0.8.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -46,6 +46,7 @@ RDEPENDS_${PN} = "qttools-tools qtwayland-plugins"
 
 # REVISIT optionals
 RRECOMMENDS_${PN} += " \
+    fluid \
     hawaii-wallpapers \
     hawaii-icon-theme \
 "

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

@@ -8,13 +8,14 @@ LIC_FILES_CHKSUM = " \
 inherit hawaii
 
 DEPENDS += " \
+    greenisland \
     libhawaii \
     polkit-qt-1 \
     kscreen \
 "
 
-SRCREV = "17da37ea0e44f8bc2d20a0018d11944bee4e810e"
-PV = "0.6.90+git${SRCPV}"
+SRCREV = "f1ce43687a0c9dcdbf0cd5640d38bbbc348dd123"
+PV = "0.8.0"
 S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += "-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools"

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

@@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
 
 inherit hawaii
 
-SRCREV = "20ffdadd04e9f98124ea14690fdf89d7567956c2"
-PV = "0.6.90+git${SRCPV}"
+SRCREV = "9aaaf3b8681dc2253d812aa7f37b8ed5e1651959"
+PV = "0.8.0"
 
 S = "${WORKDIR}/git"
 

recipes-hawaii/hawaii-workspace/hawaii-workspace_git.bb

@@ -14,8 +14,8 @@ DEPENDS += " \
     qt-gstreamer \
 "
 
-SRCREV = "c882b526c131d860d584197d8141120535be324d"
-PV = "0.6.90+git${SRCPV}"
+SRCREV = "6dd502e199596dabab8be77efaf164823a8ead65"
+PV = "0.8.1"
 S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += " \

recipes-hawaii/libhawaii/libhawaii_git.bb

@@ -5,18 +5,13 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
-inherit hawaii cmake-lib
+inherit hawaii
 
-PV = "0.6.90+git${SRCPV}"
+PV = "0.8.0"
 
 SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
-SRCREV = "9886e727d0232208d393b8e63b0fe0f28311d8a6"
+SRCREV = "f9cb7389a7881bf924ead7ae4b409c83b7e7a454"
 S = "${WORKDIR}/git"
 
-CMAKE_ALIGN_SYSROOT[1] = "Hawaii, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "Hawaii, -S${includedir}, -S${STAGING_INCDIR}"
-
 FILES_${PN} += "${OE_QMAKE_PATH_QML}"
 FILES_${PN}-dev += "${libdir}/cmake"
-#FILES_${PN}-dbg += "${libdir}/hawaii/qml/Hawaii/Shell/Applications/.debug ${libdir}/hawaii/qml/Hawaii/Shell/Core/.debug"
-

recipes-hawaii/packagegroups/hawaii-world.bb

@@ -7,6 +7,7 @@ inherit packagegroup
 RDEPENDS_${PN} = " \
     cinema \
     eyesight \
+    fluid \
     greenisland \
     hawaii-icon-theme \
     ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "hawaii-shell", "",d)} \

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

@@ -1,36 +0,0 @@
-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.1.bb

@@ -7,20 +7,17 @@ LIC_FILES_CHKSUM = " \
 	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit hawaii cmake-lib
+inherit hawaii
 
 DEPENDS += "dconf"
 
 SRC_URI = " \
     git://github.com/hawaii-desktop/${BPN}.git \
-    file://0001-fix-build-with-qt-5.5.patch \
 "
-SRCREV = "804739d73de982fc144ff45653c243cefcfa79cb"
+SRCREV = "fd37e4f7a19b593e44f35e59a5a19aecc4f268a9"
 
 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-kde/apps/ark/ark.bb

@@ -24,13 +24,14 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "210ae6fb726a99f94ba4a18db0d582aa"
-SRC_URI[sha256sum] = "799c2272ddb66439a04ebae5d24fe6113aa67678eb296225b20168a2e0c42b10"
+SRC_URI[md5sum] = "08b9058d317b9e5667bb0eaf2a4136c9"
+SRC_URI[sha256sum] = "b54c137098bbf77d99a54e526a58a83aca73db1cf1fabbbc4bccdf09a1bee8d0"
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
+    ${datadir}/mime \
     ${datadir}/k*5 \
     ${OE_QMAKE_PATH_PLUGINS} \
 "

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

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit kde-apps cmake-lib
+inherit kde-apps
 
 DEPENDS += "\
     kconfig \
@@ -18,10 +18,5 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "65813195eb4ecc012a4f9741b7419c2d"
-SRC_URI[sha256sum] = "f717b88dc1510b530cdb2c1deea18bd22382906542e37d36c37868d6c864d11a"
-
-# 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}"
-
+SRC_URI[md5sum] = "5d3f8f89d833033794b170e6b9db4cbd"
+SRC_URI[sha256sum] = "4bff2f4abd9d65f39e2b44189312bac139908362e8888c114bbf3d107902217c"

recipes-kde/apps/bovo/bovo.bb

@@ -17,8 +17,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "57bbb719d5f45663186810c853c8b55e"
-SRC_URI[sha256sum] = "5167e9bfbaf450db0c47549072e9ffdab79e1771c5dd114b516ed2fb29f61231"
+SRC_URI[md5sum] = "ec6c38f965585beaba124eb78cce40fd"
+SRC_URI[sha256sum] = "7dba4db8e72fdbe6fb552b4d8428676cf5cc490456518b918a650b616f8660b6"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \

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

@@ -13,8 +13,8 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "a9b841d538a1f08b9f8e7319061f9241"
-SRC_URI[sha256sum] = "ef63b312eb6fe98617767c876256e0201d809e9b07078a9b3676c71dd30a98e3"
+SRC_URI[md5sum] = "c33684a8b47e439e68775a164455fb54"
+SRC_URI[sha256sum] = "ff46afcdefb334bef5b8aca4bdcea1f2f133472e1e0922fb63361280ab6b3abd"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \

recipes-kde/apps/dolphin/dolphin.bb

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps cmake-lib
+inherit kde-apps
 
 DEPENDS += " \
     kdoctools \
@@ -33,8 +33,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "96439ddce5220e3a90e1373d24c35e48"
-SRC_URI[sha256sum] = "201f42d2f709c359a2f7b0974b1e35b6f22034a165540fd2af12b146b1a58599"
+SRC_URI[md5sum] = "149165d7954bfef08747e5bb7252a277"
+SRC_URI[sha256sum] = "b02bbfbe6d3f8eef6a6fd9b6ff6f5e90b47ad27c9f2e7ebcd25346287490fa6e"
 SRC_URI += " \
     file://0001-align-paths-to-phonon.patch \
     file://0002-fix-build-for-qtbase-without-session-management.patch \
@@ -53,7 +53,3 @@ FILES_${PN} += " \
 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/dragon/dragon.bb

@@ -27,8 +27,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "2c0a3e8a3d8ef098930da4fe9668b672"
-SRC_URI[sha256sum] = "749f31ac966a97329c05b9b2e68fee216d0ee3cd0a90a8957171385907cc10b5"
+SRC_URI[md5sum] = "0e5ca33aab8fdd0462494119e715195d"
+SRC_URI[sha256sum] = "3302f189878ab5d337035bc73b3e0e753e2bfb1a995f5e5810cbc0304dc26092"
 
 CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
 

recipes-kde/apps/filelight/filelight.bb

@@ -18,8 +18,8 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "5c8cf220a125630867cd8ad6692824f8"
-SRC_URI[sha256sum] = "09c85042babcada372a97892f7f05e42dc534a4120071f52de23ef8417f524d2"
+SRC_URI[md5sum] = "2bac6bc332a44b9120ec1b7b8dbcc583"
+SRC_URI[sha256sum] = "f8a44821c01f84a8554f0d58e32bf6f351dd2d6ecb7e22b0544a40ebeb1e5d7d"
 SRC_URI += " \
     file://0001-do-not-build-docs.patch \
     file://0002-fix-build-for-qtbase-build-without-session-support-Q.patch \

recipes-kde/apps/gwenview/files/0001-Fix-package-name.patch

@@ -1,31 +0,0 @@
-From 05433a8b4bc65af592726c3ed482b9770526a6e1 Mon Sep 17 00:00:00 2001
-From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
-Date: Wed, 6 Apr 2016 18:34:58 +0000
-Subject: [PATCH 1/3] Fix package name
-
-The properties of Exiv2 package are not being set properly
-due to incorrect package name.
-
-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 0f528ae..a18ca16 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -69,7 +69,7 @@ find_package(PNG)
- set_package_properties(PNG PROPERTIES URL "http://www.libpng.org" DESCRIPTION "PNG image manipulation support" TYPE REQUIRED)
- 
- find_package(Exiv2)
--set_package_properties(EXIV2 PROPERTIES URL "http://www.exiv2.org" DESCRIPTION "image metadata support" TYPE REQUIRED)
-+set_package_properties(Exiv2 PROPERTIES URL "http://www.exiv2.org" DESCRIPTION "image metadata support" TYPE REQUIRED)
- 
- find_package(KF5Kipi)
- if (KF5Kipi_FOUND)
--- 
-2.1.4
-

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

@@ -11,14 +11,14 @@ Upstream-Status: Pending
 
 Signed-off-by: Luis Gustavo S. Barreto <gustavo@ossystems.com.br>
 ---
- lib/CMakeLists.txt | 68 +++++++++++++++++++++++++++++++++---------------------
- 1 file changed, 42 insertions(+), 26 deletions(-)
+ lib/CMakeLists.txt | 71 ++++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 42 insertions(+), 29 deletions(-)
 
 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index cd2dbcb..0adbd3c 100644
+index d51b80d..db3ac7b 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -10,40 +10,56 @@ message(STATUS "Looking for libjpeg version in ${JPEG_INCLUDE_DIR}/jpeglib.h")
+@@ -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.
@@ -27,9 +27,6 @@ index cd2dbcb..0adbd3c 100644
 -#include <stdio.h>
 -#include <stdlib.h>
 -#include <jpeglib.h>
- 
--int main(void) { printf(\"%d\\\n\", JPEG_LIB_VERSION); }
--")
 +function(JPEGVersionCheck Ret Op Version)
 +    set(JPEGLIB_VERSION_CHECK_PATH "${CMAKE_CURRENT_BINARY_DIR}/jpeglib-version-check.c")
 +    file(WRITE ${JPEGLIB_VERSION_CHECK_PATH} "
@@ -45,51 +42,52 @@ index cd2dbcb..0adbd3c 100644
 +    }
 +    ")
  
+-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)
-+    try_compile(COMPILE_RESULT_VAR
-+        "${CMAKE_BINARY_DIR}" "${JPEGLIB_VERSION_CHECK_PATH}"
-+         COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS}"
-+         OUTPUT_VARIABLE COMPILE_OUT)
++    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()
-+    set(${Ret} ${COMPILE_OUT} PARENT_SCOPE)
-+endfunction()
- 
--if ("${jpeglib_version}" LESS 80)
--    set(GV_JPEG_DIR libjpeg-62)
--endif()
 +find_package(JPEG REQUIRED)
- 
--if ("${jpeglib_version}" EQUAL 80)
--    set(GV_JPEG_DIR libjpeg-80)
--endif()
 +if(JPEG_FOUND)
 +    JPEGVersionCheck(JPEG_LIB_VERSION < 80)
 +    if (${JPEG_LIB_VERSION} MATCHES "#error")
 +      set(GV_JPEG_DIR libjpeg-62)
 +    endif()
  
--if ("${jpeglib_version}" EQUAL 90)
--    set(GV_JPEG_DIR libjpeg-90)
+-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 ("${GV_JPEG_DIR}" STREQUAL "")
--    message(FATAL_ERROR "Unknown libjpeg version: ${jpeglib_version}")
+-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()
  
--message(STATUS "libjpeg version: ${jpeglib_version}")
+-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()
@@ -97,10 +95,14 @@ index cd2dbcb..0adbd3c 100644
 +    endif()
 +else(JPEG_FOUND)
 +    message(FATAL_ERROR "Could not find jpeglib.h. This file comes with libjpeg.")
-+endif()
- 
+ endif()
+-
+-message(STATUS "libjpeg version: ${jpeglib_version}")
+-
++ 
  add_definitions(-Dlibjpeg_EXPORTS)
  include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/${GV_JPEG_DIR}
 -- 
-2.1.4
+2.5.5
 

recipes-kde/apps/gwenview/gwenview.bb

@@ -19,13 +19,12 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "20774653ecf548ceeeae6b0fcdccd87b"
-SRC_URI[sha256sum] = "146aa96420d3af800371ec37964e35484309db975d71761ac3bb2ff9c95f9209"
+SRC_URI[md5sum] = "1d1ac5a3f9f9639b898db4008b9b52e6"
+SRC_URI[sha256sum] = "255df6966b34278a3375880ff6ff31000cc52ea69285e5da5e95a3c4ff782c64"
 
 SRC_URI += " \
-    file://0001-Fix-package-name.patch  \
-    file://0002-Set-Kipi-package-properties.patch  \
-    file://0003-Avoid-try_run.patch \
+    file://0001-Set-Kipi-package-properties.patch  \
+    file://0002-Avoid-try_run.patch \
 "
 
 CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"

recipes-kde/apps/kapman/kapman.bb

@@ -24,8 +24,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "07a0c30b5c5b7077887af0761c23655e"
-SRC_URI[sha256sum] = "118a05d2f654114e6d2318c8cf65df7e247ea7cc4bdd36bf1369d540ce5ced43"
+SRC_URI[md5sum] = "acc85096197530e2e02cb877cef3ce1f"
+SRC_URI[sha256sum] = "06addd40448ba9d7f58231b5bfcfa2d9ff94d19e726a5ef320d8dd1cd599bdf3"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/kate/kate.bb

@@ -30,8 +30,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "85d9b0c9f7f297211a41d8fa3892128e"
-SRC_URI[sha256sum] = "8df0040326469361d1f163616810c9c1a89dad675a81144dc3b5d3ae3f3f15a9"
+SRC_URI[md5sum] = "ac0dbaa0f0b06e3cc96e9f87ea321f42"
+SRC_URI[sha256sum] = "984a82005897b553eab0525715b626f7467bc1d664b29ac7944860cd1d7012dc"
 
 SRC_URI += " \
     file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \

recipes-kde/apps/katomic/katomic.bb

@@ -25,8 +25,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "1a3f75807de16e780ba27e5a0427e3b3"
-SRC_URI[sha256sum] = "b3e65f4a5d9d0d4672776584f8555be6b565c52c256a7eabd36ba990be238bc9"
+SRC_URI[md5sum] = "64f10e943903513cadae909b280f6fd6"
+SRC_URI[sha256sum] = "57f4fc75c3383dacdfb7c7ad56c3da12878d4edff1079562af610c79695e54bd"
 SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
 
 FILES_${PN} += " \

recipes-kde/apps/kbounce/kbounce.bb

@@ -26,8 +26,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "579011c3c934e577274a22c865433f9c"
-SRC_URI[sha256sum] = "832be0c6fd32ab01cac45f384c8d962f1e0cdbb26ac04fd64e4ecf1c939d1f5c"
+SRC_URI[md5sum] = "e492a200a396cb0b76c675f1707d3e6d"
+SRC_URI[sha256sum] = "8ecdc1d391a8ede5db1eda50c7d212d6b5b4169bb74cb1c8bc6e630ace8c3481"
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 FILES_${PN} += " \

recipes-kde/apps/kcalc/kcalc.bb

@@ -20,8 +20,8 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "94a956d4b312fe641a6615eee431b591"
-SRC_URI[sha256sum] = "a6f2e4efbaa7b987057986c065d9fd00903292edfb3090907ff00ae6a52b68ad"
+SRC_URI[md5sum] = "107022341aed3aef7c8d72b7de6c08a1"
+SRC_URI[sha256sum] = "fb390f2e980f12beab6179240f665cb431626ffa9dea8c24d67ad02813309859"
 
 FILES_SOLIBSDEV = ""
 

recipes-kde/apps/kcolorchooser/kcolorchooser.bb

@@ -13,8 +13,8 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "adacf0f8dd552dc23dc7f0b04b5030d7"
-SRC_URI[sha256sum] = "f7f46ac20b36047a6065643daac831a5e10458a0563d3bc7627af82e9a4f01ce"
+SRC_URI[md5sum] = "874e95369735955d827eff0aa69e65d3"
+SRC_URI[sha256sum] = "7fe83e765be9de06bde1535e55ef7eb974c78ae8b2b232cc92f5ee71ea1307ef"
 
 FILES_${PN} += " \
     ${datadir}/icons \

recipes-kde/apps/kdenlive/kdenlive.bb

@@ -32,8 +32,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "79982708bd27e58855fa4af2ee23302b"
-SRC_URI[sha256sum] = "d5af3f96c1d43c3f0a28844b0c56dd3951f07cd6a48355096cb6272d1dbba40c"
+SRC_URI[md5sum] = "3c906a40f0c5649f4b1b68f4693352dc"
+SRC_URI[sha256sum] = "bca5e9293326aecd6ae295f9f579ba5d7880baf54183cb0a8d8c708f4f04768d"
 
 SRC_URI += " \
     file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \
@@ -52,3 +52,5 @@ FILES_${PN} += " \
 FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_PLUGINS}/.debug \
 "
+
+RRECOMMENDS_${PN} += "ffmpeg"

recipes-kde/apps/kdf/kdf.bb

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

recipes-kde/apps/kdiamond/kdiamond.bb

@@ -25,8 +25,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "129e12704d62511ba10b97ae12e80e7e"
-SRC_URI[sha256sum] = "fc4bdddbbc2640b73229e9e23cf28bd2729a07f1af986c5f5bef8b7b4ba4318f"
+SRC_URI[md5sum] = "ab07c48b7b3155a5f049a35bf1a6fcc3"
+SRC_URI[sha256sum] = "6bf47c486d4b7d8138522579ea7013a9c5967c59bedcf6095251d3f951d77a9b"
 SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 FILES_${PN} += " \

recipes-kde/apps/khelpcenter/khelpcenter.bb

@@ -26,8 +26,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "2d07fa5ab16b5a2cbca815f446b30e6d"
-SRC_URI[sha256sum] = "a981321de2652c30dd53de9b13b115911a55dd14ee8417fdd792b7a0a4a29cc2"
+SRC_URI[md5sum] = "2690a92fc8edf166c5643ccdeb9e5deb"
+SRC_URI[sha256sum] = "648842ec7dd417d76f0b1bf8649e993f10bbc0fc37e5eaf31dcea83d6ed052df"
 
 SRC_URI += " \
     file://0001-fix-build-for-qtbase-without-session-management.patch \

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

@@ -44,8 +44,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "d4af7bc86b6e767e910a84f2a6e6c61d"
-SRC_URI[sha256sum] = "100e69d7ad0df39ee8a2789dce0b02601097cce903a902f4e1aa633a953cafeb"
+SRC_URI[md5sum] = "7afd2a4e1f645ef45450c1087e42206e"
+SRC_URI[sha256sum] = "2cb558a7658894ee67f9318bbd98949b8eda425e5a30ca2af761e5d54d807093"
 
 FILES_${PN} += " \
     ${datadir}/kio_bookmarks \

recipes-kde/apps/kmix/kmix.bb

@@ -26,8 +26,8 @@ PACKAGECONFIG = "pulseaudio"
 PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "e601e4b4c188c08c475e32432dec0f41"
-SRC_URI[sha256sum] = "edda5a766b901dbda6404f8c995ba0d489751f6a65f8d546f18d851db0861847"
+SRC_URI[md5sum] = "0d887662c99c262b90831942bc0cc2be"
+SRC_URI[sha256sum] = "0f450623f1fc532cacf7b3fa5d1f00adb77e1be41bf08f472a276795f6398ca9"
 
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 

recipes-kde/apps/kolourpaint/kolourpaint.bb

@@ -0,0 +1,34 @@
+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 += "\
+    kdelibs4support \
+    kconfigwidgets \
+    kcoreaddons \
+    kdoctools \
+    ki18n \
+    kiconthemes \
+    kio \
+    kcmutils \
+    knotifications \
+    kwidgetsaddons \
+    kxmlgui \
+    libkexiv2 \
+" 
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "998e1a62f922cdf96ac848afaa8f148e"
+SRC_URI[sha256sum] = "6162b62146d84377f3b24b70288b41798e8177e931f67836e9a15adcc620cf19"
+
+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

@@ -1,53 +0,0 @@
-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

@@ -36,9 +36,8 @@ DEPENDS += " \
 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "53d3d26f125cd8d42fe08942aa7c939c"
-SRC_URI[sha256sum] = "f650ee9f27769ae5f97e1809e6530b525f4c2cc30a4fb7ed85fc63447d170bb6"
-SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
+SRC_URI[md5sum] = "ebe57e74bbcf6311eb449af12032583a"
+SRC_URI[sha256sum] = "d5a242c8e23c4002736402ef5ecbb840b60e0e149fc92b480223dfeb7647335a"
 
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""

recipes-kde/apps/krita/krita.bb

@@ -6,11 +6,16 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=cc4eecf2379e7a2a5f3d0441d680f82a \
 "
 
-inherit kde-apps
+inherit kde-apps gtk-icon-cache
 
 DEPENDS += " \
+    curl \
+    poppler \
+    boost \
     libraw \
     libeigen \
+    exiv2 \
+    fftw \
     \
     karchive \
     kconfig \
@@ -26,10 +31,28 @@ DEPENDS += " \
     kcrash \
 "
 
-PV = "3.0"
+PV = "3.1.1"
 SRC_URI = " \
-    ${KDE_MIRROR}/stable/krita/${PV}/${BPN}-${PV}.tgz \
+    ${KDE_MIRROR}/stable/krita/${PV}/${BPN}-${PV}.tar.gz \
     file://0001-fix-build-with-GLES2.patch \
 "
-SRC_URI[md5sum] = "beb7140471d1b6b0ae92d664743c067f"
-SRC_URI[sha256sum] = "4cea85623b709d6d32084c98a0fd76b97ad96d11be9808fca9fcaad2839a9c5a"
+SRC_URI[md5sum] = "322831adc0bc5c7d7ed298f152d57fe7"
+SRC_URI[sha256sum] = "62ef2c4b9b19563c1e2e6dc0643dd0880e04469dd5798373401d8dd666720e8f"
+
+# krita has lots of include_directories(SYSTEM ${FOO_DIR})
+# have no better way to make gcc6 happy
+do_configure_append() {
+     sed -i 's:-isystem:-I:g' `find ${B} -name *.make`
+}
+
+# HACK - but overidable by BSP
+LDFLAGSGL = "-lGLESv2"
+LDFLAGS += "${LDFLAGSGL}"
+
+FILES_${PN} += " \
+    ${datadir}/color \
+    ${datadir}/color-schemes \
+    ${datadir}/icons \
+    ${datadir}/kritaplugins \
+    ${libdir}/kritaplugins \
+"

recipes-kde/apps/ksystemlog/ksystemlog.bb

@@ -20,7 +20,7 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "d095f506f375d0e7fae65d4ec2d4237b"
-SRC_URI[sha256sum] = "3bc1571e8aae59ae7738aa1ff3b2d363895a359711363f18e4bf20c9172df9bb"
+SRC_URI[md5sum] = "ff692ae5a71862ffc40eba8296470083"
+SRC_URI[sha256sum] = "06c1ef9378ac0477247627a2d0f1dfd659cbb5f76da790e17199d9ba3fc35c56"
 
 FILES_${PN} += "${datadir}/kxmlgui5"

recipes-kde/apps/kwalletmanager/kwalletmanager.bb

@@ -23,8 +23,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "15d01c679a4f497b589dce91b98e93c2"
-SRC_URI[sha256sum] = "98bfbb19d0710d36565e2e81e2bd3fdd55e67daf18c18a234508afdbe2c7ddcd"
+SRC_URI[md5sum] = "26f200d763f3f2545631938edff10089"
+SRC_URI[sha256sum] = "c126171e517a070be54a24c6f0a38c190fb630f75c174567a231f1b4337e729a"
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 FILES_${PN} += " \

recipes-kde/apps/kwave/files/0001-FIND_REQUIRED_PROGRAM-is-broken-use-the-tools-direct.patch

@@ -0,0 +1,92 @@
+From 821988e0cc73b7dda590aabe903eb8c5605fefe3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 16 Dec 2016 12:16:24 +0100
+Subject: [PATCH] FIND_REQUIRED_PROGRAM is broken - use the tools directly
+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>
+---
+ CMakeLists.txt               |  4 ++--
+ cmake/FindKwaveVersion.cmake |  2 +-
+ cmake/KwaveL10N.cmake        | 12 ++++++------
+ doc/CMakeLists.txt           |  2 +-
+ 4 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4b7a784..af4748d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,7 +79,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+ 
+ INCLUDE(FindRequiredProgram)
+ 
+-FIND_REQUIRED_PROGRAM(CAT_EXECUTABLE cat)
++SET(CAT_EXECUTABLE cat)
+ INCLUDE(FindKwaveVersion)
+ 
+ #############################################################################
+@@ -393,7 +393,7 @@ ADD_CUSTOM_TARGET(distfiles
+ #############################################################################
+ ### uninstall support                                                     ###
+ 
+-FIND_REQUIRED_PROGRAM(RMDIR_EXECUTABLE rmdir)
++SET(RMDIR_EXECUTABLE rmdir)
+ 
+ CONFIGURE_FILE(
+     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/uninstall.cmake.in
+diff --git a/cmake/FindKwaveVersion.cmake b/cmake/FindKwaveVersion.cmake
+index 75ce140..2b1cfeb 100644
+--- a/cmake/FindKwaveVersion.cmake
++++ b/cmake/FindKwaveVersion.cmake
+@@ -49,7 +49,7 @@ MESSAGE(STATUS "Building Kwave version ${KWAVE_VERSION_FULL}")
+ #############################################################################
+ ### ISO formated date                                                     ###
+ 
+-FIND_REQUIRED_PROGRAM(DATE_EXECUTABLE date)
++SET(DATE_EXECUTABLE date)
+ 
+ EXECUTE_PROCESS(
+     COMMAND
+diff --git a/cmake/KwaveL10N.cmake b/cmake/KwaveL10N.cmake
+index 4112628..00d4d78 100644
+--- a/cmake/KwaveL10N.cmake
++++ b/cmake/KwaveL10N.cmake
+@@ -15,12 +15,12 @@
+ ##                                                                          #
+ #############################################################################
+ 
+-FIND_REQUIRED_PROGRAM(FIND_EXECUTABLE find)
+-FIND_REQUIRED_PROGRAM(MSGCAT_EXECUTABLE msgcat)
+-FIND_REQUIRED_PROGRAM(XGETTEXT_EXECUTABLE xgettext)
+-FIND_REQUIRED_PROGRAM(MSGMERGE_EXECUTABLE msgmerge)
+-FIND_REQUIRED_PROGRAM(MSGFMT_EXECUTABLE msgfmt)
+-FIND_REQUIRED_PROGRAM(RM_EXECUTABLE rm)
++SET(FIND_EXECUTABLE find)
++SET(MSGCAT_EXECUTABLE msgcat)
++SET(XGETTEXT_EXECUTABLE xgettext)
++SET(MSGMERGE_EXECUTABLE msgmerge)
++SET(MSGFMT_EXECUTABLE msgfmt)
++SET(RM_EXECUTABLE rm)
+ 
+ SET(PO_SRC_DIR "${CMAKE_SOURCE_DIR}/po")
+ SET(PO_BIN_DIR "${CMAKE_BINARY_DIR}/po")
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index a7e4295..fba93d6 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -21,7 +21,7 @@ SET(UPDATE_PLUGIN_XREF     ${CMAKE_SOURCE_DIR}/bin/update-plugin-xref.pl)
+ SET(_index_docbook         ${CMAKE_CURRENT_SOURCE_DIR}/en/index.docbook)
+ SET(_index_docbook_updated ${CMAKE_CURRENT_BINARY_DIR}/index-updated.docbook)
+ 
+-FIND_REQUIRED_PROGRAM(CP_EXECUTABLE cp)
++SET(CP_EXECUTABLE cp)
+ 
+ #############################################################################
+ ### how to convert from svg to png                                        ###
+-- 
+2.7.4
+

recipes-kde/apps/kwave/kwave.bb

@@ -0,0 +1,50 @@
+SUMMARY = "Kwave is a sound editor for KDE"
+LICENSE = "GPLv2 & LGPLv2 & CC-BY-SA-3.0 & GFDL-1.2 & BSD"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES;md5=6c77bb99378a665445fdbd62703e919c \
+    file://GNU-LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += "\
+    audiofile \
+    fftw \
+    libopus \
+    libsamplerate0 \
+    \
+    kcompletion \
+    kconfig \
+    kconfigwidgets \
+    kcoreaddons \
+    kcrash \
+    kdbusaddons \
+    kdoctools \
+    ki18n \
+    kiconthemes \
+    kio \
+    kservice \
+    ktextwidgets \
+    kxmlgui \
+    kwidgetsaddons \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI += "file://0001-FIND_REQUIRED_PROGRAM-is-broken-use-the-tools-direct.patch"
+SRC_URI[md5sum] = "b6277f92208fd86c53af5b68532e3e86"
+SRC_URI[sha256sum] = "e28aa2b91219b2a3df0b70da265bf8db48a4abb9980aba01096ed493e54b21eb"
+
+# Aagh: To select a soundcard we need to select another type - so keep oss in as dummy
+#EXTRA_OECMAKE += "-DWITH_OSS=OFF"
+
+PACKAGECONFIG ??= "alsa mp3"
+PACKAGECONFIG[alsa] = "-DWITH_ALSA=ON,-DWITH_ALSA=OFF,alsa-lib"
+PACKAGECONFIG[flac] = "-DWITH_FLAC=ON,-DWITH_FLAC=OFF,flac"
+PACKAGECONFIG[mp3] = "-DWITH_MP3=ON,-DWITH_MP3=OFF,id3lib libmad"
+PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio,pulseaudio-server"
+PACKAGECONFIG[qtmultimedia] = "-DWITH_QT_AUDIO=ON,-DWITH_QT_AUDIO=OFF,qtmultimedia"
+
+FILES_${PN} += " \
+    ${datadir}/kservicetypes5 \
+    ${OE_QMAKE_PATH_PLUGINS} \
+"

recipes-kde/apps/libkdegames/libkdegames.bb

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps cmake-lib
+inherit kde-apps
 
 DEPENDS += "\
     kcoreaddons \
@@ -40,8 +40,8 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "578f37a9a68b41226be5e650d9a19f6e"
-SRC_URI[sha256sum] = "ed23972888170c88985b42cd9f6e351e1bd1d7e705c6e119915e398966f8d2e7"
+SRC_URI[md5sum] = "820885a12f1b78f1087261556eb09b59"
+SRC_URI[sha256sum] = "51277bc284d27beec64103eff5b11cb9d672efd5c265f5f1a6bb9951290ba128"
 SRC_URI += "file://0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch"
 
 PACKAGECONFIG[kgdeclarative] = "-DBUILD_KGDECLARATIVE=Yes,-DBUILD_KGDECLARATIVE=No, kdeclarative"
@@ -56,6 +56,3 @@ FILES_${PN} += " \
 FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_QML}/*/*/*/*/.debug \
 "
-
-CMAKE_ALIGN_SYSROOT[1] = "KF5KDEGames, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5KDEGames, -S${includedir}, -S${STAGING_INCDIR}"

recipes-kde/apps/libkexiv2/libkexiv2.bb

@@ -0,0 +1,17 @@
+SUMMARY = "Libkexiv2 is a wrapper around Exiv2 library"
+LICENSE = "GPLv2 & BSD & LGPLv2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
+    file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \
+    file://COPYING.LIB;md5=3214f080875748938ba060314b4f727d \
+"
+
+inherit kde-apps
+
+DEPENDS += "\
+    exiv2 \
+" 
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "e28e3fb8d04047a6810f70fa46cd5534"
+SRC_URI[sha256sum] = "0d0f583071e735afe4ce9fae8c8317bfa43e49a71468099758a11312264bdc56"

recipes-kde/apps/lokalize/lokalize.bb

@@ -25,8 +25,8 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "49f6fa5154669c16082312df312d3dfa"
-SRC_URI[sha256sum] = "21561303223a0f8ebc45ba985f3fe77d01921973f2284dbd8f0b2626d6f7c3b8"
+SRC_URI[md5sum] = "31d6be64f5133aa2db94a4f6c984fcea"
+SRC_URI[sha256sum] = "fac8e0a7a31f07020bc4726eb7b0079537dfe8d44b04fb9a89d8991b90fec3b1"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \

recipes-kde/apps/marble/marble.bb

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps
+inherit kde-apps cmake_lib
 
 DEPENDS += " \
     qtsvg \
@@ -28,29 +28,34 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "e2e6315ba8277027f03ee2b5fe9c84a6"
-SRC_URI[sha256sum] = "5a3dabcf0a28b5446030ab1831be13f0d0d4589d57da9f3a2e71e53629f331cb"
+SRC_URI[md5sum] = "f8c45f7e5cf2798709af7802a5d0dc1a"
+SRC_URI[sha256sum] = "1ac83cf09a515b5a0739a524225aeb5933c90620d06de72bb1a74f3de3c562c3"
 SRC_URI += "file://0001-align-path-of-designer-plugins.patch"
 
+EXTRA_OECMAKE += "-DMARBLE_PRI_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules"
+
 PACKAGES =+ " \
-    ${PN}-mobile ${PN}-qt ${PN}-touch \
+    ${PN}-qt \
     ${PN}-designer-plugin-dbg ${PN}-designer-plugin \
 "
 
+CMAKE_ALIGN_SYSROOT[1] = "Marble, -S${includedir}, -s${_IMPORT_PREFIX}/include"
+CMAKE_ALIGN_SYSROOT[2] = "Astro, -S${includedir}, -s${_IMPORT_PREFIX}/include"
+
 FILES_SOLIBSDEV = ""
 
 FILES_${PN}-dev += "${libdir}/libastro.so ${libdir}/libmarblewidget-qt5.so"
-FILES_${PN}-mobile = "${bindir}/${BPN}-mobile"
 FILES_${PN}-qt = "${bindir}/${BPN}-qt"
-FILES_${PN}-touch = "${bindir}/${BPN}-touch"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/k*5 \
     ${datadir}/mime \
+    ${datadir}/plasma \
     ${libdir}/libmarbledeclarative.so \
     ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_QML} \
 "
 
 FILES_${PN}-dbg += " \

recipes-kde/apps/minuet/minuet.bb

@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps gtk-icon-cache
 
 DEPENDS += "\
+    qtquickcontrols2 \
+    fluidsynth \
     drumstick \
     ki18n \
     kxmlgui \
@@ -17,12 +19,13 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "785934edebfeaa7fef125f489cf42d3a"
-SRC_URI[sha256sum] = "84270171fec23544b991715d8e29dbfba04d65a9304d575ae24347af8a025f8f"
+SRC_URI[md5sum] = "6176e552d8f9539468acd55fd1500501"
+SRC_URI[sha256sum] = "4be531d78eb1c2896110ecdc94e6fcfe0d3e6d54df48c9fbb78b93c18105541e"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
-RDEPENDS_${PN} += "timidity++"
+RDEPENDS_${PN} += "timidity++ qtquickcontrols2"

recipes-kde/apps/okteta/okteta.bb

@@ -28,8 +28,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "823fa7de994492b29b9cadfe9983621c"
-SRC_URI[sha256sum] = "b034e0ab9f6989012437f790c346deaec2511e764c939a9774fa0fa5bc6bd563"
+SRC_URI[md5sum] = "e122c901b5b3348d4b9aed7f9386231c"
+SRC_URI[sha256sum] = "6c77d0602a923dcaf32054b699851f24fbfa93bdb89928d66e219e9f217efe23"
 
 FILES_${PN} += " \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/okular/okular.bb

@@ -0,0 +1,47 @@
+SUMMARY = "KDE document viewer"
+LICENSE = "GPLv2 & GFDL-1.2 & LGPL-2.1"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b \
+    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += " \
+    libkexiv2 \
+    qca \
+    tiff \
+    kpty \
+    poppler \
+    kactivities \
+    karchive \
+    kbookmarks \
+    kcompletion \
+    kconfig \
+    kconfigwidgets \
+    kcoreaddons \
+    kdbusaddons \
+    kdoctools \
+    kiconthemes \
+    kjs \
+    kio \
+    kparts \
+    threadweaver \
+    kwallet \
+    khtml \
+    kwindowsystem \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "2bb667d3e89399780b444134f1dc2c9d"
+SRC_URI[sha256sum] = "83a3f81efc42b7b979318bb8cdba5294ef711d68e8fead049630b5e199728a8c"
+
+FILES_${PN} += " \
+    ${datadir}/k*5 \
+    ${datadir}/kconf_update \
+    ${datadir}/config.kcfg \
+    ${datadir}/kpackage \
+    ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_QML}/org \
+"

recipes-kde/apps/spectacle/spectacle.bb

@@ -28,8 +28,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "55a2f8617913306d78307bbedee343b2"
-SRC_URI[sha256sum] = "9c5cd301359159c46ee0ba897e1e96c797677ccf283d823a2092979b92a6aa5f"
+SRC_URI[md5sum] = "da0bf367466a4dd4a7cdf5d420ddd12d"
+SRC_URI[sha256sum] = "57e03741f52803896beaa2f0e914941fa9d4cef1dfbf2baf8aa825c8beabb7de"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \

recipes-kde/apps/umbrello/files/0001-Use-gcc-buildin-null-pointer-check-to-remove-x86-lim.patch

@@ -0,0 +1,162 @@
+From ce147ad93100a0d296f1c5958fcb7bf70c9d70af Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker@freenet.de>
+Date: Sat, 14 Jan 2017 11:45:46 +0100
+Subject: [PATCH] Use gcc buildin null pointer check to remove x86 limitation
+ of previous implementation.
+
+Thanks to Kevin Kofler for pointing out.
+
+MSVC dynamic_cast null pointer support has been checked and proved by Daniel Wendt.
+
+BUG:374530
+FIXED-IN:2.12.2 (KDE Applications 16.12.2)
+
+Upstream-Status: Backport
+---
+ CMakeLists.txt                  |  4 +++
+ lib/cppparser/driver.h          |  2 --
+ umbrello/debug/debug_utils.h    | 19 --------------
+ umbrello/umlmodel/umlobject.cpp | 57 ++++++++++++++++++++---------------------
+ 4 files changed, 32 insertions(+), 50 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9e7443..2faf930 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,6 +23,10 @@ include(Macros)
+ 
+ set(CMAKE_AUTORCC ON)
+ 
++if(CMAKE_COMPILER_IS_GNUCXX)
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -fno-delete-null-pointer-checks")
++endif()
++
+ if(NOT BUILD_KF5)
+     cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+ 
+diff --git a/lib/cppparser/driver.h b/lib/cppparser/driver.h
+index 86dd03d..73989ed 100644
+--- a/lib/cppparser/driver.h
++++ b/lib/cppparser/driver.h
+@@ -21,7 +21,6 @@
+ 
+ #include "ast.h"
+ 
+-#include "debug_utils.h"
+ #include "macro.h"
+ #include <qpair.h>
+ #include <QStringList>
+@@ -110,7 +109,6 @@ public:
+ 
+     TranslationUnitAST* operator -> () const
+     {
+-        uCheckPointerAndReturnIfZero(this);
+         return (TranslationUnitAST*)m_translationUnit.data();
+     }
+ 
+diff --git a/umbrello/debug/debug_utils.h b/umbrello/debug/debug_utils.h
+index 5c0b921..4480ba5 100644
+--- a/umbrello/debug/debug_utils.h
++++ b/umbrello/debug/debug_utils.h
+@@ -131,25 +131,6 @@ private:
+ 
+ #define uIgnoreZeroPointer(a) if (!a) { uDebug() << "zero pointer detected" << __FILE__ << __LINE__; continue; }
+ 
+-/**
+-  Check a pointer and return 0 if it is zero.
+-
+-  This macros is implemented as asm code to prevent
+-  removing by gcc optimizer for example in class methods
+-  where 'this' pointer is attributed as "nonnull".
+-
+-  @param p pointer to check
+-  @return returns 0 is pointer is zero
+-*/
+-#define uCheckPointerAndReturnIfZero(p) \
+-    asm goto ("test %0,%0; jne %l[next]" \
+-              : /* No outputs. */ \
+-              : "r"(p) \
+-              : \
+-              : next); \
+-         return 0; \
+-       next:
+-
+ 
+ /**
+  * In a Q_OBJECT class define any enum as Q_ENUMS.
+diff --git a/umbrello/umlmodel/umlobject.cpp b/umbrello/umlmodel/umlobject.cpp
+index 224361a..bfd17ae 100644
+--- a/umbrello/umlmodel/umlobject.cpp
++++ b/umbrello/umlmodel/umlobject.cpp
+@@ -669,7 +669,6 @@ void UMLObject::setUMLParent(UMLObject *parent)
+  */
+ UMLObject *UMLObject::umlParent() const
+ {
+-    uCheckPointerAndReturnIfZero(this);
+     return dynamic_cast<UMLObject *>(parent());
+ }
+ 
+@@ -1228,32 +1227,32 @@ QDebug operator<<(QDebug out, const UMLObject& obj)
+ #include "usecase.h"
+ 
+ 
+-UMLActor* UMLObject::asUMLActor() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLActor*>(this); }
+-UMLArtifact* UMLObject::asUMLArtifact() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLArtifact*>(this); }
+-UMLAssociation* UMLObject::asUMLAssociation() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLAssociation*>(this); }
+-UMLAttribute* UMLObject::asUMLAttribute() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLAttribute*>(this); }
+-UMLCanvasObject* UMLObject::asUMLCanvasObject() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLCanvasObject*>(this); }
+-UMLCategory* UMLObject::asUMLCategory() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLCategory*>(this); }
+-UMLCheckConstraint* UMLObject::asUMLCheckConstraint() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLCheckConstraint*>(this); }
+-UMLClassifier* UMLObject::asUMLClassifier() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLClassifier*>(this); }
+-UMLClassifierListItem *UMLObject::asUMLClassifierListItem() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLClassifierListItem*>(this); }
+-UMLComponent* UMLObject::asUMLComponent() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLComponent*>(this); }
+-UMLDatatype *UMLObject::asUMLDatatype() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLDatatype*>(this); }
+-UMLEntity* UMLObject::asUMLEntity() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLEntity*>(this); }
+-UMLEntityAttribute* UMLObject::asUMLEntityAttribute() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLEntityAttribute*>(this); }
+-UMLEntityConstraint* UMLObject::asUMLEntityConstraint() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLEntityConstraint*>(this); }
+-UMLEnum* UMLObject::asUMLEnum() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLEnum*>(this); }
+-UMLEnumLiteral* UMLObject::asUMLEnumLiteral() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLEnumLiteral*>(this); }
+-UMLFolder* UMLObject::asUMLFolder() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLFolder*>(this); }
+-UMLForeignKeyConstraint* UMLObject::asUMLForeignKeyConstraint() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLForeignKeyConstraint*>(this); }
+-UMLNode* UMLObject::asUMLNode() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLNode*>(this); }
+-UMLObject* UMLObject::asUMLObject() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLObject*>(this); }
+-UMLOperation* UMLObject::asUMLOperation() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLOperation*>(this); }
+-UMLPackage* UMLObject::asUMLPackage() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLPackage*>(this); }
+-UMLPort* UMLObject::asUMLPort() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLPort*>(this); }
+-UMLRole* UMLObject::asUMLRole() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLRole*>(this); }
+-UMLStereotype* UMLObject::asUMLStereotype() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLStereotype*>(this); }
+-UMLTemplate* UMLObject::asUMLTemplate() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLTemplate*>(this); }
+-UMLUniqueConstraint* UMLObject::asUMLUniqueConstraint() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLUniqueConstraint*>(this); }
+-UMLUseCase* UMLObject::asUMLUseCase() { uCheckPointerAndReturnIfZero(this); return dynamic_cast<UMLUseCase*>(this); }
++UMLActor* UMLObject::asUMLActor() { return dynamic_cast<UMLActor*>(this); }
++UMLArtifact* UMLObject::asUMLArtifact() { return dynamic_cast<UMLArtifact*>(this); }
++UMLAssociation* UMLObject::asUMLAssociation() { return dynamic_cast<UMLAssociation*>(this); }
++UMLAttribute* UMLObject::asUMLAttribute() { return dynamic_cast<UMLAttribute*>(this); }
++UMLCanvasObject* UMLObject::asUMLCanvasObject() { return dynamic_cast<UMLCanvasObject*>(this); }
++UMLCategory* UMLObject::asUMLCategory() { return dynamic_cast<UMLCategory*>(this); }
++UMLCheckConstraint* UMLObject::asUMLCheckConstraint() { return dynamic_cast<UMLCheckConstraint*>(this); }
++UMLClassifier* UMLObject::asUMLClassifier() { return dynamic_cast<UMLClassifier*>(this); }
++UMLClassifierListItem *UMLObject::asUMLClassifierListItem() { return dynamic_cast<UMLClassifierListItem*>(this); }
++UMLComponent* UMLObject::asUMLComponent() { return dynamic_cast<UMLComponent*>(this); }
++UMLDatatype *UMLObject::asUMLDatatype() { return dynamic_cast<UMLDatatype*>(this); }
++UMLEntity* UMLObject::asUMLEntity() { return dynamic_cast<UMLEntity*>(this); }
++UMLEntityAttribute* UMLObject::asUMLEntityAttribute() { return dynamic_cast<UMLEntityAttribute*>(this); }
++UMLEntityConstraint* UMLObject::asUMLEntityConstraint() { return dynamic_cast<UMLEntityConstraint*>(this); }
++UMLEnum* UMLObject::asUMLEnum() { return dynamic_cast<UMLEnum*>(this); }
++UMLEnumLiteral* UMLObject::asUMLEnumLiteral() { return dynamic_cast<UMLEnumLiteral*>(this); }
++UMLFolder* UMLObject::asUMLFolder() { return dynamic_cast<UMLFolder*>(this); }
++UMLForeignKeyConstraint* UMLObject::asUMLForeignKeyConstraint() { return dynamic_cast<UMLForeignKeyConstraint*>(this); }
++UMLNode* UMLObject::asUMLNode() { return dynamic_cast<UMLNode*>(this); }
++UMLObject* UMLObject::asUMLObject() { return dynamic_cast<UMLObject*>(this); }
++UMLOperation* UMLObject::asUMLOperation() { return dynamic_cast<UMLOperation*>(this); }
++UMLPackage* UMLObject::asUMLPackage() { return dynamic_cast<UMLPackage*>(this); }
++UMLPort* UMLObject::asUMLPort() { return dynamic_cast<UMLPort*>(this); }
++UMLRole* UMLObject::asUMLRole() { return dynamic_cast<UMLRole*>(this); }
++UMLStereotype* UMLObject::asUMLStereotype() { return dynamic_cast<UMLStereotype*>(this); }
++UMLTemplate* UMLObject::asUMLTemplate() { return dynamic_cast<UMLTemplate*>(this); }
++UMLUniqueConstraint* UMLObject::asUMLUniqueConstraint() { return dynamic_cast<UMLUniqueConstraint*>(this); }
++UMLUseCase* UMLObject::asUMLUseCase() { return dynamic_cast<UMLUseCase*>(this); }
+ 
+-- 
+2.5.5
+

recipes-kde/apps/umbrello/umbrello.bb

@@ -10,6 +10,7 @@ inherit kde-apps gtk-icon-cache
 
 DEPENDS += " \
     qtsvg \
+    qtwebkit \
     \
     karchive \
     kcompletion \
@@ -25,8 +26,9 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "a8a8de6d313c5dffd38ba91e8586a3c8"
-SRC_URI[sha256sum] = "11802523002b809ed5ba10bcb341b9dfc579dbc53b1df70442c4c5329684f715"
+SRC_URI += "file://0001-Use-gcc-buildin-null-pointer-check-to-remove-x86-lim.patch"
+SRC_URI[md5sum] = "d4cd9ef531b22ab14b3b6b1f6259ea8e"
+SRC_URI[sha256sum] = "2ccd645ab52544885e3b373b0da543ae171d8b41a0bdeb93ae45170f8cd30bb9"
 
 EXTRA_OECMAKE += "-DBUILD_KF5=1"
 

recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb

@@ -1,9 +1,3 @@
 require ${BPN}.inc
 
-inherit cmake-lib
-
 DEPENDS += "${BPN}-native libpcre"
-
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "KF5JS, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5JS, -S${includedir}, -S${STAGING_INCDIR}"

recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc

@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 inherit kde-kf5-porting-aids perlnative
 
 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "7ffd38082aa627f42a9e4830a739f8c6"
-SRC_URI[sha256sum] = "cacea5f661214ed900ffa61b62116ca1dc843286593b56e9f49b4d13dc3ac5f6"
+SRC_URI[md5sum] = "2f0a96ed8ba6c9534bb5764a91350bd2"
+SRC_URI[sha256sum] = "306ea881ad235b7e1360dd5842ac9da312d1a0d15e16214db3a8af1d30b0077a"
 SRC_URI += "file://0001-create_hash_table-avoid-polution-of-files-with-build.patch"
 
 DEPENDS += " \

recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb

@@ -3,9 +3,12 @@ require ${BPN}.inc
 inherit native
 
 DEPENDS += " \
+    intltool-native \
+    libsm-native \
     kconfig-native \
     kcoreaddons-native \
     ki18n-native \
+    liburi-perl-native \
 "
 
 SRC_URI += " \

recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb

@@ -1,6 +1,6 @@
 require ${BPN}.inc
 
-inherit cmake-lib
+inherit cmake_lib
 
 DEPENDS += " \
     ${BPN}-native \
@@ -46,12 +46,9 @@ do_configure_append() {
     sed -i 's:${STAGING_LIBDIR_NATIVE}:${libdir}:g' ${B}/src/config-kstandarddirs.h
 }
 
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "KDELibs4, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_ALIGN_SYSROOT[2] = "KDELibs4, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-
 # native executables
-CMAKE_ALIGN_SYSROOT[3] = "KF5KDELibs4Support, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5KDELibs4Support, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[2] = "KDELibs4, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \

recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc

@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5-porting-aids perlnative
 
 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "37284190af0a84cdd2a12636b5b71b2e"
-SRC_URI[sha256sum] = "6ca7bc090f32d6d43c4147815b3d13fae1de904088ff948a0fe8588d56093bb2"
+SRC_URI[md5sum] = "a4c54a015a6c26e9f511719157acadb9"
+SRC_URI[sha256sum] = "b5734b63e1a4a89d0fd3260bf190a5e1608b1b17001ea36cc031a41be62a6f3a"
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 

recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde-kf5-porting-aids cmake-lib perlnative
+inherit kde-kf5-porting-aids perlnative
 
 DEPENDS += " \
     karchive \
@@ -32,11 +32,8 @@ DEPENDS += " \
 "
 
 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "e9b1763b2649d7e21e6cda3e0c5773bf"
-SRC_URI[sha256sum] = "95af84cde953f9ddbff9e6237e7ac395877f0e8b753f8c5473070ecd1329ad5e"
-
-CMAKE_ALIGN_SYSROOT[1] = "KF5KHtml, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5KHtml, -S${includedir}, -S${STAGING_INCDIR}"
+SRC_URI[md5sum] = "f3d4668db2ea3c28acea7a5b073a3ea1"
+SRC_URI[sha256sum] = "702dc24913aa361e021a8e0353174cb9a9f0343de887b800a2eb2f94d99097fc"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \

recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed-native.bb

@@ -3,6 +3,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 CMAKE_DUMMY_BINARIES = "kjscmd5"
 
-inherit cmake-native-dummy
+inherit cmake_native_dummy
 
 

recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde-kf5-porting-aids cmake-lib
+inherit kde-kf5-porting-aids cmake_lib
 
 DEPENDS += " \
     ${BPN}-native \
@@ -16,12 +16,8 @@ DEPENDS += " \
 "
 
 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "f1d0c9a46be19e69a493f75fc8af54e7"
-SRC_URI[sha256sum] = "d83f78bd15491d55f17d33f48c051cd3f6e37dcad382c7b460fb8132aadce1a9"
-
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "KF5JsEmbed, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5JsEmbed, -S${includedir}, -S${STAGING_INCDIR}"
+SRC_URI[md5sum] = "4e45538d6ee3d994552590fca8a9914c"
+SRC_URI[sha256sum] = "058fa11609a020cd59fc030cd27b827324936569bf219866d7d7989fa729ad47"
 
 # kjsembed's kjscmd5 is not required for build -> point to native dummy to make cmake happy
-CMAKE_ALIGN_SYSROOT[3] = "KF5JsEmbed, -S${bindir}/kjscmd5, -S${STAGING_BINDIR_NATIVE}/kjscmd5"
+CMAKE_ALIGN_SYSROOT[1] = "KF5JsEmbed, -s${_IMPORT_PREFIX}/bin/kjscmd5, -S${STAGING_BINDIR_NATIVE}/kjscmd5"

recipes-kde/kf5/porting-aids-tier3/kross/kross.bb

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde-kf5-porting-aids cmake-lib
+inherit kde-kf5-porting-aids
 
 DEPENDS += " \
     kcompletion \
@@ -20,11 +20,8 @@ DEPENDS += " \
 "
 
 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "bb96fd634617bcac31974f9b63f41252"
-SRC_URI[sha256sum] = "84681930bbaa248e524651f95c3abce20a3b320c48a2df086675688974bb893f"
-
-CMAKE_ALIGN_SYSROOT[1] = "KF5Kross, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5Kross, -S${includedir}, -S${STAGING_INCDIR}"
+SRC_URI[md5sum] = "854fc0bafea0d011a675b72400fc5ef4"
+SRC_URI[sha256sum] = "bfab8313f0f1b121e3fd61d0537efe6fa3cd7004121eed1c42eca09c9dfd0eaf"
 
 FILES_${PN} += " \
     ${OE_QMAKE_PATH_PLUGINS} \

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

@@ -4,13 +4,9 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING;md5=be254b9345b1c2ff33e1a6a96768f2fb \
 "
 
-inherit kde-kf5 cmake-lib
+inherit kde-kf5
 
-SRC_URI[md5sum] = "000a8c34e6c4e548f53493c4519c3c1c"
-SRC_URI[sha256sum] = "951af772a83237d2c0c9a7fede2608101041d2cc13716221c97d9c79cc79e5be"
+SRC_URI[md5sum] = "f98b27874a160f926ec47981a564b477"
+SRC_URI[sha256sum] = "5b44207c93f42b84e99fc7e110025059e3023a1dac2e4f5bd019335c7a331eed"
 
 PV = "${KF5_VERSION}"
-
-CMAKE_ALIGN_SYSROOT[1] = "KF5Attica, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5Attica, -S${includedir}, -S${STAGING_INCDIR}"
-

recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb

@@ -2,19 +2,15 @@ SUMMARY = "Qt wrapper for BlueZ 5 DBus AP"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
-inherit kde-kf5 cmake-lib
+inherit kde-kf5
 
 DEPENDS += "qtdeclarative"
 
 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "2e03661752de63494541649158d712fa"
-SRC_URI[sha256sum] = "45c4145db2da69dd4e9e6f632740a1e71365eca1efb8c57a6e43a2b477be4b41"
+SRC_URI[md5sum] = "34ea3644d491bcad9d796c43d4f89655"
+SRC_URI[sha256sum] = "ce74a02b99bf71ce47c864294f5cef055c6b8bf84e10586f520c7e4919144eab"
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
 FILES_${PN} += "${OE_QMAKE_PATH_QML}"
 FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/org/kde/bluezqt/.debug"
-
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "KF5BluezQt, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5BluezQt, -S${includedir}, -S${STAGING_INCDIR}"

recipes-kde/kf5/tier1/breeze-icons/breeze-icons-native.bb

@@ -0,0 +1,5 @@
+require ${BPN}.inc
+
+inherit native
+
+SRC_URI += "file://0001-native-build-and-install-qrcAlias-only.patch"

recipes-kde/kf5/tier1/breeze-icons/breeze-icons.bb

@@ -1,15 +1,9 @@
-SUMMARY = "Breeze icon theme"
-LICENSE = "LGPLv2.1 & LGPLv3"
-LIC_FILES_CHKSUM = " \
-    file://COPYING-ICONS;md5=3e7f6a3da5801872be1084a978cfc0eb \
-    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-"
+require ${BPN}.inc
 
-inherit kde-kf5 gtk-icon-cache
+inherit gtk-icon-cache
 
-SRC_URI[md5sum] = "6f7e0a3d91a18fc31c7b4683f1174358"
-SRC_URI[sha256sum] = "e274c7f5c71c177e2e9d8ced9c49cd052ec2f726cb693c7df73e96af12277e8f"
+DEPENDS += "${BPN}-native"
 
-PV = "${KF5_VERSION}"
+SRC_URI += "file://0002-use-native-qrcAlias.patch"
 
 FILES_${PN} += "${datadir}/icons"

recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc

@@ -0,0 +1,13 @@
+SUMMARY = "Breeze icon theme"
+LICENSE = "LGPLv2.1 & LGPLv3"
+LIC_FILES_CHKSUM = " \
+    file://COPYING-ICONS;md5=3e7f6a3da5801872be1084a978cfc0eb \
+    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+"
+
+inherit kde-kf5
+
+SRC_URI[md5sum] = "42a090bcc38e15523df1b53ae985ff71"
+SRC_URI[sha256sum] = "53e533d006e0289b969ee37534a71f02b2708cee28cfa829b95a144f75010759"
+
+PV = "${KF5_VERSION}"

recipes-kde/kf5/tier1/breeze-icons/files/0001-native-build-and-install-qrcAlias-only.patch

@@ -0,0 +1,51 @@
+From 7fb3f68ad7d5f9c46afc95e8e067e3ee03857c1c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 14 Dec 2016 00:07:33 +0100
+Subject: [PATCH] native: build and install qrcAlias only
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [embedded-specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6d2a06c..2bef486 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,8 @@ if(BINARY_ICONS_RESOURCE)
+     find_package(Qt5 NO_MODULE REQUIRED Core)
+     add_executable(qrcAlias qrcAlias.cpp)
+     target_link_libraries(qrcAlias PUBLIC Qt5::Core)
+-
++    install(TARGETS qrcAlias DESTINATION "${CMAKE_INSTALL_BINDIR}")
++if(False)
+ function(generate_binary_resource target outfile)
+     set(RESOURCES_WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}/res)
+     set(RESOURCE_FILE ${RESOURCES_WORKING_DIR}/breeze-${target}.qrc)
+@@ -63,6 +64,7 @@ function(generate_binary_resource target outfile)
+     set(${outfile} ${BINARY_RESOURCE_FILE} PARENT_SCOPE)
+ endfunction()
+ endif()
++endif()
+ 
+ find_program(BASH_EXE bash)
+ if (BASH_EXE)
+@@ -74,8 +76,10 @@ if (BASH_EXE)
+     )
+ endif()
+ 
++if(False)
+ add_subdirectory(autotests)
+ add_subdirectory(icons)
+ add_subdirectory(icons-dark)
++endif()
+ 
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-- 
+2.5.5
+

recipes-kde/kf5/tier1/breeze-icons/files/0002-use-native-qrcAlias.patch

@@ -0,0 +1,31 @@
+From dcf7e2d68f0f9291142c2aabb9be2940a1d8bc57 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 14 Dec 2016 00:20:20 +0100
+Subject: [PATCH] use native qrcAlias
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [embedded-specific]
+
+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 6d2a06c..949c164 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,7 +45,7 @@ function(generate_binary_resource target outfile)
+             ${RESOURCES_WORKING_DIR}/.gitignore
+             ${RESOURCES_WORKING_DIR}/CMakeLists.txt
+         COMMAND ${QT_RCC_EXECUTABLE} --project -o ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc
+-        COMMAND $<TARGET_FILE:qrcAlias> -i ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc -o ${RESOURCE_FILE}
++        COMMAND qrcAlias -i ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc -o ${RESOURCE_FILE}
+ 
+         WORKING_DIRECTORY ${RESOURCES_WORKING_DIR}
+         DEPENDS breeze-${target}-mkdir
+-- 
+2.5.5
+

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

@@ -1,8 +1,3 @@
 require ${BPN}.inc
 
 DEPENDS += "${BPN}-native"
-
-inherit cmake-lib
-
-CMAKE_ALIGN_SYSROOT[1] = "KF5Archive, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5Archive, -S${includedir}, -S${STAGING_INCDIR}"

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

@@ -10,5 +10,5 @@ inherit kde-kf5
 DEPENDS += "bzip2 xz zlib"
 
 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "7205f46ad213e85a736da5f808b5b8df"
-SRC_URI[sha256sum] = "0c338f1e1adc5522de6555fa3fa8c6ebcde29ce48e1f5959beca12d46aea88d8"
+SRC_URI[md5sum] = "d25e41851ea5da7e589a1c7ec530255c"
+SRC_URI[sha256sum] = "18b35d437e7cbf6f00983d0f66372cbd6a0daedaa58e6c092838c20845571f38"

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

@@ -5,14 +5,8 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde-kf5 cmake-lib
+inherit kde-kf5
 
 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "089c46445618fbc36c11de7eccd61256"
-SRC_URI[sha256sum] = "d5bef19f3575784e93b55db76bbaea7f8dba2bed4ffd9b9fbbb52db6d85f4ea5"
-
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "KF5Codecs, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5Codecs, -S${includedir}, -S${STAGING_INCDIR}"
-
-
+SRC_URI[md5sum] = "efc956f78601eb8b9537d7ddc61c47f8"
+SRC_URI[sha256sum] = "6eb6935512e01a70d730938c28cb84852e73d4c023deebb5f2946b4c760f2aee"

recipes-kde/kf5/tier1/kconfig/files/0003-make-autotests-optional-by-BUILD_TESTING.patch

@@ -0,0 +1,32 @@
+From ccaed10501ee608b1c3ea795a3a12e93ecca938d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 1 Feb 2017 17:51:27 +0100
+Subject: [PATCH] make autotests optional by BUILD_TESTING
+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>
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c8cc674..94d0295 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,7 +31,9 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KCONFIG
+ 
+ 
+ add_subdirectory(src)
++if(BUILD_TESTING)
+ add_subdirectory(autotests)
++endif()
+ 
+ include (ECMPoQmTools)
+ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+-- 
+2.7.4
+

recipes-kde/kf5/tier1/kconfig/files/0004-kconf_update-fix-paths.patch

@@ -1,45 +0,0 @@
-From dd2c25f7f856d82e499b5cb062f7254ddf3f4d28 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Mon, 9 Feb 2015 13:44:18 +0100
-Subject: [PATCH] kconf_update: fix paths
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- src/kconf_update/CMakeLists.txt   | 2 +-
- src/kconf_update/kconf_update.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/kconf_update/CMakeLists.txt b/src/kconf_update/CMakeLists.txt
-index 34419c7..a04c43a 100644
---- a/src/kconf_update/CMakeLists.txt
-+++ b/src/kconf_update/CMakeLists.txt
-@@ -15,7 +15,7 @@ target_link_libraries(kconf_update Qt5::Core KF5::ConfigCore)
- include(ECMMarkNonGuiExecutable)
- ecm_mark_nongui_executable(kconf_update)
- 
--get_target_property(KCONF_UPDATE_EXECUTABLE kconf_update LOCATION)
-+set(KCONF_UPDATE_EXECUTABLE ${KDE_INSTALL_LIBEXECDIR_KF5}/kconf_update)
- configure_file(config-kconf.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kconf.h )
- 
- # Although this is mostly an internal binary (hence installing it in
-diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp
-index 309bc3c..3ff5163 100644
---- a/src/kconf_update/kconf_update.cpp
-+++ b/src/kconf_update/kconf_update.cpp
-@@ -758,7 +758,7 @@ void KonfUpdate::gotScript(const QString &_script)
-     QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kconf_update/") + script);
-     if (path.isEmpty()) {
-         if (interpreter.isEmpty()) {
--            path = CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/kconf_update_bin/" + script;
-+            path = LIB_INSTALL_DIR "/kconf_update_bin/" + script;
-             if (!QFile::exists(path)) {
-                 path = QStandardPaths::findExecutable(script);
-             }
--- 
-1.9.3
-

recipes-kde/kf5/tier1/kconfig/kconfig-native.bb

@@ -2,4 +2,4 @@ require ${BPN}.inc
 
 inherit native
 
-SRC_URI += "file://0003-keep-gui-stuff-out-of-native-build.patch"
+SRC_URI += "file://0004-keep-gui-stuff-out-of-native-build.patch"

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

@@ -1,16 +1,11 @@
 require ${BPN}.inc
 
-inherit cmake-lib
+inherit cmake_lib
 
 DEPENDS += "${BPN}-native"
 
-SRC_URI += "file://0004-kconf_update-fix-paths.patch"
-
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "KF5Config, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5Config, -S${includedir}, -S${STAGING_INCDIR}"
 # native executables
-CMAKE_ALIGN_SYSROOT[3] = "KF5Config, -S${libexecdir}/kf5, -S${STAGING_LIBEXECDIR_NATIVE}/kf5"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Config, -s${_IMPORT_PREFIX}/libexec/kf5, -S${STAGING_LIBEXECDIR_NATIVE}/kf5"
 
 PACKAGES =+ "${PN}-bin"
 

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

@@ -7,13 +7,14 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5
 
 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "03112534b86d98716cf61865d0ea2497"
-SRC_URI[sha256sum] = "498332f1c3fbb5e0d681cf6807502c1fe0aef74e79b29cd1e60e4096924949c2"
+SRC_URI[md5sum] = "15ca527d7abba3e6b673b7108765fe21"
+SRC_URI[sha256sum] = "a29a3ccb6c9e8124eca488417d602e689dc7240f9b10510f4152e739fdc143dc"
 
 # REVISIT remove ugly hack for wayland-only environments
 SRC_URI += " \
     file://0001-kconfiggui-do-only-compile-in-case-sessions-are-aval.patch \
     file://0002-do-not-export-location-for-kconf_update.patch \
+    file://0003-make-autotests-optional-by-BUILD_TESTING.patch \
 "
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"

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

@@ -1,14 +1,11 @@
 require ${BPN}.inc
 
-inherit cmake-lib
+inherit cmake_lib
 
 DEPENDS += "${BPN}-native"
 
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "KF5CoreAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5CoreAddons, -S${includedir}, -S${STAGING_INCDIR}"
 # native executables
-CMAKE_ALIGN_SYSROOT[3] = "KF5CoreAddons, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5CoreAddons, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}"
 
 PACKAGES =+ "${PN}-bin"