oxefmsynth: initial add 1.3,5 - unfinished due to VST-SDK missing/licence

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

TODO

@@ -1,3 +1,13 @@
+qmmp: PACKAGECONFIGIZE:
+WARNING: qmmp-1.0.9-r0 do_package_qa: QA Issue: qmmp rdepends on libfaad, but it isn't a build dependency, missing faad2 in DEPENDS or PACKAGECONFIG? [build-deps]
+WARNING: qmmp-1.0.9-r0 do_package_qa: QA Issue: qmmp rdepends on wavpack, but it isn't a build dependency, missing wavpack in DEPENDS or PACKAGECONFIG? [build-deps]
+WARNING: qmmp-1.0.9-r0 do_package_qa: QA Issue: qmmp rdepends on libmms, but it isn't a build dependency, missing libmms in DEPENDS or PACKAGECONFIG? [build-deps]
+WARNING: qmmp-1.0.9-r0 do_package_qa: QA Issue: qmmp rdepends on libmodplug, but it isn't a build dependency, missing libmodplug in DEPENDS or PACKAGECONFIG? [build-deps]
+
+
+qt5.6:
+* check build wayland only / no session management
+
 kde missing:
 * plasma-sdk
 
@@ -5,19 +15,90 @@ kde missing:
 
 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:
-* follow meta-qt5 to 5.5 / reduce meta-qt5 overrrides (pull #1)
 * proper gpgme solution see commit 618331ae
-* kjsembedded-native dummy?
+
+
+* 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,19 +1,14 @@
-# do_configure_append_class-cross does not work so hack
+CMAKE_ALIGN_FILES_FIND ??= "*Targets.cmake"
-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}/CMakeFiles/Export -name '*.cmake'` ; 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

@@ -1,52 +1,84 @@
 # This class helps to align paths for cmake files in build sysroot while 
 # keeping proper paths for target packages/rootfs
 #
-# Alignment is controlled by
+# Alignment is controlled by:
 #
-# CMAKE_ALIGN_SYSROOT[unique-id] = "dir, search, replace"
+#   CMAKE_ALIGN_SYSROOT[<unique-id>] = "<dir>, <search>, <replace>"
 #
-# 'unique-id': 
+#   <unique-id>:
-#    string value of your choice e.g. "1", "2"...
+#      string value of your choice e.g. "1", "2"...
-#    !!COMMON PITFALL!!: Copy & Paste CMAKE_ALIGN_SYSROOT lines without updating unique-id -> 
+#      !!COMMON PITFALL!!: Copy & Paste CMAKE_ALIGN_SYSROOT lines without updating unique-id ->
-#    not all lines are evaluated!!
+#      not all lines are evaluated!!
 #
-# 'dir':
+#   <dir>:
-#    cmake configuration files are usually installed as
+#      cmake configuration files are usually installed as
 #
-#    1. ${libdir}/cmake/<CMakePackageName>/*.cmake
+#      1. ${libdir}/cmake/<CMakePackageName>/*.cmake
-#    or
+#      or
-#    2. ${datadir}/cmake/<CMakePackageName>/*.cmake
+#      2. ${datadir}/cmake/<CMakePackageName>/*.cmake
 #
-#    'dir' can be any matching part of 1. and 2. but suggestion is to use
+#      'dir' can be any matching part of 1. and 2. but suggestion is to use
-#    is <CMakePackageName>
+#      is <CMakePackageName>
 #
-# 'search'/'replace':
+#   <search>/<replace>:
-#    cmake configuration files are scanned and the resulting string found in 'search'
+#      cmake configuration files are scanned and the resulting string found in 'search'
-#    is replaced by resulting string of 'replace'. To create a resulting string currently
+#      is replaced by resulting string of 'replace'. To create a resulting string currently
-#    6 command-line like options are available (see parseparam below):
+#      6 command-line like options are available (see parseparam below):
+#
+#        -f<file-in-WORKDIR>:
+#          Resulting string is taken from the file <file-in-WORKDIR>. This option should be
+#          choosen for longer strings or stings containg ','.
+#        -F<file-in-WORKDIR>:
+#          same as -f but bitbake variables are expanded e.g '${libdir}' -> '/usr/lib'
+#        -s<string>
+#          Resulting string is <string>
+#        -S<string>
+#          same as -s but bitbake variables are expanded e.g '${libdir}' -> '/usr/lib'
+#        -c<shell-command>
+#          Resulting string is created by the shell command found in <shell-command>
+#        -C<shell-command>
+#          same as -c but bitbake variables are expanded BEFORE executing shell command
+#
+#
+# Native overriding:
+#
+#   CMAKE_ALIGN_SYSROOT_class-native[<unique-id>] = "<dir>, <search>, <replace>"
+#
+# Native extended recipe -> no native alignement:
+#
+#   CMAKE_ALIGN_SYSROOT_class-native[<unique-id>] = "ignore"
+#   CMAKE_ALIGN_SYSROOT[<unique-id>] = "<dir>, <search>, <replace>"
+#
+# Native extended recipe -> no cross alignement:
+#
+#   CMAKE_ALIGN_SYSROOT_class-native[<unique-id>] = "<dir>, <search>, <replace>"
+#   CMAKE_ALIGN_SYSROOT[<unique-id>] = "ignore"
 #
-#      -f<file-in-WORKDIR>:
-#        Resulting string is taken from the file <file-in-WORKDIR>. This option should be
-#        choosen for longer strings or stings containg ','.
-#      -F<file-in-WORKDIR>:
-#        same as -f but bitbake variables are expanded e.g '${libdir}' -> '/usr/lib'
-#      -s<string>
-#        Resulting string is <string>
-#      -S<string>
-#        same as -f but bitbake variables are expanded e.g '${libdir}' -> '/usr/lib'
-#      -c<shell-command>
-#        Resulting string is created by the shell command found in <shell-command>
-#      -C<shell-command>
-#        same as -c but bitbake variables are expanded BEFORE executing shell command
 
-# -c<shell-command>
+inherit cmake_sysroot
+
+# global helper to get CMAKE_ALIGN_SYSROOT array
+def get_align_flags(d):
+    ret = {}
+    if bb.data.inherits_class('native', d):
+        ret = d.getVarFlags("CMAKE_ALIGN_SYSROOT_class-native") or {}
+    if ret == {}:
+        ret = d.getVarFlags("CMAKE_ALIGN_SYSROOT") or {}
+    return ret
+
+# global helper to check CMAKE_ALIGN_SYSROOT array contains 'ignore'
+def get_flags_ignore(flags):
+    if flags and list(flags.values()).count('ignore') > 0:
+        return True
+    return False
 
-# filename for the file containg full names of all cmakefiles staged
-CMAKEINSTALLED = "${WORKDIR}/staged_cmake_files"
 
 # 1. basic checks for CMAKE_ALIGN_SYSROOT
 python () {
-    cmakehideflags = d.getVarFlags("CMAKE_ALIGN_SYSROOT") or {}
+    cmakehideflags = get_align_flags(d)
+    if get_flags_ignore(cmakehideflags):
+        return
+
     pn = d.getVar('PN', True)
     if cmakehideflags:
         for flag, flagval in sorted(cmakehideflags.items()):
@@ -55,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
+# 2. 3. in cmake_sysroot
-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() {
@@ -120,14 +137,16 @@ python do_populate_sysroot_append() {
         else:
             bb.fatal("Parameter %s is too short for CMAKE_ALIGN_SYSROOT[%s] in %s" % (param, flag, pn))
 
-    # first check if cmake files were installed to sysroot
+    cmakehideflags = get_align_flags(d)
+    if get_flags_ignore(cmakehideflags):
+        return
+
+    # check if cmake files were installed to sysroot
     tmpfile = d.getVar('CMAKEINSTALLED', True)
     if (not os.path.isfile(tmpfile)) or os.path.getsize(tmpfile) == 0:
         bb.warn("There were no cmake files installed by %s" % pn)
     else:
         # parse CMAKE_ALIGN_SYSROOT[..]
-        cmakehideflags = d.getVarFlags("CMAKE_ALIGN_SYSROOT") or {}
-
         for flag, flagval in sorted(cmakehideflags.items()):
             items = flagval.split(",")
 
@@ -180,6 +199,10 @@ python do_populate_sysroot_append() {
                     bb.warn("No cmake replacements performed in %s for CMAKE_ALIGN_SYSROOT[%s]" % (pn, flag))
 }
 
-do_populate_sysroot[vardeps] += "CMAKE_ALIGN_SYSROOT"
+do_populate_sysroot[vardeps] += "CMAKE_ALIGN_SYSROOT CMAKE_ALIGN_SYSROOT_class-native"
-# REVISIT: CMAKE_ALIGN_SYSROOT cause configure rerun
+
-sysroot_cleansstate[vardeps] += "CMAKE_ALIGN_SYSROOT"
+# change of CMAKE_ALIGN_SYSROOT causes configure rerun which currently seems
+# the only way to force a rebuild at change of CMAKE_ALIGN_SYSROOT for recipes
+# depending on this recipe
+
+sysroot_cleansstate[vardeps] += "CMAKE_ALIGN_SYSROOT CMAKE_ALIGN_SYSROOT_class-native"

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,8 +2,11 @@ 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} \
+    -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/kde-apps.bbclass

@@ -1,7 +1,7 @@
 inherit kde-base
 
-KDE_APP_VERSION = "15.08.0"
+KDE_APP_VERSION = "16.12.1"
 
-SRC_URI = "http://download.kde.org/stable/applications/${KDE_APP_VERSION}/src/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"
 
 RRECOMMENDS_${PN} += "qtbase-plugins"

classes/kde-base.bbclass

@@ -1,22 +1,43 @@
 DEPENDS += "qtbase extra-cmake-modules-native"
 
-KDE_BRANCH ?= "master"
+KDE_MIRROR = "http://download.kde.org"
 
-# default git
+MIRRORS += "\
-SRC_URI = "git://anongit.kde.org/${BPN};protocol=git;branch=${KDE_BRANCH}"
+${KDE_MIRROR}	http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde \n \
+${KDE_MIRROR}	http://mirrors.mit.edu/kde \n \
+${KDE_MIRROR}	http://mirror.cc.columbia.edu/pub/software/kde \n \
+${KDE_MIRROR}	http://ftp.is.co.za/mirror/ftp.kde.org \n \
+${KDE_MIRROR}	http://mirror.squ.edu.om/kde \n \
+${KDE_MIRROR}	http://ftp.fi.muni.cz/pub/kde \n \
+${KDE_MIRROR}	http://mirrors.fe.up.pt/pub/kde \n \
+${KDE_MIRROR}	http://mirror.its.dal.ca/kde \n \
+${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
 
-FILES_${PN} += "${libdir}/plugins/kf5 ${datadir}/kf5"
+do_compile_prepend() {
+    export XDG_DATA_HOME=${STAGING_DATADIR}
+}
+
+FILES_${PN} += "${libdir}/plugins/kf5 ${datadir}/kf5 ${libexecdir}/kf5"
 FILES_${PN}-dev += "${libdir}/cmake"
-FILES_${PN}-dbg += "${libdir}/plugins/kf5/.debug"
+FILES_${PN}-dbg += "${libdir}/plugins/kf5/.debug ${libexecdir}/kf5/.debug"
 
 EXTRA_OECMAKE += " \
-    -DECM_MKSPECS_INSTALL_DIR=${libdir}/${QT_DIR_NAME}/mkspecs/modules \
+    -DECM_MKSPECS_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \
     -DCMAKE_INSTALL_DATADIR=share \
     -DCMAKE_INSTALL_DBUSINTERFACEDIR=share/dbus-1/interfaces \
     -DKDE_INSTALL_QTPLUGINDIR=${OE_QMAKE_PATH_PLUGINS} \
     -DKDE_INSTALL_QMLDIR=${OE_QMAKE_PATH_QML} \
 "
-FILES_${PN}-dev += "${libdir}/${QT_DIR_NAME}/mkspecs"
+
+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 = "http://download.kde.org/stable/frameworks/5.13/portingAids/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.29/portingAids/${BPN}-${PV}.tar.xz"

classes/kde-kf5.bbclass

@@ -1,5 +1,5 @@
 inherit kde-base
 
-KF5_VERSION = "5.13.0"
+KF5_VERSION = "5.29.0"
 
-SRC_URI = "http://download.kde.org/stable/frameworks/5.13/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.29/${BPN}-${PV}.tar.xz"

classes/kde-plasma.bbclass

@@ -1,5 +1,9 @@
 inherit kde-base
 
-PLASMA_VERSION = "5.4.0"
+PLASMA_VERSION = "5.8.5"
 
-SRC_URI = "http://download.kde.org/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"
+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"
 

extends-meta-oe/networkmanager_%.bbappend

@@ -1,6 +1,6 @@
-PACKAGECONFIG ?= " \
+PACKAGECONFIG ?= "nss ifupdown netconfig dhclient dnsmasq \
-    ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
-    modemmanager \
+    wifi \
     bluez5 \
+    modemmanager \
 "
-

extends-meta-qt5/qt-native-ext.inc

@@ -1,13 +0,0 @@
-DEPENDS = "qtbase-native"
-
-QT_MODULE = "${BPN}"
-
-require recipes-qt/qt5/qt5-native.inc
-
-do_configure() {
-    ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}
-}
-
-do_install() {
-    oe_runmake install INSTALL_ROOT=${D}
-}

extends-meta-qt5/qtbase-native_git.bbappend

@@ -8,7 +8,3 @@ do_configure_append() {
      sed -i 's:STRING_FULL_PATH:${TMPDIR}:g' ${S}/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
      sed -i 's:STRING_PATH:<oe-temp>:g' ${S}/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
 }
-
-# required for kjsembedded
-
-EXTRA_OECONF += "-gui"

extends-meta-qt5/qtbase/0001-Add-a-function-for-QPA-plugins-to-explicitly-destroy.patch

@@ -1,336 +0,0 @@
-From 9b4fbe85d2e00c625c3d4abd975faf555000f685 Mon Sep 17 00:00:00 2001
-From: Giulio Camuffo <giuliocamuffo@gmail.com>
-Date: Sun, 31 Aug 2014 16:16:53 +0300
-Subject: [PATCH] Add a function for QPA plugins to explicitly destroy QScreens
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Previously QPlatformScreen was automatically deleting its QScreen
-in ~QPlatformScreen(). That means that we cannot use QScreen's
-methods when the screen is being removed, because doing so would
-call virtual methods of QPlatformScreen. By that point the
-QPlatformScreen subclass object does not exist anymore, and we
-call the default implementation instead of the subclassed one, or
-get a crash for the pure virtual methods. This happens for example
-when removing a screen which contains a QWindow with some QML item
-using QQuickScreenAttached.
-
-This patch adds a QPlatformIntegration::destroyScreen() function,
-which deletes the QScreen and later the QPlatformScreen.
-
-~QPlatformScreen will still delete the QScreen if it was not deleted
-with destroyScreen(), so code not ported to the new approach
-will continue to work as before, with only a warning added.
-
-Task-number: QTBUG-41141
-Change-Id: Ie4a03dee08ceb4c3e94a81875411f6f723273fe1
-Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
-Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
----
- src/gui/kernel/qplatformintegration.cpp                | 18 +++++++++++++++++-
- src/gui/kernel/qplatformintegration.h                  |  1 +
- src/gui/kernel/qplatformscreen.cpp                     |  8 +++++---
- src/plugins/platforms/cocoa/qcocoaintegration.mm       |  4 ++--
- src/plugins/platforms/ios/qiosintegration.mm           |  2 +-
- src/plugins/platforms/kms/qkmsintegration.cpp          |  2 +-
- src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp  |  2 +-
- .../platforms/minimalegl/qminimaleglintegration.cpp    |  2 +-
- src/plugins/platforms/openwfd/qopenwfdintegration.cpp  |  5 +++++
- src/plugins/platforms/openwfd/qopenwfdintegration.h    |  1 +
- src/plugins/platforms/openwfd/qopenwfdport.cpp         |  2 +-
- src/plugins/platforms/qnx/qqnxintegration.cpp          |  2 +-
- src/plugins/platforms/windows/qwindowsintegration.h    |  1 +
- src/plugins/platforms/windows/qwindowsscreen.cpp       |  9 ++++++++-
- src/plugins/platforms/windows/qwindowsscreen.h         |  6 +-----
- src/plugins/platforms/xcb/qxcbconnection.cpp           |  8 +++++---
- 16 files changed, 52 insertions(+), 21 deletions(-)
-
-diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp
-index 7e291e9..86edb9b 100644
---- a/src/gui/kernel/qplatformintegration.cpp
-+++ b/src/gui/kernel/qplatformintegration.cpp
-@@ -439,7 +439,7 @@ QList<int> QPlatformIntegration::possibleKeys(const QKeyEvent *) const
-   This adds the screen to QGuiApplication::screens(), and emits the
-   QGuiApplication::screenAdded() signal.
- 
--  The screen is automatically removed when the QPlatformScreen is destroyed.
-+  The screen should be deleted by calling QPlatformIntegration::destroyScreen().
- */
- void QPlatformIntegration::screenAdded(QPlatformScreen *ps)
- {
-@@ -449,6 +449,22 @@ void QPlatformIntegration::screenAdded(QPlatformScreen *ps)
-     emit qGuiApp->screenAdded(screen);
- }
- 
-+/*!
-+  Should be called by the implementation whenever a screen is removed.
-+
-+  This removes the screen from QGuiApplication::screens(), and deletes it.
-+
-+  Failing to call this and manually deleting the QPlatformScreen instead may
-+  lead to a crash due to a pure virtual call.
-+*/
-+void QPlatformIntegration::destroyScreen(QPlatformScreen *screen)
-+{
-+    QGuiApplicationPrivate::screen_list.removeOne(screen->d_func()->screen);
-+    delete screen->d_func()->screen;
-+    screen->d_func()->screen = Q_NULLPTR;
-+    delete screen;
-+}
-+
- QStringList QPlatformIntegration::themeNames() const
- {
-     return QStringList();
-diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h
-index ccbe4cc..dbef939 100644
---- a/src/gui/kernel/qplatformintegration.h
-+++ b/src/gui/kernel/qplatformintegration.h
-@@ -171,6 +171,7 @@ public:
- 
- protected:
-     void screenAdded(QPlatformScreen *screen);
-+    void destroyScreen(QPlatformScreen *screen);
- };
- 
- QT_END_NAMESPACE
-diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp
-index 71710d1..fa6d785 100644
---- a/src/gui/kernel/qplatformscreen.cpp
-+++ b/src/gui/kernel/qplatformscreen.cpp
-@@ -52,9 +52,11 @@ QPlatformScreen::QPlatformScreen()
- QPlatformScreen::~QPlatformScreen()
- {
-     Q_D(QPlatformScreen);
--
--    QGuiApplicationPrivate::screen_list.removeOne(d->screen);
--    delete d->screen;
-+    if (d->screen) {
-+        qWarning("Manually deleting a QPlatformScreen. Call QPlatformIntegration::destroyScreen instead.");
-+        QGuiApplicationPrivate::screen_list.removeOne(d->screen);
-+        delete d->screen;
-+    }
- }
- 
- /*!
-diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
-index 72bd096..180cb23 100644
---- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
-+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
-@@ -337,7 +337,7 @@ QCocoaIntegration::~QCocoaIntegration()
- 
-     // Delete screens in reverse order to avoid crash in case of multiple screens
-     while (!mScreens.isEmpty()) {
--        delete mScreens.takeLast();
-+        destroyScreen(mScreens.takeLast());
-     }
- 
-     clearToolbars();
-@@ -397,7 +397,7 @@ void QCocoaIntegration::updateScreens()
-     // Now the leftovers in remainingScreens are no longer current, so we can delete them.
-     foreach (QCocoaScreen* screen, remainingScreens) {
-         mScreens.removeOne(screen);
--        delete screen;
-+        destroyScreen(screen);
-     }
-     // All screens in mScreens are siblings, because we ignored the mirrors.
-     foreach (QCocoaScreen* screen, mScreens)
-diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
-index 461f160..ff4b753 100644
---- a/src/plugins/platforms/ios/qiosintegration.mm
-+++ b/src/plugins/platforms/ios/qiosintegration.mm
-@@ -120,7 +120,7 @@ QIOSIntegration::~QIOSIntegration()
-     m_inputContext = 0;
- 
-     foreach (QScreen *screen, QGuiApplication::screens())
--        delete screen->handle();
-+        destroyScreen(screen->handle());
- 
-     delete m_platformServices;
-     m_platformServices = 0;
-diff --git a/src/plugins/platforms/kms/qkmsintegration.cpp b/src/plugins/platforms/kms/qkmsintegration.cpp
-index d94d7d9..5ad58ba 100644
---- a/src/plugins/platforms/kms/qkmsintegration.cpp
-+++ b/src/plugins/platforms/kms/qkmsintegration.cpp
-@@ -74,7 +74,7 @@ QKmsIntegration::~QKmsIntegration()
-         delete device;
-     }
-     foreach (QPlatformScreen *screen, m_screens) {
--        delete screen;
-+        destroyScreen(screen);
-     }
-     delete m_fontDatabase;
-     delete m_vtHandler;
-diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
-index cb87084..b0d99e8 100644
---- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
-+++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
-@@ -57,7 +57,7 @@ QLinuxFbIntegration::QLinuxFbIntegration(const QStringList &paramList)
- 
- QLinuxFbIntegration::~QLinuxFbIntegration()
- {
--    delete m_primaryScreen;
-+    destroyScreen(m_primaryScreen);
- }
- 
- void QLinuxFbIntegration::initialize()
-diff --git a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
-index 0b12e62..3fbed1e 100644
---- a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
-+++ b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
-@@ -60,7 +60,7 @@ QMinimalEglIntegration::QMinimalEglIntegration()
- 
- QMinimalEglIntegration::~QMinimalEglIntegration()
- {
--    delete mScreen;
-+    destroyScreen(mScreen);
- }
- 
- bool QMinimalEglIntegration::hasCapability(QPlatformIntegration::Capability cap) const
-diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.cpp b/src/plugins/platforms/openwfd/qopenwfdintegration.cpp
-index 1e29fcc..26bdd14 100644
---- a/src/plugins/platforms/openwfd/qopenwfdintegration.cpp
-+++ b/src/plugins/platforms/openwfd/qopenwfdintegration.cpp
-@@ -133,3 +133,8 @@ void QOpenWFDIntegration::addScreen(QOpenWFDScreen *screen)
- {
-     screenAdded(screen);
- }
-+
-+void QOpenWFDIntegration::destroyScreen(QOpenWFDScreen *screen)
-+{
-+    QPlatformIntegration::destroyScreen(screen);
-+}
-diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.h b/src/plugins/platforms/openwfd/qopenwfdintegration.h
-index 6c086b7..9243205 100644
---- a/src/plugins/platforms/openwfd/qopenwfdintegration.h
-+++ b/src/plugins/platforms/openwfd/qopenwfdintegration.h
-@@ -63,6 +63,7 @@ public:
-     QPlatformPrinterSupport *printerSupport() const;
- 
-     void addScreen(QOpenWFDScreen *screen);
-+    void destroyScreen(QOpenWFDScreen *screen);
- private:
-     QList<QPlatformScreen *> mScreens;
-     QList<QOpenWFDDevice *>mDevices;
-diff --git a/src/plugins/platforms/openwfd/qopenwfdport.cpp b/src/plugins/platforms/openwfd/qopenwfdport.cpp
-index 0bdc6b2..b643644 100644
---- a/src/plugins/platforms/openwfd/qopenwfdport.cpp
-+++ b/src/plugins/platforms/openwfd/qopenwfdport.cpp
-@@ -140,7 +140,7 @@ void QOpenWFDPort::detach()
-     mAttached = false;
-     mOn = false;
- 
--    delete mScreen;
-+    mDevice->integration()->destroyScreen(mScreen);
- 
-     wfdDestroyPipeline(mDevice->handle(),mPipeline);
-     mPipelineId = WFD_INVALID_PIPELINE_ID;
-diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp
-index 6a3cd90..dba4ba6 100644
---- a/src/plugins/platforms/qnx/qqnxintegration.cpp
-+++ b/src/plugins/platforms/qnx/qqnxintegration.cpp
-@@ -554,7 +554,7 @@ void QQnxIntegration::removeDisplay(QQnxScreen *screen)
-     Q_CHECK_PTR(screen);
-     Q_ASSERT(m_screens.contains(screen));
-     m_screens.removeAll(screen);
--    screen->deleteLater();
-+    destroyScreen(screen);
- }
- 
- void QQnxIntegration::destroyDisplays()
-diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h
-index d1617ea..7fb37bc 100644
---- a/src/plugins/platforms/windows/qwindowsintegration.h
-+++ b/src/plugins/platforms/windows/qwindowsintegration.h
-@@ -94,6 +94,7 @@ public:
-     static QWindowsIntegration *instance();
- 
-     inline void emitScreenAdded(QPlatformScreen *s) { screenAdded(s); }
-+    inline void emitDestroyScreen(QPlatformScreen *s) { destroyScreen(s); }
- 
-     unsigned options() const;
- 
-diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp
-index fd57d9e..79219e3 100644
---- a/src/plugins/platforms/windows/qwindowsscreen.cpp
-+++ b/src/plugins/platforms/windows/qwindowsscreen.cpp
-@@ -462,7 +462,7 @@ void QWindowsScreenManager::removeScreen(int index)
-         if (movedWindowCount)
-             QWindowSystemInterface::flushWindowSystemEvents();
-     }
--    delete m_screens.takeAt(index);
-+    QWindowsIntegration::instance()->emitDestroyScreen(m_screens.takeAt(index));
- }
- 
- /*!
-@@ -497,4 +497,11 @@ bool QWindowsScreenManager::handleScreenChanges()
-     return true;
- }
- 
-+void QWindowsScreenManager::clearScreens()
-+{
-+    // Delete screens in reverse order to avoid crash in case of multiple screens
-+    while (!m_screens.isEmpty())
-+        QWindowsIntegration::instance()->emitDestroyScreen(m_screens.takeLast());
-+}
-+
- QT_END_NAMESPACE
-diff --git a/src/plugins/platforms/windows/qwindowsscreen.h b/src/plugins/platforms/windows/qwindowsscreen.h
-index aa14083..924912d 100644
---- a/src/plugins/platforms/windows/qwindowsscreen.h
-+++ b/src/plugins/platforms/windows/qwindowsscreen.h
-@@ -127,11 +127,7 @@ public:
- 
-     QWindowsScreenManager();
- 
--    inline void clearScreens() {
--        // Delete screens in reverse order to avoid crash in case of multiple screens
--        while (!m_screens.isEmpty())
--            delete m_screens.takeLast();
--    }
-+    void clearScreens();
- 
-     bool handleScreenChanges();
-     bool handleDisplayChange(WPARAM wParam, LPARAM lParam);
-diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
-index 2e42993..08b414e 100644
---- a/src/plugins/platforms/xcb/qxcbconnection.cpp
-+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
-@@ -240,11 +240,12 @@ void QXcbConnection::updateScreens()
-         ++xcbScreenNumber;
-     } // for each xcb screen
- 
-+    QXcbIntegration *integration = static_cast<QXcbIntegration *>(QGuiApplicationPrivate::platformIntegration());
-     // Now activeScreens is the complete set of screens which are active at this time.
-     // Delete any existing screens which are not in activeScreens
-     for (int i = m_screens.count() - 1; i >= 0; --i) {
-         if (!activeScreens.contains(m_screens[i])) {
--            delete m_screens[i];
-+            integration->destroyScreen(m_screens.at(i));
-             m_screens.removeAt(i);
-         }
-     }
-@@ -261,7 +262,7 @@ void QXcbConnection::updateScreens()
-     // Now that they are in the right order, emit the added signals for new screens only
-     foreach (QXcbScreen* screen, m_screens)
-         if (newScreens.contains(screen))
--            ((QXcbIntegration*)QGuiApplicationPrivate::platformIntegration())->screenAdded(screen);
-+            integration->screenAdded(screen);
- }
- 
- QXcbConnection::QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGrabServer, const char *displayName)
-@@ -400,9 +401,10 @@ QXcbConnection::~QXcbConnection()
- 
-     delete m_reader;
- 
-+    QXcbIntegration *integration = static_cast<QXcbIntegration *>(QGuiApplicationPrivate::platformIntegration());
-     // Delete screens in reverse order to avoid crash in case of multiple screens
-     while (!m_screens.isEmpty())
--        delete m_screens.takeLast();
-+        integration->destroyScreen(m_screens.takeLast());
- 
- #ifdef XCB_USE_XLIB
-     XCloseDisplay((Display *)m_xlib_display);
--- 
-1.9.3
-

extends-meta-qt5/qtbase_git.bbappend

@@ -1,7 +1,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
-# we need this for bleeding edge qtwayland - this can go in 5.5 hopefully
-SRC_URI += "file://0001-Add-a-function-for-QPA-plugins-to-explicitly-destroy.patch"
-
 # session management only for x11 environment
 PACKAGECONFIG_DISTRO += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "sm", "", d)}"

extends-meta-qt5/qttools_git.bbappend

@@ -1,7 +1,16 @@
-inherit cmake-lib
+inherit cmake_lib
 
 DEPENDS += "${BPN}-native"
 
-# native binaries
+
+# 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 \
+"
+
+# native ignore
+CMAKE_ALIGN_SYSROOT_class-native[1] = "ignore"
+
+# cross -> native binaries
 CMAKE_ALIGN_SYSROOT[1] = "Qt5Help, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
 CMAKE_ALIGN_SYSROOT[2] = "Qt5LinguistTools, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"

extends-meta-qt5/qtwayland_git.bbappend

@@ -1,9 +0,0 @@
-SRCREV = "0e4e0a7c6be2928cc4300c8ef41d10ed8b3b316c"
-QT_MODULE_BRANCH = "5.5"
-QT_VERSION = "5.5.0"
-
-LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
-                    file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
-                    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"

extends-meta-qt5/qtxmlpatterns-native_git.bb

@@ -1,13 +0,0 @@
-require recipes-qt/qt5/qt5-git.inc
-require qt-native-ext.inc
-
-# There are no LGPLv3-only licensed files in this component.
-LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
-    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
-    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-SRCREV = "c21924d67a8ef39282afdf3ae6fef798dfca7135"

extends-oe-core/gpgme/pkgconfig.patch

@@ -0,0 +1,279 @@
+Update gpgme to use pkgconfig instead of -config files since its
+simpler and less error prone when cross compiling.
+
+Upstream-Status: Denied [Upstream not interested in pkg-config support]
+RP 2015/4/17
+
+diff --git a/configure.ac b/configure.ac
+index 298a22b..c778b61 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -622,6 +622,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
+                 src/versioninfo.rc
+                 src/gpgme.h)
+ AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
++AC_CONFIG_FILES(src/gpgme.pc src/gpgme-pthread.pc)
+ AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
+ AC_OUTPUT
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 58922f9..40d0dca 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -20,11 +20,13 @@
+ 
+ # Note: moc_kdpipeiodevice should actually be a dependecy below.
+ EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \
+-	     gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp
++	     gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp gpgme.pc.in gpgme-pthread.pc.in
+ 
+ bin_SCRIPTS = gpgme-config
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = gpgme.m4
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = gpgme.pc gpgme-pthread.pc
+ nodist_include_HEADERS = gpgme.h
+ 
+ bin_PROGRAMS = gpgme-tool
+diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in
+new file mode 100644
+index 0000000..980a48e
+--- /dev/null
++++ b/src/gpgme-pthread.pc.in
+@@ -0,0 +1,15 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++# API info
++api_version=@GPGME_CONFIG_API_VERSION@
++host=@GPGME_CONFIG_HOST@
++
++Name: gpgme
++Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program (threaded version)
++Version: @VERSION@
++Libs: -L${libdir} -lgpgme-pthread -lpthread
++Cflags: -I${includedir}
++Requires: libassuan gpg-error
+diff --git a/src/gpgme.m4 b/src/gpgme.m4
+index 6c2be44..d8a75cb 100644
+--- a/src/gpgme.m4
++++ b/src/gpgme.m4
+@@ -79,7 +79,7 @@ dnl config script does not match the host specification the script
+ dnl is added to the gpg_config_script_warn variable.
+ dnl
+ AC_DEFUN([AM_PATH_GPGME],
+-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
++[
+   tmp=ifelse([$1], ,1:0.4.2,$1)
+   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+      req_gpgme_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
+@@ -89,36 +89,12 @@ AC_DEFUN([AM_PATH_GPGME],
+      min_gpgme_version="$tmp"
+   fi
+ 
+-  AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
+-  ok=no
+-  if test "$GPGME_CONFIG" != "no" ; then
+-    req_major=`echo $min_gpgme_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+-    req_minor=`echo $min_gpgme_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+-    req_micro=`echo $min_gpgme_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+-    if test "$gpgme_version_major" -gt "$req_major"; then
+-        ok=yes
+-    else
+-        if test "$gpgme_version_major" -eq "$req_major"; then
+-            if test "$gpgme_version_minor" -gt "$req_minor"; then
+-               ok=yes
+-            else
+-               if test "$gpgme_version_minor" -eq "$req_minor"; then
+-                   if test "$gpgme_version_micro" -ge "$req_micro"; then
+-                     ok=yes
+-                   fi
+-               fi
+-            fi
+-        fi
+-    fi
+-  fi
++  PKG_CHECK_MODULES(GPGME, [gpgme >= $min_gpgme_version], [ok=yes], [ok=no])
+   if test $ok = yes; then
+      # If we have a recent GPGME, we should also check that the
+      # API is compatible.
+      if test "$req_gpgme_api" -gt 0 ; then
+-        tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
++        tmp=`$PKG_CONFIG --variable=api_version gpgme 2>/dev/null || echo 0`
+         if test "$tmp" -gt 0 ; then
+            if test "$req_gpgme_api" -ne "$tmp" ; then
+              ok=no
+@@ -127,19 +103,11 @@ AC_DEFUN([AM_PATH_GPGME],
+      fi
+   fi
+   if test $ok = yes; then
+-    GPGME_CFLAGS=`$GPGME_CONFIG --cflags`
+-    GPGME_LIBS=`$GPGME_CONFIG --libs`
+-    AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])
+     _AM_PATH_GPGME_CONFIG_HOST_CHECK
+   else
+-    GPGME_CFLAGS=""
+-    GPGME_LIBS=""
+-    AC_MSG_RESULT(no)
+     ifelse([$3], , :, [$3])
+   fi
+-  AC_SUBST(GPGME_CFLAGS)
+-  AC_SUBST(GPGME_LIBS)
+ ])
+ 
+ dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION,
+@@ -148,7 +116,7 @@ dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS
+ dnl  and GPGME_PTHREAD_LIBS.
+ dnl
+ AC_DEFUN([AM_PATH_GPGME_PTHREAD],
+-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
++[
+   tmp=ifelse([$1], ,1:0.4.2,$1)
+   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+      req_gpgme_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
+@@ -158,38 +126,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],
+      min_gpgme_version="$tmp"
+   fi
+ 
+-  AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version)
+-  ok=no
+-  if test "$GPGME_CONFIG" != "no" ; then
+-    if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then
+-      req_major=`echo $min_gpgme_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+-      req_minor=`echo $min_gpgme_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+-      req_micro=`echo $min_gpgme_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+-      if test "$gpgme_version_major" -gt "$req_major"; then
+-        ok=yes
+-      else
+-        if test "$gpgme_version_major" -eq "$req_major"; then
+-          if test "$gpgme_version_minor" -gt "$req_minor"; then
+-            ok=yes
+-          else
+-            if test "$gpgme_version_minor" -eq "$req_minor"; then
+-              if test "$gpgme_version_micro" -ge "$req_micro"; then
+-                ok=yes
+-              fi
+-            fi
+-          fi
+-        fi
+-      fi
+-    fi
+-  fi
++  PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no])
+   if test $ok = yes; then
+      # If we have a recent GPGME, we should also check that the
+      # API is compatible.
+      if test "$req_gpgme_api" -gt 0 ; then
+-        tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
++        tmp=`$PKG_CONFIG --variable=api_version gpgme-pthread 2>/dev/null || echo 0`
+         if test "$tmp" -gt 0 ; then
+            if test "$req_gpgme_api" -ne "$tmp" ; then
+              ok=no
+@@ -198,19 +140,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],
+      fi
+   fi
+   if test $ok = yes; then
+-    GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags`
+-    GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs`
+-    AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])
+     _AM_PATH_GPGME_CONFIG_HOST_CHECK
+   else
+-    GPGME_PTHREAD_CFLAGS=""
+-    GPGME_PTHREAD_LIBS=""
+-    AC_MSG_RESULT(no)
+     ifelse([$3], , :, [$3])
+   fi
+-  AC_SUBST(GPGME_PTHREAD_CFLAGS)
+-  AC_SUBST(GPGME_PTHREAD_LIBS)
+ ])
+ 
+ 
+@@ -229,36 +163,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+      min_gpgme_version="$tmp"
+   fi
+ 
+-  AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
+-  ok=no
+-  if test "$GPGME_CONFIG" != "no" ; then
+-    req_major=`echo $min_gpgme_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+-    req_minor=`echo $min_gpgme_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+-    req_micro=`echo $min_gpgme_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+-    if test "$gpgme_version_major" -gt "$req_major"; then
+-        ok=yes
+-    else
+-        if test "$gpgme_version_major" -eq "$req_major"; then
+-            if test "$gpgme_version_minor" -gt "$req_minor"; then
+-               ok=yes
+-            else
+-               if test "$gpgme_version_minor" -eq "$req_minor"; then
+-                   if test "$gpgme_version_micro" -ge "$req_micro"; then
+-                     ok=yes
+-                   fi
+-               fi
+-            fi
+-        fi
+-    fi
+-  fi
++  PKG_CHECK_MODULES(GPGME_GLIB, [gpgme >= $min_gpgme_version glib-2.0], [ok=yes], [ok=no])  
+   if test $ok = yes; then
+      # If we have a recent GPGME, we should also check that the
+      # API is compatible.
+      if test "$req_gpgme_api" -gt 0 ; then
+-        tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
++        tmp=`$PKG_CONFIG --variable=api_version gpgme 2>/dev/null || echo 0`
+         if test "$tmp" -gt 0 ; then
+            if test "$req_gpgme_api" -ne "$tmp" ; then
+              ok=no
+@@ -267,17 +177,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+      fi
+   fi
+   if test $ok = yes; then
+-    GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
+-    GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
+-    AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])
+     _AM_PATH_GPGME_CONFIG_HOST_CHECK
+   else
+-    GPGME_GLIB_CFLAGS=""
+-    GPGME_GLIB_LIBS=""
+-    AC_MSG_RESULT(no)
+     ifelse([$3], , :, [$3])
+   fi
+-  AC_SUBST(GPGME_GLIB_CFLAGS)
+-  AC_SUBST(GPGME_GLIB_LIBS)
+ ])
+diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in
+new file mode 100644
+index 0000000..b69539f
+--- /dev/null
++++ b/src/gpgme.pc.in
+@@ -0,0 +1,15 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++# API info
++api_version=@GPGME_CONFIG_API_VERSION@
++host=@GPGME_CONFIG_HOST@
++
++Name: gpgme
++Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program.
++Version: @VERSION@
++Libs: -L${libdir} -lgpgme
++Cflags: -I${includedir}
++Requires: libassuan gpg-error
+\ No newline at end of file

extends-oe-core/gpgme_1.6.0.bb

@@ -6,27 +6,28 @@ 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/gpgme.h.in;endline=23;md5=5027eec93a996272a9a0a6a86cf35775 \
                     file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/${BP}.tar.bz2 \
-           file://gpgme.pc"
+           file://gpgme.pc \
+           file://pkgconfig.patch \
+          "
 
 SRC_URI_append_class-native = " file://0001-return-unknown-as-host.patch"
 
-SRC_URI[md5sum] = "334e524cffa8af4e2f43ae8afe585672"
+SRC_URI[md5sum] = "60d730d22e8065fd5de309e8b98e304b"
-SRC_URI[sha256sum] = "2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60120496"
+SRC_URI[sha256sum] = "b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d"
 
 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/*"
 
+CFLAGS_append_libc-musl = " -D__error_t_defined "
 do_configure_prepend () {
 	# Else these could be used in preference to those in aclocal-copy
 	rm -f ${S}/m4/gpg-error.m4

recipes-greenisland/greenisland/greenisland-native.bb

@@ -0,0 +1,13 @@
+require greenisland.inc
+
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:"
+
+inherit native
+
+DEPENDS += " \
+    qtbase-native \
+"
+
+SRC_URI += " \
+    file://0001-reduce-build-to-waylandscanner-for-native-build.patch \
+"

recipes-greenisland/greenisland/greenisland-native/0001-reduce-build-to-waylandscanner-for-native-build.patch

@@ -0,0 +1,64 @@
+From 60bf186466bf236582eef59f3822719cb531ed09 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 11 Mar 2016 18:55:42 +0100
+Subject: [PATCH] reduce build to waylandscanner for native build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ CMakeLists.txt       | 19 +++----------------
+ tools/CMakeLists.txt |  1 -
+ 2 files changed, 3 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 895ff5e..1dc5935 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,8 +72,9 @@ endif()
+ 
+ # Find Qt5
+ set(REQUIRED_QT_VERSION 5.6.0)
+-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Qml Quick)
++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core)
+ 
++if(False)
+ # OpenGL
+ find_package(OpenGL)
+ set_package_properties(OpenGL PROPERTIES
+@@ -151,23 +152,9 @@ add_feature_info("systemd" systemd_FOUND "Required for systemd integration")
+ # xkbcommon
+ pkg_check_modules(xkbcommon xkbcommon REQUIRED)
+ add_feature_info("xkbcommon" xkbcommon_FOUND "Required for keymap support")
++endif()
+ 
+-# Subdirectories
+-if(ENABLE_ONLY_EGLDEVICEINTEGRATION)
+-    add_subdirectory(plugins)
+-else()
+-    add_subdirectory(compositor)
+-    add_subdirectory(data)
+-    add_subdirectory(declarative)
+-    add_subdirectory(headers)
+-    add_subdirectory(launcher)
+-    add_subdirectory(plugins)
+-    add_subdirectory(qpa)
+-    add_subdirectory(shells)
+-    add_subdirectory(src)
+-    add_subdirectory(tests)
+     add_subdirectory(tools)
+-endif()
+ 
+ # Display featute summary
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index f8b167c..3bdf127 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -1,2 +1 @@
+-add_subdirectory(screencaster)
+ add_subdirectory(waylandscanner)
+-- 
+2.5.5
+

recipes-greenisland/greenisland/greenisland.bb

@@ -0,0 +1,53 @@
+require greenisland.inc
+
+inherit cmake_lib cmake_auto_align_paths
+
+DEPENDS += " \
+    ${BPN}-native \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+    wayland \
+    qtwayland \
+    libkscreen \
+    virtual/egl \
+    libinput \
+"
+SRC_URI += " \
+    file://0001-find-native-greenisland-wayland-scanner.patch \
+    file://0002-compositorlauncher-work-corrrectly-with-RaspberryPi-.patch \
+"
+
+# we don't have wayland-protocols yet - revisit
+EXTRA_OECMAKE += "-DUSE_LOCAL_WAYLAND_PROTOCOLS=ON"
+
+do_compile_append() {
+    for f in `find ${B} -name 'GreenIsland*.cmake'` ; do
+        sed -i 's:${STAGING_INCDIR}:${includedir}:g' "$f"
+        sed -i 's:${STAGING_LIBDIR}:${libdir}:g' "$f"
+    done
+}
+
+
+PACKAGECONFIG ??= " \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xwayland", "",d)} \
+"
+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;${base_libdir}/lib, -S;${STAGING_BASELIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[3] = "GreenIsland, -S${includedir}, -S${STAGING_INCDIR}"
+
+FILES_${PN} += " \
+    ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_QML}/GreenIsland \
+"
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_QML}/GreenIsland/.debug \
+"
+
+FILES_${PN}-dev += " \
+    ${libdir}/cmake \
+    ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \
+"

recipes-greenisland/greenisland/greenisland.inc

@@ -0,0 +1,22 @@
+SUMMARY = "Support library to make Qt-based Wayland compositors development easier"
+LICENSE = "LGPLv3 | GPLv2 | GPLv3"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
+    file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+"
+
+inherit hawaii pythonnative pkgconfig
+
+DEPENDS += " \
+    extra-cmake-modules-native \
+"
+SRC_URI = " \
+    git://github.com/greenisland/${BPN}.git;protocol=git;branch=develop \
+"
+
+SRCREV = "10e55c545177d037769e277bdbd8b4e3008f285d"
+PV = "0.8.1+git${SRCPV}"
+
+S = "${WORKDIR}/git"

recipes-greenisland/greenisland/greenisland/0001-find-native-greenisland-wayland-scanner.patch

@@ -0,0 +1,25 @@
+From 2af2ca532ade54a610f3fab506894f68f8ca6388 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 11 Mar 2016 21:10:34 +0100
+Subject: [PATCH] find native greenisland-wayland-scanner
+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/GreenIslandConfigExtrasLocal.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/server/GreenIslandServerConfigExtrasLocal.cmake b/src/server/GreenIslandServerConfigExtrasLocal.cmake
+index 321be30..b1f4da6 100644
+--- a/src/server/GreenIslandServerConfigExtrasLocal.cmake
++++ b/src/server/GreenIslandServerConfigExtrasLocal.cmake
+@@ -1,3 +1,3 @@
+ # GreenIslandConfigExtras.cmake copy that uses the local target
+ 
+-set(GreenIsland_WAYLAND_SCANNER_EXECUTABLE GreenIsland::greenisland-wayland-scanner)
++set(GreenIsland_WAYLAND_SCANNER_EXECUTABLE greenisland-wayland-scanner)
+-- 
+2.5.0
+

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_git.bb

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

@@ -1,14 +0,0 @@
-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-theme/hawaii-icon-theme_git.bb

@@ -0,0 +1,19 @@
+SUMMARY = "Icon themes for the Hawaii desktop environment"
+LICENSE = "GPLv3 & LGPLv3"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+"
+
+inherit hawaii gtk-icon-cache
+
+SRCREV = "4a0d806c28f25aa072d9c5b849ec48a565721b30"
+PV = "v0.8.0"
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "${datadir}/icons"
+
+RREPLACES_${PN} = "hawaii-icon-themes"
+RPROVIDES_${PN} = "hawaii-icon-themes"
+RCONFLICTS_${PN} = "hawaii-icon-themes"
+

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

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

@@ -1,21 +1,19 @@
 SUMMARY = "Hawaii desktop environment shell"
 LICENSE = "GPLv2 & LGPLv2"
 LIC_FILES_CHKSUM = " \
-	file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://LICENSE.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
+	file://LICENSE.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit hawaii pythonnative cmake-lib distro_features_check
+inherit hawaii systemd pythonnative 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"
+SRCREV = "d02a209082819e3bfa3edd167328b4ed52ebf6e1"
-PV = "0.5.91+git${SRCPV}"
+PV = "0.8.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -24,9 +22,8 @@ DEPENDS += " \
     wayland \
     libqtxdg \
     solid \
+    libhawaii \
     greenisland \
-    networkmanager-qt \
-    modemmanager-qt \
 "
 
 # REVISIT optionals
@@ -35,40 +32,27 @@ DEPENDS += " \
     pulseaudio \
 "
 
-PACKAGECONFIG[nm_qt] = "-DENABLE_NETWORK_MANAGER=ON,-DENABLE_NETWORK_MANAGER=OFF,networkmanager-qt"
+EXTRA_OECMAKE += " \
+    -DSYSTEMD_USER_UNIT_DIR=${systemd_system_unitdir} \
+"
+
+PACKAGECONFIG[nm_qt] = "-DENABLE_NETWORK_MANAGER=ON,-DENABLE_NETWORK_MANAGER=OFF,networkmanager-qt modemmanager-qt"
 PACKAGECONFIG ??= "nm_qt"
 
-# REVISIT/HACK: for unkown reasons libqtxdg libs are not found
+SYSTEMD_SERVICE_${PN} = "hawaii.service"
-LDFLAGS += "-lQt5Xdg"
 
-# starter scripts rely on bash qdbus catchsegv
+# for starter scripts
-RDEPENDS_${PN} = "bash qttools-tools qtwayland-plugins catchsegv"
+RDEPENDS_${PN} = "qttools-tools qtwayland-plugins"
 
 # REVISIT optionals
 RRECOMMENDS_${PN} += " \
+    fluid \
     hawaii-wallpapers \
-    hawaii-icon-themes \
+    hawaii-icon-theme \
-    weston \
 "
 
 FILES_${PN} += " \
     ${datadir} \
+    ${systemd_unitdir} \
     ${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

@@ -7,10 +7,15 @@ LIC_FILES_CHKSUM = " \
 
 inherit hawaii
 
-DEPENDS += "polkit-qt-1 kscreen"
+DEPENDS += " \
+    greenisland \
+    libhawaii \
+    polkit-qt-1 \
+    kscreen \
+"
 
-SRCREV = "5d9d32762151f7306fcb0c6798d2e4a940f57f2f"
+SRCREV = "f1ce43687a0c9dcdbf0cd5640d38bbbc348dd123"
-PV = "0.4.0+git${SRCPV}"
+PV = "0.8.0"
 S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += "-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools"
@@ -19,6 +24,10 @@ FILES_${PN} += " \
     ${OE_QMAKE_PATH_QML} \
 "
 
-FILES_${PN}-dbg += " \
+FILES_${PN}-dev += " \
-    ${OE_QMAKE_PATH_QML}/org/hawaii/systempreferences/*/.debug \
+    ${libdir}/cmake \
 "
+
+# cross libs / headers
+CMAKE_ALIGN_SYSROOT[1] = "HawaiiSystemPreferences, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "HawaiiSystemPreferences, -S${includedir}, -S${STAGING_INCDIR}"

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

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

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 = "bc6678a242a8439488e0f57ddefdbb1eed5eabf2"
+SRCREV = "9aaaf3b8681dc2253d812aa7f37b8ed5e1651959"
-PV = "0.5.0+git${SRCPV}"
+PV = "0.8.0"
 
 S = "${WORKDIR}/git"
 

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

@@ -0,0 +1,33 @@
+SUMMARY = "Base applications for Hawaii"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+	file://LICENSE.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://LICENSE.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit hawaii systemd
+
+DEPENDS += " \
+    libhawaii \
+    greenisland \
+    polkit-qt-1 \
+    qt-gstreamer \
+"
+
+SRCREV = "6dd502e199596dabab8be77efaf164823a8ead65"
+PV = "0.8.1"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += " \
+    -DSYSTEMD_USER_UNIT_DIR=${systemd_system_unitdir} \
+"
+
+FILES_${PN} += " \
+    ${datadir}/glib-2.0 \
+    ${datadir}/desktop-directories \
+    ${OE_QMAKE_PATH_PLUGINS} \
+"
+
+RREPLACES_${PN} = "hawaii-baseapps"
+RPROVIDES_${PN} = "hawaii-baseapps"
+RCONFLICTS_${PN} = "hawaii-baseapps"

recipes-hawaii/libhawaii/libhawaii_git.bb

@@ -0,0 +1,17 @@
+SUMMARY = "Library shared among Hawaii Shell and other projects"
+LICENSE = "GPLv2 & LGPLv3"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+"
+
+inherit hawaii
+
+PV = "0.8.0"
+
+SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
+SRCREV = "f9cb7389a7881bf924ead7ae4b409c83b7e7a454"
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "${OE_QMAKE_PATH_QML}"
+FILES_${PN}-dev += "${libdir}/cmake"

recipes-hawaii/packagegroups/hawaii-world.bb

@@ -7,14 +7,16 @@ inherit packagegroup
 RDEPENDS_${PN} = " \
     cinema \
     eyesight \
+    fluid \
     greenisland \
-    hawaii-baseapps \
+    hawaii-icon-theme \
-    hawaii-icon-themes \
     ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "hawaii-shell", "",d)} \
     hawaii-system-preferences \
     hawaii-terminal \
     hawaii-wallpapers \
     hawaii-widget-styles \
+    hawaii-workspace \
+    libhawaii \
     qtaccountsservice \
     qtconfiguration \
     swordfish \

recipes-hawaii/qtaccountsservice/qtaccountsservice_git.bb

@@ -1,16 +1,17 @@
 SUMMARY = "Qt-style API to use freedesktop.org's AccountsService DBus service"
-LICENSE = "GPLv2 & LGPLv2.1 & GFDL-1.3"
+LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
+    file://LICENSE.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSE.LGPLv21;md5=4fbd65380cdd255951079008b364516c \
 "
 
 inherit hawaii
 
 SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
-SRCREV = "2624cc812ae14bf9abee9634de0f4cc0ee0a5926"
+SRCREV = "74728c9f092ba7166b96414cb85e268f3c3ed4d1"
 
 S = "${WORKDIR}/git"
-PV = "0.6.0"
+PV = "0.6.0+git${SRCPV}"
 
 FILES_${PN} += "${OE_QMAKE_PATH_QML}/QtAccountsService"
 FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/QtAccountsService/.debug"

recipes-hawaii/qtconfiguration/qtconfiguration_0.3.1.bb

@@ -7,17 +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"
+SRC_URI = " \
-SRCREV = "804739d73de982fc144ff45653c243cefcfa79cb"
+    git://github.com/hawaii-desktop/${BPN}.git \
+"
+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

@@ -0,0 +1,43 @@
+SUMMARY = "Ark is KDE's file archiver"
+LICENSE = "GPLv2 & LGPLv3"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
+    file://COPYING.icons;md5=6e01bfa20e899e8ad569d5488923cbd2 \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += "\
+    libarchive \
+    karchive \
+    kconfig \
+    kcrash \
+    kdbusaddons \
+    kdoctools \
+    ki18n \
+    kiconthemes \
+    khtml \
+    kio \
+    kservice \
+    kpty \
+    kwidgetsaddons \
+" 
+
+PV = "${KDE_APP_VERSION}"
+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} \
+"
+
+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

@@ -0,0 +1,42 @@
+From b7285c71f5b04bc55441217bf963078b38d6bad4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 11 Oct 2015 21:41:27 +0200
+Subject: [PATCH] fix build with QT_NO_SESSIONMANAGER set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ app/main.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/app/main.cpp b/app/main.cpp
+index a9539b5..91f96ab 100644
+--- a/app/main.cpp
++++ b/app/main.cpp
+@@ -178,6 +178,7 @@ int main(int argc, char **argv)
+     // This is needed to prevent Dolphin from freezing when opening an archive.
+     KDBusService dbusService(KDBusService::Multiple);
+ 
++#ifndef QT_NO_SESSIONMANAGER
+     // Session restoring.
+     if (application.isSessionRestored()) {
+         if (!KMainWindow::canBeRestored(1)) {
+@@ -190,8 +191,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).
++#endif
++    {
+         // Open any given URLs.
+         const QStringList urls = parser.positionalArguments();
+ 
+-- 
+2.5.5
+

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] = "0180479093fa5b1fcd915c058d99dd37"
+SRC_URI[md5sum] = "5d3f8f89d833033794b170e6b9db4cbd"
-SRC_URI[sha256sum] = "3f42c9c6fab0fe40b42cad455800f577dc6fa45d282ccc27a26ef200abe2c967"
+SRC_URI[sha256sum] = "4bff2f4abd9d65f39e2b44189312bac139908362e8888c114bbf3d107902217c"
-
-# 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}"
-

recipes-kde/apps/bovo/bovo.bb

@@ -0,0 +1,26 @@
+SUMMARY = "Bovo is a Gomoku like game for two players"
+DESCRIPTION = "Bovo is a Gomoku (from Japanese 五目並べ - lit. 'five points') like game for two players, where the opponents alternate in placing their respective pictogram on the game board. (Also known as: Connect Five, Five in a row, X and O, Naughts and Crosses)"
+LICENSE = "GPLv2 & GFDL-1.2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=3c8ea28d12b8a786603a5394fc50096d \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += "\
+    kcoreaddons \
+    kdbusaddons \
+    kdoctools \
+    kxmlgui \
+    libkdegames \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "ec6c38f965585beaba124eb78cce40fd"
+SRC_URI[sha256sum] = "7dba4db8e72fdbe6fb552b4d8428676cf5cc490456518b918a650b616f8660b6"
+
+FILES_${PN} += " \
+    ${datadir}/kxmlgui5 \
+    ${datadir}/icons \
+"

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

@@ -13,8 +13,8 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "800309abf7c1a2d82a97bf261b31a770"
+SRC_URI[md5sum] = "c33684a8b47e439e68775a164455fb54"
-SRC_URI[sha256sum] = "f4657968dd6a69469cbfc7ef20c4ff8b33bf670ce417ee7d5893c4c839694f89"
+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] = "11760d094c2c3e3fff0e89b81d4db118"
+SRC_URI[md5sum] = "149165d7954bfef08747e5bb7252a277"
-SRC_URI[sha256sum] = "7ac16d7150b7c5e1d6350cf679981d675c995303a7f68eab1290763d3fd35ad9"
+SRC_URI[sha256sum] = "b02bbfbe6d3f8eef6a6fd9b6ff6f5e90b47ad27c9f2e7ebcd25346287490fa6e"
 SRC_URI += " \
     file://0001-align-paths-to-phonon.patch \
     file://0002-fix-build-for-qtbase-without-session-management.patch \
@@ -43,7 +43,9 @@ SRC_URI += " \
 FILES_SOLIBSDEV = "${libdir}/libdolphin*${SOLIBSDEV}"
 
 FILES_${PN} += " \
-    ${datadir} \
+    ${datadir}/config.kcfg \
+    ${datadir}/k*5 \
+    ${datadir}/dbus-1 \
     ${libdir}/libkdeinit5_dolphin.so \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
@@ -51,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/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->isSessionRestored()) {
+     if (qApp->isSavingSession()) {
          closedByUser = false;
      }
 +#endif

recipes-kde/apps/dragon/dragon.bb

@@ -0,0 +1,44 @@
+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
+
+DEPENDS += " \
+    phonon \
+    \
+    kconfig \
+    kconfigwidgets \
+    kcoreaddons \
+    kcrash \
+    kdbusaddons \
+    kdoctools \
+    ki18n \
+    kjobwidgets \
+    kio \
+    kparts \
+    solid \
+    kwidgetsaddons \
+    kwindowsystem \
+    kxmlgui \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "0e5ca33aab8fdd0462494119e715195d"
+SRC_URI[sha256sum] = "3302f189878ab5d337035bc73b3e0e753e2bfb1a995f5e5810cbc0304dc26092"
+
+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

@@ -18,8 +18,8 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "6d11da9a7aa087483727ad4b73083be6"
+SRC_URI[md5sum] = "2bac6bc332a44b9120ec1b7b8dbcc583"
-SRC_URI[sha256sum] = "dbb627b001421b4f653aff005ca97bc7de1240a5bab339b3a2483a4ceea44878"
+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-Set-Kipi-package-properties.patch

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

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

@@ -0,0 +1,40 @@
+SUMMARY = "A fast and easy to use image viewer for KDE"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b"
+
+inherit kde-apps
+
+DEPENDS += " \
+    jpeg \
+    exiv2 \
+    lcms \
+    phonon \
+    kdelibs4support \
+    kded \
+    kactivities \
+    kcoreaddons \
+    kxmlgui \
+    kfilemetadata \
+    baloo \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "1d1ac5a3f9f9639b898db4008b9b52e6"
+SRC_URI[sha256sum] = "255df6966b34278a3375880ff6ff31000cc52ea69285e5da5e95a3c4ff782c64"
+
+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 \
+    ${OE_QMAKE_PATH_PLUGINS} \
+"
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+"

recipes-kde/apps/kapman/kapman.bb

@@ -1,4 +1,7 @@
 SUMMARY = "Kapman is a clone of the well known game Pac-Man"
+DESCRIPTION = "Kapman is a clone of the well known game Pac-Man.\
+\
+You must run through the maze to eat all pills without being captured by a ghost. By eating an energizer, Kapman gets the ability to eat ghosts for a few seconds. When a stage is cleared of pills and energizer the player is taken to the next stage with slightly increased game speed."
 LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -21,11 +24,10 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "986696147ec64e5d3ca96815ee3f7c73"
+SRC_URI[md5sum] = "acc85096197530e2e02cb877cef3ce1f"
-SRC_URI[sha256sum] = "b87a50b277c20fba2cb217bb2328e80de5e9dbdd098a0ccc87f58226c96a48b6"
+SRC_URI[sha256sum] = "06addd40448ba9d7f58231b5bfcfa2d9ff94d19e726a5ef320d8dd1cd599bdf3"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
-    ${datadir}/appdata \
 "

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

@@ -9,15 +9,15 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- kate/src/kateapp.cpp        | 5 ++++-
+ kate/kateapp.cpp            | 5 ++++-
- kate/src/katemainwindow.cpp | 2 ++
+ kate/katemainwindow.cpp     | 2 ++
  kwrite/main.cpp             | 5 ++++-
  3 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/kate/src/kateapp.cpp b/kate/src/kateapp.cpp
 index 4c26f33..03fd159 100644
---- a/kate/src/kateapp.cpp
+--- a/kate/kateapp.cpp
-+++ b/kate/src/kateapp.cpp
++++ b/kate/kateapp.cpp
 @@ -99,10 +99,13 @@ bool KateApp::init()
      // set KATE_PID for use in child processes
      qputenv("KATE_PID", QString::fromLatin1("%1").arg(QCoreApplication::applicationPid()).toLatin1().constData());
@@ -35,8 +35,8 @@ index 4c26f33..03fd159 100644
          if (!startupKate()) {
 diff --git a/kate/src/katemainwindow.cpp b/kate/src/katemainwindow.cpp
 index 464e20c..8efc401 100644
---- a/kate/src/katemainwindow.cpp
+--- a/kate/katemainwindow.cpp
-+++ b/kate/src/katemainwindow.cpp
++++ b/kate/katemainwindow.cpp
 @@ -467,9 +467,11 @@ bool KateMainWindow::queryClose()
  {
      // session saving, can we close all views ?

recipes-kde/apps/kate/files/0002-fix-build-for-sessionless-kconfig.patch

@@ -8,14 +8,14 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- kate/src/kateapp.cpp | 2 ++
+ kate/kateapp.cpp   | 2 ++
- kwrite/kwrite.cpp    | 2 ++
+ kwrite/kwrite.cpp  | 2 ++
  2 files changed, 4 insertions(+)
 
-diff --git a/kate/src/kateapp.cpp b/kate/src/kateapp.cpp
+diff --git a/kate/kateapp.cpp b/kate/kateapp.cpp
 index 03fd159..ae2c793 100644
---- a/kate/src/kateapp.cpp
+--- a/kate/kateapp.cpp
-+++ b/kate/src/kateapp.cpp
++++ b/kate/kateapp.cpp
 @@ -121,6 +121,7 @@ bool KateApp::init()
  
  void KateApp::restoreKate()

recipes-kde/apps/kate/kate.bb

@@ -30,8 +30,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "fdc3f4b38f7595434d4148494f546132"
+SRC_URI[md5sum] = "ac0dbaa0f0b06e3cc96e9f87ea321f42"
-SRC_URI[sha256sum] = "834bd05c2e565d030cb58e47ae5a1bc0f487242bcca7b8d54de0fd73ace13656"
+SRC_URI[sha256sum] = "984a82005897b553eab0525715b626f7467bc1d664b29ac7944860cd1d7012dc"
 
 SRC_URI += " \
     file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
@@ -46,7 +46,6 @@ 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 826f6f8..a0e66e6 100644
+index ec62c67..fd0c921 100644
 --- a/main.cpp
 +++ b/main.cpp
-@@ -86,9 +86,12 @@ int main(int argc, char **argv)
+@@ -89,9 +89,12 @@ int main(int argc, char **argv)
-   }
+     }
-   else
+     else
-   {
+     {
 +#ifndef QT_NO_SESSIONMANAGER
-       if ( app.isSessionRestored() )
+         if ( app.isSessionRestored() )
-           RESTORE(AtomTopLevel)
+             RESTORE(AtomTopLevel)
--      else {
+-        else {
-+      else
++        else
 +#endif
-+      {
++        {
-           AtomTopLevel *top = new AtomTopLevel;
+             AtomTopLevel *top = new AtomTopLevel;
-           if ( parser.isSet( "hackmode" ) )
+             if ( parser.isSet( QStringLiteral("hackmode") ) )
-               top->enableHackMode();
+                 top->enableHackMode();
 -- 
-1.9.3
+2.5.5
 

recipes-kde/apps/katomic/katomic.bb

@@ -1,11 +1,12 @@
 SUMMARY = "Katomic is a fun and educational game built around molecular geometry"
+DESCRIPTION = "KAtomic is a fun educational game built around molecular geometry. It employs simplistic two-dimensional looks at different chemical elements."
 LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps
+inherit kde-apps gtk-icon-cache
 
 DEPENDS += "\
     kcoreaddons \
@@ -24,10 +25,12 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "5e336006d70b9786ae9d50c861af6c18"
+SRC_URI[md5sum] = "64f10e943903513cadae909b280f6fd6"
-SRC_URI[sha256sum] = "03f190d17aef394b1eeb37ff70eeaa7e7280865eb01149ebee48f2083e1663a8"
+SRC_URI[sha256sum] = "57f4fc75c3383dacdfb7c7ad56c3da12878d4edff1079562af610c79695e54bd"
 SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
 
 FILES_${PN} += " \
-    ${datadir} \
+    ${datadir}/kxmlgui5 \
+    ${datadir}/kconf_update \
+    ${datadir}/icons \
 "

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

@@ -0,0 +1,36 @@
+From 616528cad6a98b2604eb8365f55538a738e7db2e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 11 Oct 2015 21:34:06 +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 311268d..e0257f1 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -84,9 +84,12 @@ int main(int argc, char **argv)
+ 
+     KDBusService service;
+ 
++#ifndef QT_NO_SESSIONMANAGER
+     if (app.isSessionRestored())
+         RESTORE(KBounceMainWindow)
+-    else {
++    else
++#endif
++    {
+         KBounceMainWindow *w = new KBounceMainWindow;
+         w->show();
+     }
+-- 
+2.5.5
+

recipes-kde/apps/kbounce/kbounce.bb

@@ -0,0 +1,36 @@
+SUMMARY = "KBounce is a single player arcade game with the elements of puzzle"
+DESCRIPTION = "KBounce is a single player arcade game with the elements of puzzle. It is played on a field, surrounded by wall, with two or more balls bouncing around within the walls. The object of the game is to build new walls to decrease the size of the active field."
+LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+"
+
+inherit kde-apps
+
+DEPENDS += "\
+    kcoreaddons \
+    kconfig \
+    kdbusaddons  \
+    ki18n \
+    kguiaddons \
+    kconfigwidgets \
+    kiconthemes \
+    kcompletion \
+    ktextwidgets \
+    kxmlgui \
+    kio \
+    knotifyconfig \
+    libkdegames \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "e492a200a396cb0b76c675f1707d3e6d"
+SRC_URI[sha256sum] = "8ecdc1d391a8ede5db1eda50c7d212d6b5b4169bb74cb1c8bc6e630ace8c3481"
+SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
+
+FILES_${PN} += " \
+    ${datadir}/kxmlgui5 \
+    ${datadir}/icons \
+"

recipes-kde/apps/kcalc/kcalc.bb

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

recipes-kde/apps/kcolorchooser/kcolorchooser.bb

@@ -0,0 +1,21 @@
+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 += "\
+    ki18n \
+    kwidgetsaddons \
+    kxmlgui \
+" 
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "874e95369735955d827eff0aa69e65d3"
+SRC_URI[sha256sum] = "7fe83e765be9de06bde1535e55ef7eb974c78ae8b2b232cc92f5ee71ea1307ef"
+
+FILES_${PN} += " \
+    ${datadir}/icons \
+"

recipes-kde/apps/kdenlive/kdenlive.bb

@@ -9,12 +9,14 @@ inherit kde-apps gtk-icon-cache
 DEPENDS += "\
     mlt \
     qtsvg \
+    qtwebkit \
     karchive \
     kbookmarks \
     kcoreaddons \
     kconfig \
     kconfigwidgets \
     kdbusaddons \
+    kfilemetadata \
     kio \
     kwidgetsaddons \
     kplotting \
@@ -26,13 +28,16 @@ DEPENDS += "\
     ktextwidgets \
     kiconthemes \
     kdoctools \
+    xapian-core \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "3a08051a2abfbfe2343df70f06630c4a"
+SRC_URI[md5sum] = "3c906a40f0c5649f4b1b68f4693352dc"
-SRC_URI[sha256sum] = "3768ee66dc48bf1a506284e0c39f2e61ca9467a484d50987f3d9c2c1863e4274"
+SRC_URI[sha256sum] = "bca5e9293326aecd6ae295f9f579ba5d7880baf54183cb0a8d8c708f4f04768d"
 
-SRC_URI += "file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch"
+SRC_URI += " \
+    file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \
+"
 EXTRA_OECMAKE += "-DMLT_PREFIX=${prefix}"
 
 FILES_${PN} += " \
@@ -41,10 +46,11 @@ 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

@@ -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/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch

@@ -0,0 +1,38 @@
+From cb9bb7f24cd21fb0fa1742a4316ad489f6c8cf6d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 11 Oct 2015 21:24:16 +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>
+---
+ src/main.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index b27de6f..556fb16 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -70,10 +70,14 @@ int main(int argc, char **argv)
+         KgDifficultyLevel::VeryHard
+     );
+     KDBusService service;
++#ifndef QT_NO_SESSIONMANAGER
+     // see if we are starting with session management
+     if (app.isSessionRestored()) {
+         RESTORE(MainWindow);
+-    } else {
++    }
++    else
++#endif
++    {
+         MainWindow *window = new MainWindow;
+         window->show();
+     }
+-- 
+2.1.0
+

recipes-kde/apps/kdiamond/kdiamond.bb

@@ -0,0 +1,35 @@
+SUMMARY = "KDiamond is a single player puzzle game"
+DESCRIPTION = "KDiamond is a single player puzzle game. The object of the game is to build lines of three similar diamonds."
+LICENSE = "GPLv2 & GFDL-1.2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+"
+
+inherit kde-apps
+
+DEPENDS += "\
+    kcoreaddons \
+    kconfig \
+    kdbusaddons \
+    kdoctools \
+    kwidgetsaddons \
+    ki18n \
+    kguiaddons \
+    kconfigwidgets \
+    kiconthemes \
+    kxmlgui \
+    knotifications \
+    knotifyconfig \
+    libkdegames \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "ab07c48b7b3155a5f049a35bf1a6fcc3"
+SRC_URI[sha256sum] = "6bf47c486d4b7d8138522579ea7013a9c5967c59bedcf6095251d3f951d77a9b"
+SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
+
+FILES_${PN} += " \
+    ${datadir}/k*5 \
+    ${datadir}/icons \
+"

recipes-kde/apps/khelpcenter/files/0001-fix-build-for-qtbase-without-session-management.patch

@@ -12,10 +12,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/application.cpp b/application.cpp
-index d29234d..5570879 100644
+index 373910a..1e8a247 100644
 --- a/application.cpp
 +++ b/application.cpp
-@@ -54,10 +54,12 @@ void Application::activate(const QStringList& args, const QString &workingDirect
+@@ -66,10 +66,12 @@ void Application::activate(const QStringList& args, const QString &workingDirect
  
    if( !mMainWindow )
    {
@@ -28,9 +28,9 @@ index d29234d..5570879 100644
      mMainWindow = new MainWindow;
    }
  
-@@ -92,10 +94,12 @@ extern "C" int Q_DECL_EXPORT kdemain( int argc, char **argv )
+@@ -112,10 +114,12 @@ extern "C" int Q_DECL_EXPORT kdemain( int argc, char **argv )
  
-   app.activate(app.arguments(), QDir::currentPath());
+   QObject::connect( &service, &KDBusService::activateRequested, &app, &Application::activate );
  
 +#ifndef QT_NO_SESSIONMANAGER
    if ( app.isSessionRestored() )
@@ -42,5 +42,5 @@ index d29234d..5570879 100644
    return app.exec();
  }
 -- 
-1.8.3.1
+2.5.5
 

recipes-kde/apps/khelpcenter/khelpcenter.bb

@@ -4,25 +4,33 @@ LIC_FILES_CHKSUM = " \
     file://COPYING;md5=7108e5acd7ce861dee282297d7c2f38c \
 "
 
-inherit kde-plasma
+inherit kde-apps
 
 DEPENDS += " \
+    grantlee \
+    xapian-core \
+    \
+    karchive \
+    kbookmarks \
     kconfig \
+    kcoreaddons \
+    kdbusaddons \
+    kdoctools \
+    ki18n \
     kinit \
-    kcmutils \
     khtml \
-    kdelibs4support \
+    kservice \
+    kwindowsystem \
     \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
 "
 
-PV = "${PLASMA_VERSION}"
+PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "5d2194b24c9800698c85a1f17d438d3f"
+SRC_URI[md5sum] = "2690a92fc8edf166c5643ccdeb9e5deb"
-SRC_URI[sha256sum] = "8f4431198efe0ceded634b3b98ba744a6b315431a25be01b9e66d3fd84447e57"
+SRC_URI[sha256sum] = "648842ec7dd417d76f0b1bf8649e993f10bbc0fc37e5eaf31dcea83d6ed052df"
 
 SRC_URI += " \
     file://0001-fix-build-for-qtbase-without-session-management.patch \
-    file://0002-fix-path-to-khc_indexbuilder.patch \
 "
 
 # do not move so-libs to -dev package

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

@@ -14,6 +14,8 @@ inherit kde-apps
 DEPENDS += " \
     qtsvg \
     \
+    exiv2 \
+    kactivities \
     karchive \
     kconfig \
     kconfigwidgets \
@@ -42,8 +44,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "4e2bb6dc68355e874d0a4e5fbd6c4669"
+SRC_URI[md5sum] = "7afd2a4e1f645ef45450c1087e42206e"
-SRC_URI[sha256sum] = "b72384e7ad29a7eca7bce344cf1a8f48cd557444bd0afeced01c817826f3e074"
+SRC_URI[sha256sum] = "2cb558a7658894ee67f9318bbd98949b8eda425e5a30ca2af761e5d54d807093"
 
 FILES_${PN} += " \
     ${datadir}/kio_bookmarks \
@@ -64,5 +66,5 @@ FILES_${PN} += " \
 
 FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_PLUGINS}/.debug \
-    ${OE_QMAKE_PATH_PLUGINS}/kf5/kio/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \
 "

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

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

recipes-kde/apps/kmix/kmix.bb

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

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,16 +36,14 @@ DEPENDS += " \
 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "00d056cc45aa5ac06dde4f2796ac79ce"
+SRC_URI[md5sum] = "ebe57e74bbcf6311eb449af12032583a"
-SRC_URI[sha256sum] = "de5f504f9b036f85a771dc60fb5f161a78c99d71ecc6f3d9de1df91a56f795ce"
+SRC_URI[sha256sum] = "d5a242c8e23c4002736402ef5ecbb840b60e0e149fc92b480223dfeb7647335a"
-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}/appdata \
     ${OE_QMAKE_PATH_PLUGINS} \
     ${libdir}/libkdeinit5_konsole.so \
 "

recipes-kde/apps/krita/files/0001-fix-build-with-GLES2.patch

@@ -0,0 +1,155 @@
+From a13f4cb491973ece28266bef9aa54706f0393fc6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 7 Jun 2016 00:04:14 +0200
+Subject: [PATCH] fix build with GLES2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ libs/ui/canvas/kis_mirror_axis.cpp           | 15 -------
+ libs/ui/opengl/kis_opengl_canvas2.cpp        |  6 +--
+ libs/ui/opengl/kis_opengl_image_textures.cpp | 60 +++-------------------------
+ 3 files changed, 8 insertions(+), 73 deletions(-)
+
+diff --git a/libs/ui/canvas/kis_mirror_axis.cpp b/libs/ui/canvas/kis_mirror_axis.cpp
+index 468dbf4..4823f39 100644
+--- a/libs/ui/canvas/kis_mirror_axis.cpp
++++ b/libs/ui/canvas/kis_mirror_axis.cpp
+@@ -144,16 +144,6 @@ void KisMirrorAxis::drawDecoration(QPainter& gc, const QRectF& updateArea, const
+     gc.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+ 
+     QOpenGLContext *ctx = QOpenGLContext::currentContext();
+-    bool hasMultisample = ((gc.paintEngine()->type() == QPaintEngine::OpenGL2) &&
+-                           (ctx->hasExtension("GL_ARB_multisample")));
+-
+-    // QPainter cannot anti-alias the edges of circles etc. when using OpenGL
+-    // So instead, use native OpenGL anti-aliasing when available.
+-    if (hasMultisample) {
+-        gc.beginNativePainting();
+-        ctx->functions()->glEnable(GL_MULTISAMPLE);
+-        gc.endNativePainting();
+-    }
+ 
+     float halfHandleSize = d->handleSize / 2;
+ 
+@@ -207,11 +197,6 @@ void KisMirrorAxis::drawDecoration(QPainter& gc, const QRectF& updateArea, const
+         }
+     }
+ 
+-    if (hasMultisample) {
+-        gc.beginNativePainting();
+-        ctx->functions()->glDisable(GL_MULTISAMPLE);
+-        gc.endNativePainting();
+-    }
+ 
+ }
+ 
+diff --git a/libs/ui/opengl/kis_opengl_canvas2.cpp b/libs/ui/opengl/kis_opengl_canvas2.cpp
+index 91149c3..0f6d0f0 100644
+--- a/libs/ui/opengl/kis_opengl_canvas2.cpp
++++ b/libs/ui/opengl/kis_opengl_canvas2.cpp
+@@ -303,7 +303,7 @@ void KisOpenGLCanvas2::paintToolOutline(const QPainterPath &path)
+     modelMatrix = projectionMatrix * modelMatrix;
+     cursorShader->setUniformValue(d->cursorShaderModelViewProjectionUniform, modelMatrix);
+ 
+-    glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
++    /*glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
+ 
+     // XXX: glLogicOp not in ES 2.0 -- it would be better to use another method.
+     // It is defined in 3.1 core profile onward.
+@@ -312,7 +312,7 @@ void KisOpenGLCanvas2::paintToolOutline(const QPainterPath &path)
+     glEnable(GL_COLOR_LOGIC_OP);
+     if (ptr_glLogicOp) {
+         ptr_glLogicOp(GL_XOR);
+-    }
++    }*/
+ 
+     // setup the array of vertices
+     QVector<QVector3D> vertices;
+@@ -331,7 +331,7 @@ void KisOpenGLCanvas2::paintToolOutline(const QPainterPath &path)
+         vertices.clear();
+     }
+ 
+-    glDisable(GL_COLOR_LOGIC_OP);
++    //glDisable(GL_COLOR_LOGIC_OP);
+ 
+     cursorShader->release();
+ 
+diff --git a/libs/ui/opengl/kis_opengl_image_textures.cpp b/libs/ui/opengl/kis_opengl_image_textures.cpp
+index 835d41e..c16d0e7 100644
+--- a/libs/ui/opengl/kis_opengl_image_textures.cpp
++++ b/libs/ui/opengl/kis_opengl_image_textures.cpp
+@@ -511,63 +511,13 @@ void KisOpenGLImageTextures::updateTextureFormat()
+     dbgUI << "Choosing texture format:";
+ 
+     if (colorModelId == RGBAColorModelID) {
+-        if (colorDepthId == Float16BitsColorDepthID) {
+-
+-            if (ctx->hasExtension("GL_ARB_texture_float")) {
+-                m_texturesInfo.internalFormat = GL_RGBA16F_ARB;
+-                dbgUI << "Using ARB half";
+-            }
+-            else if (ctx->hasExtension("GL_ATI_texture_float")) {
+-                m_texturesInfo.internalFormat = GL_RGBA_FLOAT16_ATI;
+-                dbgUI << "Using ATI half";
+-            }
+-
+-            bool haveBuiltInOpenExr = false;
+-#ifdef HAVE_OPENEXR
+-            haveBuiltInOpenExr = true;
+-#endif
+-
+-            if (haveBuiltInOpenExr && ctx->hasExtension("GL_ARB_half_float_pixel")) {
+-                m_texturesInfo.type = GL_HALF_FLOAT_ARB;
+-                destinationColorDepthId = Float16BitsColorDepthID;
+-                dbgUI << "Pixel type half";
+-            } else {
+-                m_texturesInfo.type = GL_FLOAT;
+-                destinationColorDepthId = Float32BitsColorDepthID;
+-                dbgUI << "Pixel type float";
+-            }
++        if (colorDepthId == Float16BitsColorDepthID ||
++            colorDepthId == Float32BitsColorDepthID) {
++			m_texturesInfo.type = GL_FLOAT;
++			destinationColorDepthId = Float32BitsColorDepthID;
++			dbgUI << "Pixel type float";
+             m_texturesInfo.format = GL_RGBA;
+         }
+-        else if (colorDepthId == Float32BitsColorDepthID) {
+-            if (ctx->hasExtension("GL_ARB_texture_float")) {
+-                m_texturesInfo.internalFormat = GL_RGBA32F_ARB;
+-                dbgUI << "Using ARB float";
+-            } else if (ctx->hasExtension("GL_ATI_texture_float")) {
+-                m_texturesInfo.internalFormat = GL_RGBA_FLOAT32_ATI;
+-                dbgUI << "Using ATI float";
+-            }
+-
+-            m_texturesInfo.type = GL_FLOAT;
+-            m_texturesInfo.format = GL_RGBA;
+-            destinationColorDepthId = Float32BitsColorDepthID;
+-        }
+-        else if (colorDepthId == Integer16BitsColorDepthID) {
+-            m_texturesInfo.internalFormat = GL_RGBA16;
+-            m_texturesInfo.type = GL_UNSIGNED_SHORT;
+-            m_texturesInfo.format = GL_BGRA;
+-            destinationColorDepthId = Integer16BitsColorDepthID;
+-            dbgUI << "Using 16 bits rgba";
+-        }
+-    }
+-    else {
+-        // We will convert the colorspace to 16 bits rgba, instead of 8 bits
+-        if (colorDepthId == Integer16BitsColorDepthID) {
+-            m_texturesInfo.internalFormat = GL_RGBA16;
+-            m_texturesInfo.type = GL_UNSIGNED_SHORT;
+-            m_texturesInfo.format = GL_BGRA;
+-            destinationColorDepthId = Integer16BitsColorDepthID;
+-            dbgUI << "Using conversion to 16 bits rgba";
+-        }
+     }
+ 
+     if (!m_internalColorManagementActive &&
+-- 
+2.5.5
+

recipes-kde/apps/krita/krita.bb

@@ -0,0 +1,58 @@
+SUMMARY = "Krita is a free digital painting application"
+LICENSE = "GPLv2 & BSD & LGPL-2.0"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=8608b1f74c58ebcb11718f46e8619749 \
+    file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
+    file://COPYING.LIB;md5=cc4eecf2379e7a2a5f3d0441d680f82a \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += " \
+    curl \
+    poppler \
+    boost \
+    libraw \
+    libeigen \
+    exiv2 \
+    fftw \
+    \
+    karchive \
+    kconfig \
+    kwidgetsaddons \
+    kcompletion \
+    kcoreaddons \
+    kguiaddons \
+    ki18n \
+    kitemmodels \
+    kitemviews \
+    kwindowsystem \
+    kio \
+    kcrash \
+"
+
+PV = "3.1.1"
+SRC_URI = " \
+    ${KDE_MIRROR}/stable/krita/${PV}/${BPN}-${PV}.tar.gz \
+    file://0001-fix-build-with-GLES2.patch \
+"
+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

@@ -0,0 +1,26 @@
+SUMMARY = "KDE SystemLog Application"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += " \
+    kxmlgui \
+    kcoreaddons \
+    kwidgetsaddons \
+    kitemviews \
+    kio \
+    kconfig \
+    karchive \
+    kdoctools \
+    kcompletion \
+    ktextwidgets \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "ff692ae5a71862ffc40eba8296470083"
+SRC_URI[sha256sum] = "06c1ef9378ac0477247627a2d0f1dfd659cbb5f76da790e17199d9ba3fc35c56"
+
+FILES_${PN} += "${datadir}/kxmlgui5"

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

@@ -0,0 +1,37 @@
+From 6ec28a23f2850f6e06e3637b8af2bb956f5a448b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 11 Oct 2015 18:21:50 +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>
+---
+ src/manager/kwalletmanager.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/manager/kwalletmanager.cpp b/src/manager/kwalletmanager.cpp
+index 64a90dd..6ff9c88 100644
+--- a/src/manager/kwalletmanager.cpp
++++ b/src/manager/kwalletmanager.cpp
+@@ -101,12 +101,14 @@ void KWalletManager::configUI() {
+                 break;
+             }
+         }
++#ifndef QT_NO_SESSIONMANAGER
+         if (!isOpen && qApp->isSessionRestored()) {
+             delete _tray;
+             _tray = 0;
+             QTimer::singleShot(0, qApp, SLOT(quit()));
+             return;
+         }
++#endif
+     } else {
+         _tray = 0;
+     }
+-- 
+2.1.0
+

recipes-kde/apps/kwalletmanager/kwalletmanager.bb

@@ -0,0 +1,42 @@
+SUMMARY = "KDE Wallet Manager is a tool to manage the passwords on your KDE system"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
+    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += " \
+    kcoreaddons \
+    kdoctools \
+    kauth \
+    kwallet \
+    kservice \
+    kcmutils \
+    kdelibs4support \
+    ki18n \
+    kxmlgui \
+    kconfig \
+    kconfigwidgets \
+    kdbusaddons \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "26f200d763f3f2545631938edff10089"
+SRC_URI[sha256sum] = "c126171e517a070be54a24c6f0a38c190fb630f75c174567a231f1b4337e729a"
+SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
+
+FILES_${PN} += " \
+    ${datadir}/dbus-1 \
+    ${datadir}/polkit-1 \
+    ${datadir}/icons \
+    ${datadir}/k*5 \
+    ${libdir}/kauth \
+    ${OE_QMAKE_PATH_PLUGINS} \
+"
+
+FILES_${PN}-dbg += " \
+    ${libdir}/kauth/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+"

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/files/0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch

@@ -33,7 +33,7 @@ index b5d8ffe..538d7c8 100644
 -    DBusAddons DNSSD Declarative
 +    DBusAddons DNSSD
      I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion JobWidgets TextWidgets GlobalAccel XmlGui Crash
-     Bookmarks KIO NewStuff KDELibs4Support)
+     Bookmarks KIO NewStuff)
  
 +if(BUILD_KGDECLARATIVE)
 +    find_package(KF5 REQUIRED COMPONENTS Declarative)
@@ -81,5 +81,5 @@ index b5d8ffe..538d7c8 100644
  
  set(KDEGAMES_VERSION 7.0.0)
 -- 
-2.1.0
+2.5.0
 

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] = "76a75c3fa55aebb01a7fb1441cb18f7c"
+SRC_URI[md5sum] = "820885a12f1b78f1087261556eb09b59"
-SRC_URI[sha256sum] = "47f7c00b756bb37e8f04423131390f6ac8d242ce52ce788691d8d80a20028a49"
+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

@@ -0,0 +1,37 @@
+SUMMARY = "Computer-aided translation"
+LICENSE = "GPLv2 & GFDL-1.2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=7108e5acd7ce861dee282297d7c2f38c \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += "\
+    qtscript \
+    hunspell \
+	\
+    ki18n \
+    kio \
+    kxmlgui \
+    knotifications \
+    kconfig \
+    kcoreaddons \
+    kdoctools \
+    kross \
+    sonnet \
+    kdbusaddons \
+    kcrash \
+" 
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "31d6be64f5133aa2db94a4f6c984fcea"
+SRC_URI[sha256sum] = "fac8e0a7a31f07020bc4726eb7b0079537dfe8d44b04fb9a89d8991b90fec3b1"
+
+FILES_${PN} += " \
+    ${datadir}/config.kcfg \
+    ${datadir}/k*5 \
+    ${datadir}/icons \
+"
+
+RDEPENDS_${PN} += "translate-toolkit"

recipes-kde/apps/marble/files/0001-align-path-of-designer-plugins.patch

@@ -0,0 +1,31 @@
+From 51a1a623dbdeac52b0afd383189e509f6b61df9e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 16 Sep 2015 15:20:30 +0200
+Subject: [PATCH] align path of designer plugins
+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>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 68b3d78..57c4792 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -199,7 +199,7 @@ add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget suppo
+ 
+ set(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX} CACHE PATH  "Base directory for executables and libraries" FORCE)
+ if (NOT QT_PLUGINS_DIR)
+-   set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins)
++   set(QT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qt5/plugins)
+ endif()
+ 
+ ####################################################
+-- 
+2.1.0
+

recipes-kde/apps/marble/marble.bb

@@ -0,0 +1,73 @@
+SUMMARY = "Marble is a Virtual Globe and World Atlas"
+LICENSE = "GPLv3 & GFDL-1.2 & LGPLv2 & MIT"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPL-3;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
+    file://LICENSE.txt;md5=e9b5891877660f283be4bc396de0570f \
+    file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+"
+
+inherit kde-apps cmake_lib
+
+DEPENDS += " \
+    qtsvg \
+    qtwebkit \
+    \
+    kconfig \
+    krunner \
+    kservice \
+    ki18n \
+    kio \
+    knewstuff \
+    kwallet \
+    kparts \
+    kcoreaddons \
+    kparts \
+    plasma-framework \
+    kdoctools \
+"
+
+PV = "${KDE_APP_VERSION}"
+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}-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}-qt = "${bindir}/${BPN}-qt"
+
+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 += " \
+    ${libdir}/marble/plugins/.debug \
+    ${libdir}/marble/plugins/org/kde/edu/marble/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+"
+
+FILES_${PN}-designer-plugin += " \
+    ${OE_QMAKE_PATH_PLUGINS}/designer \
+"
+
+FILES_${PN}-designer-plugin-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/designer/.debug \
+"

recipes-kde/apps/minuet/minuet.bb

@@ -0,0 +1,31 @@
+SUMMARY = "A KDE Software for Music Education"
+LICENSE = "GPLv2 & GFDL-1.3"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.DOC;md5=10b9de612d532fdeeb7fe8fcd1435cc6 \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += "\
+    qtquickcontrols2 \
+    fluidsynth \
+    drumstick \
+    ki18n \
+    kxmlgui \
+    kio \
+    kcrash \
+    kdoctools \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "6176e552d8f9539468acd55fd1500501"
+SRC_URI[sha256sum] = "4be531d78eb1c2896110ecdc94e6fcfe0d3e6d54df48c9fbb78b93c18105541e"
+
+FILES_${PN} += " \
+    ${datadir}/kxmlgui5 \
+    ${datadir}/icons \
+    ${OE_QMAKE_PATH_PLUGINS} \
+"
+
+RDEPENDS_${PN} += "timidity++ qtquickcontrols2"

recipes-kde/apps/okteta/okteta.bb

@@ -0,0 +1,44 @@
+SUMMARY = "Okteta is a simple hex editor"
+LICENSE = "GPLv2 & GFDL-1.2 & LGPL-2.1"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
+    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += " \
+    qca \
+    kbookmarks \
+    kcodecs \
+    kcompletion \
+    kconfigwidgets \
+    kdbusaddons \
+    kdoctools \
+    kiconthemes \
+    ki18n \
+    kcmutils \
+    kio \
+    knewstuff \
+    kparts \
+    kservice \
+    kwidgetsaddons \
+    kxmlgui \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "e122c901b5b3348d4b9aed7f9386231c"
+SRC_URI[sha256sum] = "6c77d0602a923dcaf32054b699851f24fbfa93bdb89928d66e219e9f217efe23"
+
+FILES_${PN} += " \
+    ${OE_QMAKE_PATH_PLUGINS} \
+    ${datadir}/config.kcfg \
+    ${datadir}/kxmlgui5 \
+    ${datadir}/mime \
+"
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
+"

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/oxygen-icons/oxygen-icons.bb

@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps allarch gtk-icon-cache
 
 PV = "15.04.3"
+SRC_URI = "${KDE_MIRROR}/Attic/applications/${PV}/src/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "4f24f975fb90d8daab833fc719ce39a3"
 SRC_URI[sha256sum] = "133b66d70b51641f841799674afd993a6af0d9d9b646021a0ed609beb2ffd71e"
 

recipes-kde/apps/spectacle/spectacle.bb

@@ -0,0 +1,38 @@
+SUMMARY = "The new screenshot capture utility, replaces KSnapshot"
+LICENSE = "GPLv2 & GFDL-1.2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.DOC;md5=10b9de612d532fdeeb7fe8fcd1435cc6 \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += " \
+    kcoreaddons \
+    kwidgetsaddons \
+    kdbusaddons \
+    knotifications \
+    kconfig \
+    kdeclarative \
+    ki18n \
+    kio \
+    kxmlgui \
+    kwindowsystem \
+    kdoctools \
+"
+
+# REVISIT optionals
+DEPENDS += " \
+    libkscreen \
+    xcb-util-cursor \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "da0bf367466a4dd4a7cdf5d420ddd12d"
+SRC_URI[sha256sum] = "57e03741f52803896beaa2f0e914941fa9d4cef1dfbf2baf8aa825c8beabb7de"
+
+FILES_${PN} += " \
+    ${datadir}/dbus-1 \
+    ${datadir}/khotkeys \
+    ${datadir}/knotifications5 \
+"

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

@@ -0,0 +1,37 @@
+SUMMARY = "GUI for diagramming Unified Modelling Language (UML)"
+LICENSE = "GPLv2 & GFDL-1.2 & LGPL-2.0"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
+    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += " \
+    qtsvg \
+    qtwebkit \
+    \
+    karchive \
+    kcompletion \
+    kconfig \
+    kcoreaddons \
+    kdoctools \
+    ki18n \
+    kiconthemes \
+    kio \
+    ktexteditor \
+    kwidgetsaddons \
+    kxmlgui \
+"
+
+PV = "${KDE_APP_VERSION}"
+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"
+
+FILES_${PN} += " \
+    ${datadir}/kxmlgui5 \
+"

recipes-kde/find-non-auto-version-recipes

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+grep -r 'PV ' | grep -v VERSION

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

@@ -1,9 +1,3 @@
 require ${BPN}.inc
 
-inherit cmake-lib
+DEPENDS += "${BPN}-native libpcre"
-
-DEPENDS += "${BPN}-native libpcre kdoctools"
-
-# 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}"