Merge pull request #11 from Tarnyko/jethro

kactivites: fix build

TODO

@@ -1,13 +1,3 @@
-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
 
@@ -15,9 +5,16 @@ 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:

classes/cmake-auto-align-paths.bbclass

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

classes/cmake-extra-sanity.bbclass

@@ -1,5 +1,3 @@
-inherit cmake_sysroot
-
 # do_install_append_class-cross does not work so hack
 do_install_prepend_class-native() {
     no_staging_check=true
@@ -36,7 +34,6 @@ do_install_append() {
                 bbwarn "$f contains links to build host sysroot!"
                 error=true
             fi
-
         done
 
         if [ x != x$error ] ; then
@@ -44,32 +41,3 @@ do_install_append() {
         fi
     fi
 }
-
-do_populate_sysroot[postfuncs] += "do_sysroot_cmake_sanity "
-
-# check sysroot cmake files for links not relative and not to sysroots
-
-do_sysroot_cmake_sanity() {
-    error=
-    for f in `cat ${CMAKEINSTALLED}` ; do
-        if grep -q ';${libdir}' "$f" ; then
-            bbwarn "$f contains links to ${libdir}!"
-            error=true
-        fi
-        if grep -q '\"${libdir}/lib' "$f" ; then
-            bbwarn "$f contains links to ${libdir}!"
-            error=true
-        fi
-        if grep -q ';${includedir}' "$f" ; then
-            bbwarn "$f contains links to ${includedir}!"
-            error=true
-        fi
-        if grep -q '\"${includedir}' "$f" ; then
-            bbwarn "$f contains links to ${includedir}!"
-            error=true
-        fi
-    done
-    if [ x != x$error ] ; then
-        bbfatal "One or more files in sysroot contain links to ${prefix}"
-    fi
-}

classes/cmake-lib.bbclass

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

classes/cmake_sysroot.bbclass

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

classes/hawaii.bbclass

@@ -2,11 +2,8 @@ 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,6 +1,6 @@
 inherit kde-base
 
-KDE_APP_VERSION = "16.12.1"
+KDE_APP_VERSION = "15.12.0"
 
 SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"
 

classes/kde-base.bbclass

@@ -17,15 +17,11 @@ ${KDE_MIRROR}	http://kde.c3sl.ufpr.br \n \
 SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
 
 # extra-cmake-modules cause dependent to check for python
-inherit cmake_qt5 cmake_extra_sanity pythonnative
+inherit cmake_qt5 cmake-extra-sanity pythonnative
 
-do_compile_prepend() {
-    export XDG_DATA_HOME=${STAGING_DATADIR}
-}
-
-FILES_${PN} += "${libdir}/plugins/kf5 ${datadir}/kf5 ${libexecdir}/kf5"
+FILES_${PN} += "${libdir}/plugins/kf5 ${datadir}/kf5"
 FILES_${PN}-dev += "${libdir}/cmake"
-FILES_${PN}-dbg += "${libdir}/plugins/kf5/.debug ${libexecdir}/kf5/.debug"
+FILES_${PN}-dbg += "${libdir}/plugins/kf5/.debug"
 
 EXTRA_OECMAKE += " \
     -DECM_MKSPECS_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \
@@ -34,10 +30,4 @@ EXTRA_OECMAKE += " \
     -DKDE_INSTALL_QTPLUGINDIR=${OE_QMAKE_PATH_PLUGINS} \
     -DKDE_INSTALL_QMLDIR=${OE_QMAKE_PATH_QML} \
 "
-
-FILES_${PN} += " \
-    ${datadir}/appdata \
-    ${datadir}/metainfo \
-"
-
 FILES_${PN}-dev += "${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs"

classes/kde-kf5-porting-aids.bbclass

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

classes/kde-kf5.bbclass

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

classes/kde-plasma.bbclass

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

classes/lxqt.bbclass

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

classes/qt5-translation.bbclass

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

conf/layer.conf

@@ -8,6 +8,6 @@ BBFILES += "${LAYERDIR}/extends-*/*.bb ${LAYERDIR}/extends-*/*.bbappend"
 
 BBFILE_COLLECTIONS += "meta-qt5-extra"
 BBFILE_PATTERN_meta-qt5-extra := "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-qt5-extra = "20"
+BBFILE_PRIORITY_meta-qt5-extra = "7"
 
 LAYERDEPENDS_meta-qt5-extra = "core qt5-layer openembedded-layer networking-layer"

extends-meta-oe/networkmanager_%.bbappend

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

extends-meta-qt5/qtbase_git.bbappend

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

extends-meta-qt5/qttools_git.bbappend

@@ -1,9 +1,9 @@
-inherit cmake_lib
+inherit cmake-lib
 
 DEPENDS += "${BPN}-native"
 
 
-# It's really time for us to publish cmake_lib.bbclass
+# It's really time for us to publish cmake-lib.bbclass
 SRC_URI_remove = " \
     file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \
 "

extends-oe-core/gpgme/pkgconfig.patch

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

@@ -6,28 +6,27 @@ 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=5027eec93a996272a9a0a6a86cf35775 \
+                    file://src/gpgme.h.in;endline=23;md5=dccb4bb624011e36513c61ef0422d054 \
                     file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
 
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/${BP}.tar.bz2 \
-           file://gpgme.pc \
-           file://pkgconfig.patch \
-          "
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
+           file://gpgme.pc"
 
 SRC_URI_append_class-native = " file://0001-return-unknown-as-host.patch"
 
-SRC_URI[md5sum] = "60d730d22e8065fd5de309e8b98e304b"
-SRC_URI[sha256sum] = "b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d"
+SRC_URI[md5sum] = "334e524cffa8af4e2f43ae8afe585672"
+SRC_URI[sha256sum] = "2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60120496"
 
 DEPENDS = "libgpg-error libassuan"
 
+EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm --with-gpgconf=no --with-g13=no"
+
 inherit autotools texinfo pkgconfig
 
 PACKAGES =+ "${PN}-pthread"
 FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"
 FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*"
 
-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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,19 +1,21 @@
 SUMMARY = "Hawaii desktop environment shell"
 LICENSE = "GPLv2 & LGPLv2"
 LIC_FILES_CHKSUM = " \
-	file://LICENSE.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-	file://LICENSE.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
+	file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit hawaii systemd pythonnative distro_features_check
+inherit hawaii pythonnative cmake-lib distro_features_check
+#inherit systemd
 
+# weston fails for missing wayland-egl
 REQUIRED_DISTRO_FEATURES = "wayland"
 
 SRC_URI += " \
     file://0001-find-host-s-git.patch \
 "
-SRCREV = "d02a209082819e3bfa3edd167328b4ed52ebf6e1"
-PV = "0.8.0+git${SRCPV}"
+SRCREV = "8a33b1b5a292db4bac87943515586d32259d5ada"
+PV = "0.5.91+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -22,8 +24,9 @@ DEPENDS += " \
     wayland \
     libqtxdg \
     solid \
-    libhawaii \
     greenisland \
+    networkmanager-qt \
+    modemmanager-qt \
 "
 
 # REVISIT optionals
@@ -32,27 +35,40 @@ DEPENDS += " \
     pulseaudio \
 "
 
-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] = "-DENABLE_NETWORK_MANAGER=ON,-DENABLE_NETWORK_MANAGER=OFF,networkmanager-qt"
 PACKAGECONFIG ??= "nm_qt"
 
-SYSTEMD_SERVICE_${PN} = "hawaii.service"
+# REVISIT/HACK: for unkown reasons libqtxdg libs are not found
+LDFLAGS += "-lQt5Xdg"
 
-# for starter scripts
-RDEPENDS_${PN} = "qttools-tools qtwayland-plugins"
+# starter scripts rely on bash qdbus catchsegv
+RDEPENDS_${PN} = "bash qttools-tools qtwayland-plugins catchsegv"
 
 # REVISIT optionals
 RRECOMMENDS_${PN} += " \
-    fluid \
     hawaii-wallpapers \
-    hawaii-icon-theme \
+    hawaii-icon-themes \
+    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,15 +7,10 @@ LIC_FILES_CHKSUM = " \
 
 inherit hawaii
 
-DEPENDS += " \
-    greenisland \
-    libhawaii \
-    polkit-qt-1 \
-    kscreen \
-"
+DEPENDS += "polkit-qt-1 kscreen"
 
-SRCREV = "f1ce43687a0c9dcdbf0cd5640d38bbbc348dd123"
-PV = "0.8.0"
+SRCREV = "5d9d32762151f7306fcb0c6798d2e4a940f57f2f"
+PV = "0.4.0+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += "-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools"
@@ -24,10 +19,6 @@ FILES_${PN} += " \
     ${OE_QMAKE_PATH_QML} \
 "
 
-FILES_${PN}-dev += " \
-    ${libdir}/cmake \
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_QML}/org/hawaii/systempreferences/*/.debug \
 "
-
-# 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.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 inherit hawaii
 
-SRCREV = "8c4701aa6e9223091ac3ad1fb0e8005c92399fee"
-PV = "0.6.90+git${SRCPV}"
+SRCREV = "fc35b8a44e55334dcecdec8cf6e80047fe056727"
+PV = "0.5.91+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -13,3 +13,7 @@ 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 = "9aaaf3b8681dc2253d812aa7f37b8ed5e1651959"
-PV = "0.8.0"
+SRCREV = "bc6678a242a8439488e0f57ddefdbb1eed5eabf2"
+PV = "0.5.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 

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

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

@@ -1,17 +0,0 @@
-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,16 +7,14 @@ inherit packagegroup
 RDEPENDS_${PN} = " \
     cinema \
     eyesight \
-    fluid \
     greenisland \
-    hawaii-icon-theme \
+    hawaii-baseapps \
+    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,17 +1,16 @@
 SUMMARY = "Qt-style API to use freedesktop.org's AccountsService DBus service"
-LICENSE = "GPLv2 & LGPLv2.1"
+LICENSE = "GPLv2 & LGPLv2.1 & GFDL-1.3"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSE.LGPLv21;md5=4fbd65380cdd255951079008b364516c \
+    file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
 "
 
 inherit hawaii
 
 SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
-SRCREV = "74728c9f092ba7166b96414cb85e268f3c3ed4d1"
+SRCREV = "2624cc812ae14bf9abee9634de0f4cc0ee0a5926"
 
 S = "${WORKDIR}/git"
-PV = "0.6.0+git${SRCPV}"
+PV = "0.6.0"
 
 FILES_${PN} += "${OE_QMAKE_PATH_QML}/QtAccountsService"
 FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/QtAccountsService/.debug"

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

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

recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb

@@ -7,17 +7,20 @@ LIC_FILES_CHKSUM = " \
 	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit hawaii
+inherit hawaii cmake-lib
 
 DEPENDS += "dconf"
 
 SRC_URI = " \
     git://github.com/hawaii-desktop/${BPN}.git \
+    file://0001-fix-build-with-qt-5.5.patch \
 "
-SRCREV = "fd37e4f7a19b593e44f35e59a5a19aecc4f268a9"
+SRCREV = "804739d73de982fc144ff45653c243cefcfa79cb"
 
 S = "${WORKDIR}/git"
 
+CMAKE_ALIGN_SYSROOT[1] = "QtConfiguration, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+
 FILES_${PN} += "${libdir}/hawaii/qml/Hawaii/Configuration"
 FILES_${PN}-dbg += "${libdir}/hawaii/qml/Hawaii/Configuration/.debug"
 FILES_${PN}-dev += "${libdir}/cmake"

recipes-kde/apps/ark/ark.bb

@@ -24,20 +24,19 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "08b9058d317b9e5667bb0eaf2a4136c9"
-SRC_URI[sha256sum] = "b54c137098bbf77d99a54e526a58a83aca73db1cf1fabbbc4bccdf09a1bee8d0"
+SRC_URI[md5sum] = "2fe131a931d51603eff33b80d45a73b7"
+SRC_URI[sha256sum] = "c3a67c3a1c377989d567dc9c0228b684dc475612405d3c4638f40d0dbd87bd7c"
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 FILES_${PN} += " \
+    ${datadir}/appdata \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
-    ${datadir}/mime \
     ${datadir}/k*5 \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_PLUGINS}/.debug \
-    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
     ${OE_QMAKE_PATH_PLUGINS}/kf5/kio_dnd/.debug \
 "

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

@@ -10,33 +10,32 @@ Upstream-Status: Pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- app/main.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ app/main.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/app/main.cpp b/app/main.cpp
-index a9539b5..91f96ab 100644
+index 4a95063..c3d3a61 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.
+@@ -175,6 +175,7 @@ int main(int argc, char **argv)
      KDBusService dbusService(KDBusService::Multiple);
  
+     //session restoring
 +#ifndef QT_NO_SESSIONMANAGER
-     // Session restoring.
      if (application.isSessionRestored()) {
          if (!KMainWindow::canBeRestored(1)) {
-@@ -190,8 +191,9 @@ int main(int argc, char **argv)
+             return -1;
+@@ -186,7 +187,9 @@ int main(int argc, char **argv)
              delete window;
              return -1;
          }
--    } else { // New ark window (no restored session).
--
-+    } else // New ark window (no restored session).
+-    } else { //new ark window (no restored session)
++    } else
 +#endif
-+    {
-         // Open any given URLs.
-         const QStringList urls = parser.positionalArguments();
++    { //new ark window (no restored session)
  
+         // open any given URLs
+         const QStringList urls = parser.positionalArguments();
 -- 
-2.5.5
+2.1.0
 

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

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit kde-apps
+inherit kde-apps cmake-lib
 
 DEPENDS += "\
     kconfig \
@@ -18,5 +18,10 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "5d3f8f89d833033794b170e6b9db4cbd"
-SRC_URI[sha256sum] = "4bff2f4abd9d65f39e2b44189312bac139908362e8888c114bbf3d107902217c"
+SRC_URI[md5sum] = "2ffa70cbc5259a2f502c6853fb45e240"
+SRC_URI[sha256sum] = "e17e97a5989b0ccfc68a65b093db340bc4962a23ebbcc825f93c975916b77251"
+
+# cross libs / headers
+CMAKE_ALIGN_SYSROOT[1] = "KF5BalooWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5BalooWidgets, -S${includedir}, -S${STAGING_INCDIR}"
+

recipes-kde/apps/bovo/bovo.bb

@@ -17,10 +17,11 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "ec6c38f965585beaba124eb78cce40fd"
-SRC_URI[sha256sum] = "7dba4db8e72fdbe6fb552b4d8428676cf5cc490456518b918a650b616f8660b6"
+SRC_URI[md5sum] = "6e6bdcf59c591c4499b2c26c05e0702b"
+SRC_URI[sha256sum] = "f346055908a9c3c3670a7cc493e1d5903225d901e1171eeb01b8ddbd1aebda08"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
+    ${datadir}/appdata \
 "

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

@@ -13,8 +13,8 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "c33684a8b47e439e68775a164455fb54"
-SRC_URI[sha256sum] = "ff46afcdefb334bef5b8aca4bdcea1f2f133472e1e0922fb63361280ab6b3abd"
+SRC_URI[md5sum] = "b91bdc4a0883bbcecb34bedee59ae142"
+SRC_URI[sha256sum] = "7baa4a65398925032e852e3cc1bb09ab7b4c2232f837cd6d0f71e25236f8e450"
 
 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
+inherit kde-apps cmake-lib
 
 DEPENDS += " \
     kdoctools \
@@ -33,8 +33,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "149165d7954bfef08747e5bb7252a277"
-SRC_URI[sha256sum] = "b02bbfbe6d3f8eef6a6fd9b6ff6f5e90b47ad27c9f2e7ebcd25346287490fa6e"
+SRC_URI[md5sum] = "30f452fd08914cd302b37c29143428f9"
+SRC_URI[sha256sum] = "0a2a7a265fb542e1ed461d9111143fdc61559a398e4fa0c47e1e0b822ccf73a5"
 SRC_URI += " \
     file://0001-align-paths-to-phonon.patch \
     file://0002-fix-build-for-qtbase-without-session-management.patch \
@@ -43,9 +43,7 @@ SRC_URI += " \
 FILES_SOLIBSDEV = "${libdir}/libdolphin*${SOLIBSDEV}"
 
 FILES_${PN} += " \
-    ${datadir}/config.kcfg \
-    ${datadir}/k*5 \
-    ${datadir}/dbus-1 \
+    ${datadir} \
     ${libdir}/libkdeinit5_dolphin.so \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
@@ -53,3 +51,7 @@ 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->isSavingSession()) {
+     if (qApp->isSessionRestored()) {
          closedByUser = false;
      }
 +#endif

recipes-kde/apps/dragon/dragon.bb

@@ -1,44 +0,0 @@
-SUMMARY = "Simple KDE multimedia player"
-LICENSE = "GPLv2 & GFDL-1.2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-"
-
-inherit kde-apps
-
-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] = "2bac6bc332a44b9120ec1b7b8dbcc583"
-SRC_URI[sha256sum] = "f8a44821c01f84a8554f0d58e32bf6f351dd2d6ecb7e22b0544a40ebeb1e5d7d"
+SRC_URI[md5sum] = "19cf21112e411c4adda7cc89c9630240"
+SRC_URI[sha256sum] = "a67164444e7056f1fcdaa4c781f128e0da09e657a0fa621d71e5aa6545e49d60"
 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

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

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

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

recipes-kde/apps/gwenview/gwenview.bb

@@ -1,40 +0,0 @@
-SUMMARY = "A fast and easy to use image viewer for KDE"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b"
-
-inherit kde-apps
-
-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

@@ -24,10 +24,11 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "acc85096197530e2e02cb877cef3ce1f"
-SRC_URI[sha256sum] = "06addd40448ba9d7f58231b5bfcfa2d9ff94d19e726a5ef320d8dd1cd599bdf3"
+SRC_URI[md5sum] = "fc9a511409d12da3273ca040a9802ac3"
+SRC_URI[sha256sum] = "340d5f206705f955990f1d5742ac37adb2874e6ee6529df6f8e4ade3aefeedd4"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
+    ${datadir}/appdata \
 "

recipes-kde/apps/kate/kate.bb

@@ -30,8 +30,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "ac0dbaa0f0b06e3cc96e9f87ea321f42"
-SRC_URI[sha256sum] = "984a82005897b553eab0525715b626f7467bc1d664b29ac7944860cd1d7012dc"
+SRC_URI[md5sum] = "80a3a02c3ab25f614e523b881e5483b8"
+SRC_URI[sha256sum] = "ae979ac3b5c18ddb2a9701e59cf0e70b9e366c1fa08325bb771a95de3a12526f"
 
 SRC_URI += " \
     file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
@@ -46,6 +46,7 @@ FILES_${PN} += " \
     ${datadir}/plasma \
     ${datadir}/katexmltools \
     ${datadir}/icons \
+    ${datadir}/appdata \
     \
     ${libdir}/libkdeinit5*.so \
     ${OE_QMAKE_PATH_PLUGINS} \

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

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

recipes-kde/apps/katomic/katomic.bb

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps gtk-icon-cache
+inherit kde-apps
 
 DEPENDS += "\
     kcoreaddons \
@@ -25,12 +25,10 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "64f10e943903513cadae909b280f6fd6"
-SRC_URI[sha256sum] = "57f4fc75c3383dacdfb7c7ad56c3da12878d4edff1079562af610c79695e54bd"
+SRC_URI[md5sum] = "3af891e3527a254a901fa1ca88412f63"
+SRC_URI[sha256sum] = "1a85acea5ce335cb111bf34f1f4f281e08e737698795eaf3f05a148c9721fa69"
 SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
 
 FILES_${PN} += " \
-    ${datadir}/kxmlgui5 \
-    ${datadir}/kconf_update \
-    ${datadir}/icons \
+    ${datadir} \
 "

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

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

recipes-kde/apps/kbounce/kbounce.bb

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

recipes-kde/apps/kcalc/kcalc.bb

@@ -1,34 +0,0 @@
-SUMMARY = "KDE's calculator application"
-LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-"
-
-inherit kde-apps
-
-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

@@ -1,21 +0,0 @@
-SUMMARY = "A very small utility to select a color"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=838c366f69b72c5df05c96dff79b35f2 \
-"
-
-inherit kde-apps gtk-icon-cache
-
-DEPENDS += "\
-    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,14 +9,12 @@ inherit kde-apps gtk-icon-cache
 DEPENDS += "\
     mlt \
     qtsvg \
-    qtwebkit \
     karchive \
     kbookmarks \
     kcoreaddons \
     kconfig \
     kconfigwidgets \
     kdbusaddons \
-    kfilemetadata \
     kio \
     kwidgetsaddons \
     kplotting \
@@ -28,12 +26,11 @@ DEPENDS += "\
     ktextwidgets \
     kiconthemes \
     kdoctools \
-    xapian-core \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "3c906a40f0c5649f4b1b68f4693352dc"
-SRC_URI[sha256sum] = "bca5e9293326aecd6ae295f9f579ba5d7880baf54183cb0a8d8c708f4f04768d"
+SRC_URI[md5sum] = "62fc024bc9616756b5ad6444308e636f"
+SRC_URI[sha256sum] = "5a6f4ae4bd07c64b90a3ebe88775b457c9c1d8b3a23820203d86df114183fbf8"
 
 SRC_URI += " \
     file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \
@@ -46,11 +43,10 @@ FILES_${PN} += " \
     ${datadir}/mime \
     ${datadir}/menu \
     ${datadir}/icons \
+    ${datadir}/appdata \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_PLUGINS}/.debug \
 "
-
-RRECOMMENDS_${PN} += "ffmpeg"

recipes-kde/apps/kdf/kdf.bb

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

recipes-kde/apps/kdiamond/kdiamond.bb

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

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

@@ -14,8 +14,6 @@ inherit kde-apps
 DEPENDS += " \
     qtsvg \
     \
-    exiv2 \
-    kactivities \
     karchive \
     kconfig \
     kconfigwidgets \
@@ -44,8 +42,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "7afd2a4e1f645ef45450c1087e42206e"
-SRC_URI[sha256sum] = "2cb558a7658894ee67f9318bbd98949b8eda425e5a30ca2af761e5d54d807093"
+SRC_URI[md5sum] = "819bf5ec77953460993529076e0b9023"
+SRC_URI[sha256sum] = "e7409ae4b788d0484f8d026580ae821487993d791a48bd14f435b447e93fc950"
 
 FILES_${PN} += " \
     ${datadir}/kio_bookmarks \

recipes-kde/apps/kmix/kmix.bb

@@ -26,8 +26,8 @@ PACKAGECONFIG = "pulseaudio"
 PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "0d887662c99c262b90831942bc0cc2be"
-SRC_URI[sha256sum] = "0f450623f1fc532cacf7b3fa5d1f00adb77e1be41bf08f472a276795f6398ca9"
+SRC_URI[md5sum] = "f9d015862b40c9bb28307233ee012bd8"
+SRC_URI[sha256sum] = "e0e3ca3dac5605faaf7b447288675f557e1fd4205574885e2c1bfb205f37da31"
 
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
@@ -47,5 +47,6 @@ FILES_${PN} += " \
 
 FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_PLUGINS}/.debug \
-    ${OE_QMAKE_PATH_PLUGINS}/plasma/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/plasma/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/plasma/dataengine/.debug \
 "

recipes-kde/apps/kolourpaint/kolourpaint.bb

@@ -1,34 +0,0 @@
-SUMMARY = "KolourPaint - Paint Program"
-LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2 & MIT"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=7549f6da638b0246572ed9cf4275b860 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-    file://COPYING.LIB;md5=3214f080875748938ba060314b4f727d \
-"
-
-inherit kde-apps gtk-icon-cache
-
-DEPENDS += "\
-    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

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

recipes-kde/apps/konsole/konsole.bb

@@ -36,14 +36,16 @@ DEPENDS += " \
 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "ebe57e74bbcf6311eb449af12032583a"
-SRC_URI[sha256sum] = "d5a242c8e23c4002736402ef5ecbb840b60e0e149fc92b480223dfeb7647335a"
+SRC_URI[md5sum] = "4051b1535fb79632951f6dfbc3c2de6a"
+SRC_URI[sha256sum] = "90eb9c6635f067ab7236be472a5051366b18a0b9533e910a2a25957a47864bd5"
+SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
 
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
+    ${datadir}/appdata \
     ${OE_QMAKE_PATH_PLUGINS} \
     ${libdir}/libkdeinit5_konsole.so \
 "

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

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

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

@@ -1,26 +0,0 @@
-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/kwalletmanager.bb

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

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

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

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

recipes-kde/apps/libkdegames/libkdegames.bb

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps
+inherit kde-apps cmake-lib
 
 DEPENDS += "\
     kcoreaddons \
@@ -40,8 +40,8 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "820885a12f1b78f1087261556eb09b59"
-SRC_URI[sha256sum] = "51277bc284d27beec64103eff5b11cb9d672efd5c265f5f1a6bb9951290ba128"
+SRC_URI[md5sum] = "9483bc4120eb0199614fa44c024dd5ff"
+SRC_URI[sha256sum] = "7b5300e46a179be477c737eac75b964aaca0318554137957812be879e90063f4"
 SRC_URI += "file://0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch"
 
 PACKAGECONFIG[kgdeclarative] = "-DBUILD_KGDECLARATIVE=Yes,-DBUILD_KGDECLARATIVE=No, kdeclarative"
@@ -56,3 +56,6 @@ 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

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

@@ -1,37 +0,0 @@
-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/marble.bb

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps cmake_lib
+inherit kde-apps
 
 DEPENDS += " \
     qtsvg \
@@ -28,34 +28,25 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "f8c45f7e5cf2798709af7802a5d0dc1a"
-SRC_URI[sha256sum] = "1ac83cf09a515b5a0739a524225aeb5933c90620d06de72bb1a74f3de3c562c3"
+SRC_URI[md5sum] = "a7a481936281a7d584b9168d98fcd5d5"
+SRC_URI[sha256sum] = "6aa7f939a3221e2a40f62548d8af0718c10b6253a28472b233aeccc062b30d06"
 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}-mobile ${PN}-qt ${PN}-touch \
     ${PN}-designer-plugin-dbg ${PN}-designer-plugin \
 "
 
-CMAKE_ALIGN_SYSROOT[1] = "Marble, -S${includedir}, -s${_IMPORT_PREFIX}/include"
-CMAKE_ALIGN_SYSROOT[2] = "Astro, -S${includedir}, -s${_IMPORT_PREFIX}/include"
-
-FILES_SOLIBSDEV = ""
-
-FILES_${PN}-dev += "${libdir}/libastro.so ${libdir}/libmarblewidget-qt5.so"
+FILES_${PN}-mobile = "${bindir}/${BPN}-mobile"
 FILES_${PN}-qt = "${bindir}/${BPN}-qt"
+FILES_${PN}-touch = "${bindir}/${BPN}-touch"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/k*5 \
-    ${datadir}/mime \
-    ${datadir}/plasma \
-    ${libdir}/libmarbledeclarative.so \
+    ${datadir}/appdata \
     ${OE_QMAKE_PATH_PLUGINS} \
-    ${OE_QMAKE_PATH_QML} \
 "
 
 FILES_${PN}-dbg += " \

recipes-kde/apps/minuet/minuet.bb

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

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

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

@@ -1,4 +1,4 @@
-SUMMARY = "The new screenshot capture utility, replaces KSnapshot"
+SUMMARY = "he new screenshot capture utility, replaces KSnapshot"
 LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -13,7 +13,6 @@ DEPENDS += " \
     kdbusaddons \
     knotifications \
     kconfig \
-    kdeclarative \
     ki18n \
     kio \
     kxmlgui \
@@ -28,8 +27,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "da0bf367466a4dd4a7cdf5d420ddd12d"
-SRC_URI[sha256sum] = "57e03741f52803896beaa2f0e914941fa9d4cef1dfbf2baf8aa825c8beabb7de"
+SRC_URI[md5sum] = "bedebdd924cf5a650c87b1306d4e6a94"
+SRC_URI[sha256sum] = "303b4739c544e3292a19f4cca4b8f8627f4430b18deb87dbe3e189324974ce7a"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \

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

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

@@ -1,37 +0,0 @@
-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/kf5/porting-aids-tier1/kjs/kjs.bb

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

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

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

recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch

@@ -40,16 +40,16 @@ index 6ffaf6e..7e872ee 100644
      foreach (KSessionManager *it, KSessionManager::sessionClients()) {
          if ((canceled = !it->commitData(sm))) {
              break;
-@@ -612,9 +612,11 @@ void KApplication::commitData(QSessionManager &sm)
-     if (canceled) {
-         sm.cancel();
+@@ -597,9 +602,11 @@ void KApplication::commitData(QSessionManager &sm)
+     } else {
+         sm.setRestartHint(QSessionManager::RestartIfRunning);
      }
 +#endif // QT_NO_SESSIONMANAGER
      d->session_save = false;
  }
  
 +#ifndef QT_NO_SESSIONMANAGER
- #if HAVE_X11 && QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #if HAVE_X11
  static void checkRestartVersion(QSessionManager &sm)
  {
 @@ -634,6 +641,7 @@ static void checkRestartVersion(QSessionManager &sm)

recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch

@@ -22,9 +22,9 @@ index 7e6b3b9..3e60563 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -20,29 +20,11 @@ include(CMakeFindFrameworks)
- set(KF5_VERSION "5.25.0") # handled by release scripts
- set(KF5_DEP_VERSION "5.25.0") # handled by release scripts
- set(REQUIRED_QT_VERSION 5.5.0)
+ set(KF5_VERSION "5.18.0") # handled by release scripts
+ set(KF5_DEP_VERSION "5.18.0") # handled by release scripts
+ set(REQUIRED_QT_VERSION 5.3.0)
 -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer)
 +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network DBus Test)
  

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

@@ -3,14 +3,13 @@ require ${BPN}.inc
 inherit native
 
 DEPENDS += " \
-    intltool-native \
-    libsm-native \
     kconfig-native \
     kcoreaddons-native \
     ki18n-native \
-    liburi-perl-native \
 "
 
 SRC_URI += " \
 	file://0003-only-build-kf5-config-for-native.patch \
 "
+
+EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"

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

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

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

@@ -8,10 +8,8 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5-porting-aids perlnative
 
 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "a4c54a015a6c26e9f511719157acadb9"
-SRC_URI[sha256sum] = "b5734b63e1a4a89d0fd3260bf190a5e1608b1b17001ea36cc031a41be62a6f3a"
-
-EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
+SRC_URI[md5sum] = "ea647553f54e7d25e60cecaa8e3b30ad"
+SRC_URI[sha256sum] = "a821dafa24ea74bc3bc59f4edad331005fca0b99fd219c0c32908b6aad84903a"
 
 SRC_URI += " \
 	file://0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch \

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

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

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

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

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

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

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

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

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

@@ -2,17 +2,19 @@ SUMMARY = "Framework for providing different actions given a string query"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://src/abstractrunner.h;endline=18;md5=a6a49d7635ef149bcddf8c46f0eae999"
 
-inherit kde-kf5
+inherit kde-kf5-porting-aids cmake-lib
 
 DEPENDS += "qtdeclarative kconfig kcoreaddons ki18n kio kservice plasma-framework solid threadweaver"
 
 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "9c382f3850cb3c1fdb8ec3afedb24685"
-SRC_URI[sha256sum] = "1f8780e6db9328eaba8001c7049c87ca01777c5a7fea305e6e9a5a129855b3ea"
+SRC_URI[md5sum] = "51f616e04e7e77e0d4f526b1215b33ac"
+SRC_URI[sha256sum] = "ee2601e916f13e126f19538c2625ba06a6ec6addd178f47a5b2d91cce30c8591"
+
+CMAKE_ALIGN_SYSROOT[1] = "KF5Runner, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Runner, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
-    ${datadir}/kdevappwizard \
     ${OE_QMAKE_PATH_QML}/org/kde \
 "
 FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/org/kde/*/.debug"

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

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

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

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