Merge pull request #11 from Tarnyko/jethro

kactivites: fix build
Merge pull request #12 from Tarnyko/jethro2
2016-06-11 22:00:31 +02:00 · 2016-06-11 22:00:11 +02:00 · 2016-06-07 15:15:47 +00:00 · 2016-06-07 13:29:29 +00:00 · 2016-01-30 00:23:28 +01:00 · 2016-01-19 09:23:09 +01:00
271 changed files with 1075 additions and 3471 deletions
--- a/17
+++ b/17
@@ -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:
--- a/classes/cmake-auto-align-paths.bbclass
+++ b/classes/cmake-auto-align-paths.bbclass
@@ -9,7 +9,7 @@ do_configure_prepend_class-nativesdk() {

 do_configure_append() {
    # remove absolute paths from exported cmake files
-    for f in `find ${B}/CMakeFiles/Export -name '*.cmake'` ${CMAKE_ADD_ALIGN_FILES} ; do
+    for f in `find ${B}/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"
--- a/classes/cmake-lib.bbclass
+++ b/classes/cmake-lib.bbclass
@@ -70,7 +70,7 @@ def get_align_flags(d):

 # global helper to check CMAKE_ALIGN_SYSROOT array contains 'ignore'
 def get_flags_ignore(flags):
-    if flags and list(flags.values()).count('ignore') > 0:
+    if flags and flags.values().count('ignore') > 0:
        return True
    return False

--- a/classes/hawaii.bbclass
+++ b/classes/hawaii.bbclass
@@ -6,7 +6,4 @@ 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} \
 "
--- a/classes/kde-apps.bbclass
+++ b/classes/kde-apps.bbclass
@@ -1,6 +1,6 @@
 inherit kde-base

-KDE_APP_VERSION = "16.04.3"
+KDE_APP_VERSION = "15.12.0"

 SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"

--- a/classes/kde-base.bbclass
+++ b/classes/kde-base.bbclass
@@ -19,13 +19,9 @@ 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

-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"
--- a/classes/kde-kf5-porting-aids.bbclass
+++ b/classes/kde-kf5-porting-aids.bbclass
@@ -1,3 +1,3 @@
 inherit kde-kf5

-SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.25/portingAids/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.18/portingAids/${BPN}-${PV}.tar.xz"
--- a/classes/kde-kf5.bbclass
+++ b/classes/kde-kf5.bbclass
@@ -1,5 +1,5 @@
 inherit kde-base

-KF5_VERSION = "5.25.0"
+KF5_VERSION = "5.18.0"

-SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.25/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.18/${BPN}-${PV}.tar.xz"
--- a/classes/kde-plasma.bbclass
+++ b/classes/kde-plasma.bbclass
@@ -1,5 +1,5 @@
 inherit kde-base

-PLASMA_VERSION = "5.7.3"
+PLASMA_VERSION = "5.5.3"

 SRC_URI = "${KDE_MIRROR}/stable/plasma/${PV}/${BPN}-${PV}.tar.xz"
--- a/extends-meta-oe/networkmanager_%.bbappend
+++ b/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 \
 "
+
--- a/extends-oe-core/gpgme/pkgconfig.patch
+++ b/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
--- a/extends-oe-core/gpgme_1.4.3.bb
+++ b/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
--- a/recipes-hawaii/greenisland/greenisland-native.bb
+++ b/recipes-hawaii/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 \
-"
--- a/recipes-hawaii/greenisland/greenisland-native/0001-reduce-build-to-waylandscanner-for-native-build.patch
+++ b/recipes-hawaii/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
-
--- a/recipes-hawaii/greenisland/greenisland.bb
+++ b/recipes-hawaii/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 = " \
-    git://github.com/greenisland/${BPN}.git;protocol=git;branch=master \
-    file://0001-find-native-greenisland-wayland-scanner.patch \
-    file://0002-RaspberryPi-Don-t-suggest-closed-source-gles-driver-.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"
-
-# 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_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 \
-"
--- a/recipes-hawaii/greenisland/greenisland.inc
+++ b/recipes-hawaii/greenisland/greenisland.inc
@@ -1,19 +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
-
-SRC_URI = " \
-    git://github.com/greenisland/${BPN}.git;protocol=git;branch=master \
-"
-
-SRCREV = "dd195ada375bb0927d544999471fbb9bdc67d9c2"
-PV = "0.7.90+git${SRCPV}"
-
-S = "${WORKDIR}/git"
--- a/recipes-hawaii/greenisland/greenisland/0001-find-native-greenisland-wayland-scanner.patch
+++ b/recipes-hawaii/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
-
--- a/recipes-hawaii/greenisland/greenisland/0002-RaspberryPi-Don-t-suggest-closed-source-gles-driver-.patch
+++ b/recipes-hawaii/greenisland/greenisland/0002-RaspberryPi-Don-t-suggest-closed-source-gles-driver-.patch
@@ -1,65 +0,0 @@
-From eee96e00715613232465319071d0b7ac20cd41c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sat, 9 Apr 2016 23:01:18 +0200
-Subject: [PATCH] RaspberryPi: Don't suggest closed source gles driver when
- using open source vc4
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When building greenisland for RaspberryPi with open source GL drivers (vc4),
-cmake does not find closed source drivers (which is correct)
-
-| -- The following OPTIONAL packages have not been found:
-|
-| * BcmHost , Broadcom OpenGLES graphics libraries. , <http://www.broadcom.com/>
-
-Launching a hawaii session reports:
-
-| greenisland.qpa.deviceintegration: Preferred EGL device integration based on the hardware configuration: "brcm"
-
-which does not make sense - there were no integration libs for closed source
-RaspberryPi GLES built.
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
- cmake/FindBcmHost.cmake                                | 2 ++
- src/platform/deviceintegration/deviceintegration_p.cpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/cmake/FindBcmHost.cmake b/cmake/FindBcmHost.cmake
-index 99e5127..0322b1d 100644
--- a/cmake/FindBcmHost.cmake
-+++ b/cmake/FindBcmHost.cmake
-@@ -90,6 +90,8 @@ find_package_handle_standard_args(BcmHost
- if(BcmHost_FOUND)
-     set(BcmHost_LIBRARY_DIRS "${BcmHost_PREFIX}/lib")
-     set(BcmHost_INCLUDE_DIR ${BcmHost_INCLUDE_DIR} ${BcmHost_INCLUDE_DIR}/interface ${BcmHost_INCLUDE_DIR}/interface/vcos/pthreads)
-+else()
-+    add_definitions(-DWITHOUT_BRCM)
- endif()
- 
- if(BcmHost_FOUND)
-diff --git a/src/platform/deviceintegration/deviceintegration_p.cpp b/src/platform/deviceintegration/deviceintegration_p.cpp
-index 369f43d..278210e 100644
--- a/src/platform/deviceintegration/deviceintegration_p.cpp
-+++ b/src/platform/deviceintegration/deviceintegration_p.cpp
-@@ -56,6 +56,7 @@ public:
-         if (!qEnvironmentVariableIsEmpty("DISPLAY"))
-             return QStringLiteral("x11");
- 
-+#ifndef WITHOUT_BRCM
-         // Detect Broadcom
-         bool found = deviceModel().startsWith(QLatin1String("Raspberry"));
-         if (!found) {
-@@ -67,6 +68,7 @@ public:
-         }
-         if (found)
-             return QStringLiteral("brcm");
-+#endif
- 
-         // TODO: Detect Mali
-         // TODO: Detect Vivante
-- 
-2.5.5
-
--- a/recipes-hawaii/greenisland/greenisland_git.bb
+++ b/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"
--- a/recipes-hawaii/hawaii-baseapps/hawaii-baseapps_git.bb
+++ b/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"
--- a/recipes-hawaii/hawaii-icon-theme/hawaii-icon-theme_git.bb
+++ b/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 = "dfa9938a4ccc47c7b8ce7974afe1f6836b1e58cf"
-PV = "v0.6.90+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-FILES_${PN} += "${datadir}/icons"
-
-RREPLACES_${PN} = "hawaii-icon-themes"
-RPROVIDES_${PN} = "hawaii-icon-themes"
-RCONFLICTS_${PN} = "hawaii-icon-themes"
-
--- a/recipes-hawaii/hawaii-icon-themes/hawaii-icon-themes_git.bb
+++ b/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"
--- a/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb
+++ b/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 = "2c4fc11957193263c02dead910a2ca1b3a383d7a"
-PV = "0.6.90+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,26 +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} += " \
    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}"
+
--- a/recipes-hawaii/hawaii-system-preferences/hawaii-system-preferences_git.bb
+++ b/recipes-hawaii/hawaii-system-preferences/hawaii-system-preferences_git.bb
@@ -7,14 +7,10 @@ LIC_FILES_CHKSUM = " \

 inherit hawaii

-DEPENDS += " \
-    libhawaii \
-    polkit-qt-1 \
-    kscreen \
-"
+DEPENDS += "polkit-qt-1 kscreen"

-SRCREV = "17da37ea0e44f8bc2d20a0018d11944bee4e810e"
-PV = "0.6.90+git${SRCPV}"
+SRCREV = "5d9d32762151f7306fcb0c6798d2e4a940f57f2f"
+PV = "0.4.0+git${SRCPV}"
 S = "${WORKDIR}/git"

 EXTRA_OECMAKE += "-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools"
@@ -23,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}"
--- a/recipes-hawaii/hawaii-terminal/hawaii-terminal_git.bb
+++ b/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 \
+"
--- a/recipes-hawaii/hawaii-widget-styles/hawaii-widget-styles_git.bb
+++ b/recipes-hawaii/hawaii-widget-styles/hawaii-widget-styles_git.bb
@@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"

 inherit hawaii

-SRCREV = "20ffdadd04e9f98124ea14690fdf89d7567956c2"
-PV = "0.6.90+git${SRCPV}"
+SRCREV = "bc6678a242a8439488e0f57ddefdbb1eed5eabf2"
+PV = "0.5.0+git${SRCPV}"

 S = "${WORKDIR}/git"

--- a/recipes-hawaii/hawaii-workspace/hawaii-workspace_git.bb
+++ b/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 = "c882b526c131d860d584197d8141120535be324d"
-PV = "0.6.90+git${SRCPV}"
-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"
--- a/recipes-hawaii/libhawaii/libhawaii_git.bb
+++ b/recipes-hawaii/libhawaii/libhawaii_git.bb
@@ -1,22 +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 cmake-lib
-
-PV = "0.6.90+git${SRCPV}"
-
-SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
-SRCREV = "9886e727d0232208d393b8e63b0fe0f28311d8a6"
-S = "${WORKDIR}/git"
-
-CMAKE_ALIGN_SYSROOT[1] = "Hawaii, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "Hawaii, -S${includedir}, -S${STAGING_INCDIR}"
-
-FILES_${PN} += "${OE_QMAKE_PATH_QML}"
-FILES_${PN}-dev += "${libdir}/cmake"
-#FILES_${PN}-dbg += "${libdir}/hawaii/qml/Hawaii/Shell/Applications/.debug ${libdir}/hawaii/qml/Hawaii/Shell/Core/.debug"
-
--- a/recipes-hawaii/packagegroups/hawaii-world.bb
+++ b/recipes-hawaii/packagegroups/hawaii-world.bb
@@ -8,14 +8,13 @@ RDEPENDS_${PN} = " \
    cinema \
    eyesight \
    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 \
--- a/recipes-hawaii/qtaccountsservice/qtaccountsservice_git.bb
+++ b/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"
--- a/recipes-kde/apps/ark/ark.bb
+++ b/recipes-kde/apps/ark/ark.bb
@@ -24,11 +24,12 @@ DEPENDS += "\
 " 

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "210ae6fb726a99f94ba4a18db0d582aa"
-SRC_URI[sha256sum] = "799c2272ddb66439a04ebae5d24fe6113aa67678eb296225b20168a2e0c42b10"
+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}/k*5 \
@@ -37,6 +38,5 @@ FILES_${PN} += " \

 FILES_${PN}-dbg += " \
    ${OE_QMAKE_PATH_PLUGINS}/.debug \
-    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
    ${OE_QMAKE_PATH_PLUGINS}/kf5/kio_dnd/.debug \
 "
--- a/recipes-kde/apps/ark/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
+++ b/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

--- a/recipes-kde/apps/baloo-widgets/baloo-widgets.bb
+++ b/recipes-kde/apps/baloo-widgets/baloo-widgets.bb
@@ -18,8 +18,8 @@ DEPENDS += "\
 " 

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "65813195eb4ecc012a4f9741b7419c2d"
-SRC_URI[sha256sum] = "f717b88dc1510b530cdb2c1deea18bd22382906542e37d36c37868d6c864d11a"
+SRC_URI[md5sum] = "2ffa70cbc5259a2f502c6853fb45e240"
+SRC_URI[sha256sum] = "e17e97a5989b0ccfc68a65b093db340bc4962a23ebbcc825f93c975916b77251"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5BalooWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-kde/apps/bovo/bovo.bb
+++ b/recipes-kde/apps/bovo/bovo.bb
@@ -17,10 +17,11 @@ DEPENDS += "\
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "57bbb719d5f45663186810c853c8b55e"
-SRC_URI[sha256sum] = "5167e9bfbaf450db0c47549072e9ffdab79e1771c5dd114b516ed2fb29f61231"
+SRC_URI[md5sum] = "6e6bdcf59c591c4499b2c26c05e0702b"
+SRC_URI[sha256sum] = "f346055908a9c3c3670a7cc493e1d5903225d901e1171eeb01b8ddbd1aebda08"

 FILES_${PN} += " \
    ${datadir}/kxmlgui5 \
    ${datadir}/icons \
+    ${datadir}/appdata \
 "
--- a/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb
+++ b/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb
@@ -13,8 +13,8 @@ DEPENDS += "\
 " 

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "a9b841d538a1f08b9f8e7319061f9241"
-SRC_URI[sha256sum] = "ef63b312eb6fe98617767c876256e0201d809e9b07078a9b3676c71dd30a98e3"
+SRC_URI[md5sum] = "b91bdc4a0883bbcecb34bedee59ae142"
+SRC_URI[sha256sum] = "7baa4a65398925032e852e3cc1bb09ab7b4c2232f837cd6d0f71e25236f8e450"

 FILES_${PN} += " \
    ${datadir}/config.kcfg \
--- a/recipes-kde/apps/dolphin/dolphin.bb
+++ b/recipes-kde/apps/dolphin/dolphin.bb
@@ -33,8 +33,8 @@ DEPENDS += " \
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "96439ddce5220e3a90e1373d24c35e48"
-SRC_URI[sha256sum] = "201f42d2f709c359a2f7b0974b1e35b6f22034a165540fd2af12b146b1a58599"
+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} \
 "
--- a/recipes-kde/apps/dolphin/files/0002-fix-build-for-qtbase-without-session-management.patch
+++ b/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
--- a/recipes-kde/apps/dragon/dragon.bb
+++ b/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] = "2c0a3e8a3d8ef098930da4fe9668b672"
-SRC_URI[sha256sum] = "749f31ac966a97329c05b9b2e68fee216d0ee3cd0a90a8957171385907cc10b5"
-
-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 \
-"
--- a/recipes-kde/apps/filelight/filelight.bb
+++ b/recipes-kde/apps/filelight/filelight.bb
@@ -18,8 +18,8 @@ DEPENDS += "\
 " 

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "5c8cf220a125630867cd8ad6692824f8"
-SRC_URI[sha256sum] = "09c85042babcada372a97892f7f05e42dc534a4120071f52de23ef8417f524d2"
+SRC_URI[md5sum] = "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 \
--- a/recipes-kde/apps/gwenview/files/0001-Fix-package-name.patch
+++ b/recipes-kde/apps/gwenview/files/0001-Fix-package-name.patch
@@ -1,31 +0,0 @@
-From 05433a8b4bc65af592726c3ed482b9770526a6e1 Mon Sep 17 00:00:00 2001
-From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
-Date: Wed, 6 Apr 2016 18:34:58 +0000
-Subject: [PATCH 1/3] Fix package name
-
-The properties of Exiv2 package are not being set properly
-due to incorrect package name.
-
-Upstream-Status: Pending
-
-Signed-off-by: Luis Gustavo S. Barreto <gustavo@ossystems.com.br>
---
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0f528ae..a18ca16 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -69,7 +69,7 @@ find_package(PNG)
- set_package_properties(PNG PROPERTIES URL "http://www.libpng.org" DESCRIPTION "PNG image manipulation support" TYPE REQUIRED)
- 
- find_package(Exiv2)
-set_package_properties(EXIV2 PROPERTIES URL "http://www.exiv2.org" DESCRIPTION "image metadata support" TYPE REQUIRED)
-+set_package_properties(Exiv2 PROPERTIES URL "http://www.exiv2.org" DESCRIPTION "image metadata support" TYPE REQUIRED)
- 
- find_package(KF5Kipi)
- if (KF5Kipi_FOUND)
-- 
-2.1.4
-
--- a/recipes-kde/apps/gwenview/files/0002-Set-Kipi-package-properties.patch
+++ b/recipes-kde/apps/gwenview/files/0002-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
-
--- a/recipes-kde/apps/gwenview/files/0003-Avoid-try_run.patch
+++ b/recipes-kde/apps/gwenview/files/0003-Avoid-try_run.patch
@@ -1,106 +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 | 68 +++++++++++++++++++++++++++++++++---------------------
- 1 file changed, 42 insertions(+), 26 deletions(-)
-
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index cd2dbcb..0adbd3c 100644
--- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -10,40 +10,56 @@ message(STATUS "Looking for libjpeg version in ${JPEG_INCLUDE_DIR}/jpeglib.h")
- # 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>
- 
-int main(void) { printf(\"%d\\\n\", JPEG_LIB_VERSION); }
-")
-+function(JPEGVersionCheck Ret Op Version)
-+    set(JPEGLIB_VERSION_CHECK_PATH "${CMAKE_CURRENT_BINARY_DIR}/jpeglib-version-check.c")
-+    file(WRITE ${JPEGLIB_VERSION_CHECK_PATH} "
-+    #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;
-+    }
-+    ")
- 
-try_run(JPEGLIB_RUN_RESULT JPEGLIB_COMPILE_RESULT
-    ${CMAKE_CURRENT_BINARY_DIR} ${JPEGLIB_VERSION_CHECK_PATH}
-    RUN_OUTPUT_VARIABLE jpeglib_version)
-+    try_compile(COMPILE_RESULT_VAR
-+        "${CMAKE_BINARY_DIR}" "${JPEGLIB_VERSION_CHECK_PATH}"
-+         COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS}"
-+         OUTPUT_VARIABLE COMPILE_OUT)
- 
-if ((${JPEGLIB_COMPILE_RESULT} EQUAL FALSE) OR ("${JPEGLIB_RUN_RESULT}" EQUAL FAILED_TO_RUN) OR "${jpeglib_version}" STREQUAL "")
-    message(FATAL_ERROR "Could not find jpeglib.h. This file comes with libjpeg.")
-endif()
-+    set(${Ret} ${COMPILE_OUT} PARENT_SCOPE)
-+endfunction()
- 
-if ("${jpeglib_version}" LESS 80)
-    set(GV_JPEG_DIR libjpeg-62)
-endif()
-+find_package(JPEG REQUIRED)
- 
-if ("${jpeglib_version}" EQUAL 80)
-    set(GV_JPEG_DIR libjpeg-80)
-endif()
-+if(JPEG_FOUND)
-+    JPEGVersionCheck(JPEG_LIB_VERSION < 80)
-+    if (${JPEG_LIB_VERSION} MATCHES "#error")
-+      set(GV_JPEG_DIR libjpeg-62)
-+    endif()
- 
-if ("${jpeglib_version}" EQUAL 90)
-    set(GV_JPEG_DIR libjpeg-90)
-endif()
-+    JPEGVersionCheck(JPEG_LIB_VERSION == 80)
-+    if (${JPEG_LIB_VERSION} MATCHES "#error")
-+      set(GV_JPEG_DIR libjpeg-80)
-+    endif()
- 
-if ("${GV_JPEG_DIR}" STREQUAL "")
-    message(FATAL_ERROR "Unknown libjpeg version: ${jpeglib_version}")
-endif()
-+    JPEGVersionCheck(JPEG_LIB_VERSION == 90)
-+    if (${JPEG_LIB_VERSION} MATCHES "#error")
-+      set(GV_JPEG_DIR libjpeg-90)
-+    endif()
- 
-message(STATUS "libjpeg version: ${jpeglib_version}")
-+    if ("${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()
- 
- add_definitions(-Dlibjpeg_EXPORTS)
- include_directories(
-- 
-2.1.4
-
--- a/recipes-kde/apps/gwenview/gwenview.bb
+++ b/recipes-kde/apps/gwenview/gwenview.bb
@@ -1,41 +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] = "20774653ecf548ceeeae6b0fcdccd87b"
-SRC_URI[sha256sum] = "146aa96420d3af800371ec37964e35484309db975d71761ac3bb2ff9c95f9209"
-
-SRC_URI += " \
-    file://0001-Fix-package-name.patch  \
-    file://0002-Set-Kipi-package-properties.patch  \
-    file://0003-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 \
-"
--- a/recipes-kde/apps/kapman/kapman.bb
+++ b/recipes-kde/apps/kapman/kapman.bb
@@ -24,10 +24,11 @@ DEPENDS += "\
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "07a0c30b5c5b7077887af0761c23655e"
-SRC_URI[sha256sum] = "118a05d2f654114e6d2318c8cf65df7e247ea7cc4bdd36bf1369d540ce5ced43"
+SRC_URI[md5sum] = "fc9a511409d12da3273ca040a9802ac3"
+SRC_URI[sha256sum] = "340d5f206705f955990f1d5742ac37adb2874e6ee6529df6f8e4ade3aefeedd4"

 FILES_${PN} += " \
    ${datadir}/kxmlgui5 \
    ${datadir}/icons \
+    ${datadir}/appdata \
 "
--- a/recipes-kde/apps/kate/kate.bb
+++ b/recipes-kde/apps/kate/kate.bb
@@ -30,8 +30,8 @@ DEPENDS += " \
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "85d9b0c9f7f297211a41d8fa3892128e"
-SRC_URI[sha256sum] = "8df0040326469361d1f163616810c9c1a89dad675a81144dc3b5d3ae3f3f15a9"
+SRC_URI[md5sum] = "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} \
--- a/recipes-kde/apps/katomic/files/0001-fix-build-for-qtbase-build-without-session-support-Q.patch
+++ b/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

--- a/recipes-kde/apps/katomic/katomic.bb
+++ b/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] = "1a3f75807de16e780ba27e5a0427e3b3"
-SRC_URI[sha256sum] = "b3e65f4a5d9d0d4672776584f8555be6b565c52c256a7eabd36ba990be238bc9"
+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} \
 "
--- a/recipes-kde/apps/kbounce/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
+++ b/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

--- a/recipes-kde/apps/kbounce/kbounce.bb
+++ b/recipes-kde/apps/kbounce/kbounce.bb
@@ -26,8 +26,8 @@ DEPENDS += "\
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "579011c3c934e577274a22c865433f9c"
-SRC_URI[sha256sum] = "832be0c6fd32ab01cac45f384c8d962f1e0cdbb26ac04fd64e4ecf1c939d1f5c"
+SRC_URI[md5sum] = "87eb036391a6cd78e1ea1a70f995cac3"
+SRC_URI[sha256sum] = "47904cc34aeff65b1340a5371b3e81ccc7959b6d0bb66d6a0ed298948f94ed49"
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"

 FILES_${PN} += " \
--- a/recipes-kde/apps/kcalc/kcalc.bb
+++ b/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] = "94a956d4b312fe641a6615eee431b591"
-SRC_URI[sha256sum] = "a6f2e4efbaa7b987057986c065d9fd00903292edfb3090907ff00ae6a52b68ad"
-
-FILES_SOLIBSDEV = ""
-
-FILES_${PN} += " \
-    ${datadir}/config.kcfg \
-    ${datadir}/kxmlgui5 \
-    ${datadir}/kconf_update \
-    ${libdir}/libkdeinit5_kcalc.so \
-"
-
--- a/recipes-kde/apps/kcolorchooser/kcolorchooser.bb
+++ b/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] = "adacf0f8dd552dc23dc7f0b04b5030d7"
-SRC_URI[sha256sum] = "f7f46ac20b36047a6065643daac831a5e10458a0563d3bc7627af82e9a4f01ce"
-
-FILES_${PN} += " \
-    ${datadir}/icons \
-"
--- a/recipes-kde/apps/kdenlive/kdenlive.bb
+++ b/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] = "79982708bd27e58855fa4af2ee23302b"
-SRC_URI[sha256sum] = "d5af3f96c1d43c3f0a28844b0c56dd3951f07cd6a48355096cb6272d1dbba40c"
+SRC_URI[md5sum] = "62fc024bc9616756b5ad6444308e636f"
+SRC_URI[sha256sum] = "5a6f4ae4bd07c64b90a3ebe88775b457c9c1d8b3a23820203d86df114183fbf8"

 SRC_URI += " \
    file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \
@@ -46,6 +43,7 @@ FILES_${PN} += " \
    ${datadir}/mime \
    ${datadir}/menu \
    ${datadir}/icons \
+    ${datadir}/appdata \
    ${OE_QMAKE_PATH_PLUGINS} \
 "

--- a/recipes-kde/apps/kdiamond/kdiamond.bb
+++ b/recipes-kde/apps/kdiamond/kdiamond.bb
@@ -25,8 +25,8 @@ DEPENDS += "\
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "129e12704d62511ba10b97ae12e80e7e"
-SRC_URI[sha256sum] = "fc4bdddbbc2640b73229e9e23cf28bd2729a07f1af986c5f5bef8b7b4ba4318f"
+SRC_URI[md5sum] = "7c94647e942d75ff1b10bf83cdc6973d"
+SRC_URI[sha256sum] = "e504c5b15e55f80afcc3da7ea4cec1efb5a56b906d8badf0db39382604d38713"
 SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"

 FILES_${PN} += " \
--- a/recipes-kde/apps/kio-extras/kio-extras.bb
+++ b/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] = "d4af7bc86b6e767e910a84f2a6e6c61d"
-SRC_URI[sha256sum] = "100e69d7ad0df39ee8a2789dce0b02601097cce903a902f4e1aa633a953cafeb"
+SRC_URI[md5sum] = "819bf5ec77953460993529076e0b9023"
+SRC_URI[sha256sum] = "e7409ae4b788d0484f8d026580ae821487993d791a48bd14f435b447e93fc950"

 FILES_${PN} += " \
    ${datadir}/kio_bookmarks \
--- a/recipes-kde/apps/kmix/kmix.bb
+++ b/recipes-kde/apps/kmix/kmix.bb
@@ -26,8 +26,8 @@ PACKAGECONFIG = "pulseaudio"
 PACKAGECONFIG[pulseaudio] = ",,pulseaudio"

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "e601e4b4c188c08c475e32432dec0f41"
-SRC_URI[sha256sum] = "edda5a766b901dbda6404f8c995ba0d489751f6a65f8d546f18d851db0861847"
+SRC_URI[md5sum] = "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 \
 "
--- a/recipes-kde/apps/konsole/konsole.bb
+++ b/recipes-kde/apps/konsole/konsole.bb
@@ -36,8 +36,8 @@ DEPENDS += " \


 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "53d3d26f125cd8d42fe08942aa7c939c"
-SRC_URI[sha256sum] = "f650ee9f27769ae5f97e1809e6530b525f4c2cc30a4fb7ed85fc63447d170bb6"
+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
@@ -45,6 +45,7 @@ FILES_SOLIBSDEV = ""

 FILES_${PN} += " \
    ${datadir}/k*5 \
+    ${datadir}/appdata \
    ${OE_QMAKE_PATH_PLUGINS} \
    ${libdir}/libkdeinit5_konsole.so \
 "
--- a/recipes-kde/apps/krita/files/0001-fix-build-with-GLES2.patch
+++ b/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
-
--- a/recipes-kde/apps/krita/krita.bb
+++ b/recipes-kde/apps/krita/krita.bb
@@ -1,35 +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
-
-DEPENDS += " \
-    libraw \
-    libeigen \
-    \
-    karchive \
-    kconfig \
-    kwidgetsaddons \
-    kcompletion \
-    kcoreaddons \
-    kguiaddons \
-    ki18n \
-    kitemmodels \
-    kitemviews \
-    kwindowsystem \
-    kio \
-    kcrash \
-"
-
-PV = "3.0"
-SRC_URI = " \
-    ${KDE_MIRROR}/stable/krita/${PV}/${BPN}-${PV}.tgz \
-    file://0001-fix-build-with-GLES2.patch \
-"
-SRC_URI[md5sum] = "beb7140471d1b6b0ae92d664743c067f"
-SRC_URI[sha256sum] = "4cea85623b709d6d32084c98a0fd76b97ad96d11be9808fca9fcaad2839a9c5a"
--- a/recipes-kde/apps/ksystemlog/ksystemlog.bb
+++ b/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] = "d095f506f375d0e7fae65d4ec2d4237b"
-SRC_URI[sha256sum] = "3bc1571e8aae59ae7738aa1ff3b2d363895a359711363f18e4bf20c9172df9bb"
-
-FILES_${PN} += "${datadir}/kxmlgui5"
--- a/recipes-kde/apps/kwalletmanager/kwalletmanager.bb
+++ b/recipes-kde/apps/kwalletmanager/kwalletmanager.bb
@@ -23,8 +23,8 @@ DEPENDS += " \
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "15d01c679a4f497b589dce91b98e93c2"
-SRC_URI[sha256sum] = "98bfbb19d0710d36565e2e81e2bd3fdd55e67daf18c18a234508afdbe2c7ddcd"
+SRC_URI[md5sum] = "9d78904e2038b0f01f9d84d6b4545826"
+SRC_URI[sha256sum] = "ce269540a3c7330f7bf8b8b7bd6722dcc5585a0190355165adc0ef670f6e61e9"
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"

 FILES_${PN} += " \
--- a/recipes-kde/apps/libkdegames/libkdegames.bb
+++ b/recipes-kde/apps/libkdegames/libkdegames.bb
@@ -40,8 +40,8 @@ DEPENDS += "\
 " 

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "578f37a9a68b41226be5e650d9a19f6e"
-SRC_URI[sha256sum] = "ed23972888170c88985b42cd9f6e351e1bd1d7e705c6e119915e398966f8d2e7"
+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"
--- a/recipes-kde/apps/lokalize/lokalize.bb
+++ b/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] = "49f6fa5154669c16082312df312d3dfa"
-SRC_URI[sha256sum] = "21561303223a0f8ebc45ba985f3fe77d01921973f2284dbd8f0b2626d6f7c3b8"
-
-FILES_${PN} += " \
-    ${datadir}/config.kcfg \
-    ${datadir}/k*5 \
-    ${datadir}/icons \
-"
-
-RDEPENDS_${PN} += "translate-toolkit"
--- a/recipes-kde/apps/marble/marble.bb
+++ b/recipes-kde/apps/marble/marble.bb
@@ -28,8 +28,8 @@ DEPENDS += " \
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "e2e6315ba8277027f03ee2b5fe9c84a6"
-SRC_URI[sha256sum] = "5a3dabcf0a28b5446030ab1831be13f0d0d4589d57da9f3a2e71e53629f331cb"
+SRC_URI[md5sum] = "a7a481936281a7d584b9168d98fcd5d5"
+SRC_URI[sha256sum] = "6aa7f939a3221e2a40f62548d8af0718c10b6253a28472b233aeccc062b30d06"
 SRC_URI += "file://0001-align-path-of-designer-plugins.patch"

 PACKAGES =+ " \
@@ -37,9 +37,6 @@ PACKAGES =+ " \
    ${PN}-designer-plugin-dbg ${PN}-designer-plugin \
 "

-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"
@@ -48,8 +45,7 @@ FILES_${PN} += " \
    ${datadir}/config.kcfg \
    ${datadir}/icons \
    ${datadir}/k*5 \
-    ${datadir}/mime \
-    ${libdir}/libmarbledeclarative.so \
+    ${datadir}/appdata \
    ${OE_QMAKE_PATH_PLUGINS} \
 "

--- a/recipes-kde/apps/minuet/minuet.bb
+++ b/recipes-kde/apps/minuet/minuet.bb
@@ -1,28 +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 += "\
-    drumstick \
-    ki18n \
-    kxmlgui \
-    kio \
-    kcrash \
-    kdoctools \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "785934edebfeaa7fef125f489cf42d3a"
-SRC_URI[sha256sum] = "84270171fec23544b991715d8e29dbfba04d65a9304d575ae24347af8a025f8f"
-
-FILES_${PN} += " \
-    ${datadir}/kxmlgui5 \
-    ${datadir}/icons \
-"
-
-RDEPENDS_${PN} += "timidity++"
--- a/recipes-kde/apps/okteta/okteta.bb
+++ b/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] = "823fa7de994492b29b9cadfe9983621c"
-SRC_URI[sha256sum] = "b034e0ab9f6989012437f790c346deaec2511e764c939a9774fa0fa5bc6bd563"
-
-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 \
-"
--- a/recipes-kde/apps/oxygen-icons/oxygen-icons.bb
+++ b/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"

--- a/recipes-kde/apps/spectacle/spectacle.bb
+++ b/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] = "55a2f8617913306d78307bbedee343b2"
-SRC_URI[sha256sum] = "9c5cd301359159c46ee0ba897e1e96c797677ccf283d823a2092979b92a6aa5f"
+SRC_URI[md5sum] = "bedebdd924cf5a650c87b1306d4e6a94"
+SRC_URI[sha256sum] = "303b4739c544e3292a19f4cca4b8f8627f4430b18deb87dbe3e189324974ce7a"

 FILES_${PN} += " \
    ${datadir}/dbus-1 \
--- a/recipes-kde/apps/umbrello/umbrello.bb
+++ b/recipes-kde/apps/umbrello/umbrello.bb
@@ -1,35 +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 \
-    \
-    karchive \
-    kcompletion \
-    kconfig \
-    kcoreaddons \
-    kdoctools \
-    ki18n \
-    kiconthemes \
-    kio \
-    ktexteditor \
-    kwidgetsaddons \
-    kxmlgui \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "a8a8de6d313c5dffd38ba91e8586a3c8"
-SRC_URI[sha256sum] = "11802523002b809ed5ba10bcb341b9dfc579dbc53b1df70442c4c5329684f715"
-
-EXTRA_OECMAKE += "-DBUILD_KF5=1"
-
-FILES_${PN} += " \
-    ${datadir}/kxmlgui5 \
-"
--- a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb
+++ b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb
@@ -2,7 +2,7 @@ require ${BPN}.inc

 inherit cmake-lib

-DEPENDS += "${BPN}-native libpcre"
+DEPENDS += "${BPN}-native libpcre kdoctools"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5JS, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc
+++ b/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] = "7ffd38082aa627f42a9e4830a739f8c6"
-SRC_URI[sha256sum] = "cacea5f661214ed900ffa61b62116ca1dc843286593b56e9f49b4d13dc3ac5f6"
+SRC_URI[md5sum] = "332bd1a8e3d131a5cd7774f3d1092bc3"
+SRC_URI[sha256sum] = "c23439fe7373d5e1e153e7e0f67ee6bb573da901659bb67068740f0dbda0097d"
 SRC_URI += "file://0001-create_hash_table-avoid-polution-of-files-with-build.patch"
-
-DEPENDS += " \
-    kdoctools \
-"
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch
+++ b/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)
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch
+++ b/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)
 
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb
@@ -11,3 +11,5 @@ DEPENDS += " \
 SRC_URI += " \
 	file://0003-only-build-kf5-config-for-native.patch \
 "
+
+EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc
+++ b/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] = "37284190af0a84cdd2a12636b5b71b2e"
-SRC_URI[sha256sum] = "6ca7bc090f32d6d43c4147815b3d13fae1de904088ff948a0fe8588d56093bb2"
-
-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 \
--- a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
@@ -32,8 +32,8 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "e9b1763b2649d7e21e6cda3e0c5773bf"
-SRC_URI[sha256sum] = "95af84cde953f9ddbff9e6237e7ac395877f0e8b753f8c5473070ecd1329ad5e"
+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}"
--- a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
@@ -16,8 +16,8 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "f1d0c9a46be19e69a493f75fc8af54e7"
-SRC_URI[sha256sum] = "d83f78bd15491d55f17d33f48c051cd3f6e37dcad382c7b460fb8132aadce1a9"
+SRC_URI[md5sum] = "a3d27a96247c55ea52df34f1cbbc1b2a"
+SRC_URI[sha256sum] = "6dcc5fd2e53230076404e905416369d43f8f746c2267a746a0a65ecdbd3af856"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5JsEmbed, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb
@@ -20,8 +20,8 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "bb96fd634617bcac31974f9b63f41252"
-SRC_URI[sha256sum] = "84681930bbaa248e524651f95c3abce20a3b320c48a2df086675688974bb893f"
+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}"
--- a/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
@@ -2,20 +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 cmake-lib
+inherit kde-kf5-porting-aids cmake-lib

 DEPENDS += "qtdeclarative kconfig kcoreaddons ki18n kio kservice plasma-framework solid threadweaver"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "427349a763c831796b3de0be4b17a019"
-SRC_URI[sha256sum] = "d52f36b4cd1aca71ca6bae2a3c147ff826aa45bb90e9d6d5536c8a4ddc85ac27"
+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"
--- a/recipes-kde/kf5/tier1/attica/attica.bb
+++ b/recipes-kde/kf5/tier1/attica/attica.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \

 inherit kde-kf5 cmake-lib

-SRC_URI[md5sum] = "000a8c34e6c4e548f53493c4519c3c1c"
-SRC_URI[sha256sum] = "951af772a83237d2c0c9a7fede2608101041d2cc13716221c97d9c79cc79e5be"
+SRC_URI[md5sum] = "55422b499a3ebc5743df167b26685f3c"
+SRC_URI[sha256sum] = "bc97eb3fde1b77f14e7b3169aeefab674f5caa43998705a2b7c7f534959ad7d8"

 PV = "${KF5_VERSION}"

--- a/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb
+++ b/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb
@@ -7,10 +7,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "qtdeclarative"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "2e03661752de63494541649158d712fa"
-SRC_URI[sha256sum] = "45c4145db2da69dd4e9e6f632740a1e71365eca1efb8c57a6e43a2b477be4b41"
-
-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"
--- a/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.bb
+++ b/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.bb
@@ -1,15 +0,0 @@
-SUMMARY = "Breeze icon theme"
-LICENSE = "LGPLv2.1 & LGPLv3"
-LIC_FILES_CHKSUM = " \
-    file://COPYING-ICONS;md5=3e7f6a3da5801872be1084a978cfc0eb \
-    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-"
-
-inherit kde-kf5 gtk-icon-cache
-
-SRC_URI[md5sum] = "6f7e0a3d91a18fc31c7b4683f1174358"
-SRC_URI[sha256sum] = "e274c7f5c71c177e2e9d8ced9c49cd052ec2f726cb693c7df73e96af12277e8f"
-
-PV = "${KF5_VERSION}"
-
-FILES_${PN} += "${datadir}/icons"
--- a/recipes-kde/kf5/tier1/karchive/karchive.inc
+++ b/recipes-kde/kf5/tier1/karchive/karchive.inc
@@ -10,5 +10,5 @@ inherit kde-kf5
 DEPENDS += "bzip2 xz zlib"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "7205f46ad213e85a736da5f808b5b8df"
-SRC_URI[sha256sum] = "0c338f1e1adc5522de6555fa3fa8c6ebcde29ce48e1f5959beca12d46aea88d8"
+SRC_URI[md5sum] = "5e6da520d4910dad8a03dde2d5b4c2d2"
+SRC_URI[sha256sum] = "059e81e707b09ac2cba69264cfa4ac17bcc93f9838b02495fd6325e2114f055e"
--- a/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb
+++ b/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5 cmake-lib

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "089c46445618fbc36c11de7eccd61256"
-SRC_URI[sha256sum] = "d5bef19f3575784e93b55db76bbaea7f8dba2bed4ffd9b9fbbb52db6d85f4ea5"
+SRC_URI[md5sum] = "acc299e8013b8fcb0e00d42715570ef3"
+SRC_URI[sha256sum] = "9098cec9ed88287cf000580c2381a60faad45e1f7b70a1a391c2b579fe6dd2c6"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5Codecs, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-kde/kf5/tier1/kconfig/kconfig.bb
+++ b/recipes-kde/kf5/tier1/kconfig/kconfig.bb
@@ -10,7 +10,7 @@ SRC_URI += "file://0004-kconf_update-fix-paths.patch"
 CMAKE_ALIGN_SYSROOT[1] = "KF5Config, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Config, -S${includedir}, -S${STAGING_INCDIR}"
 # native executables
-CMAKE_ALIGN_SYSROOT[3] = "KF5Config, -S${libexecdir}/kf5, -S${STAGING_LIBEXECDIR_NATIVE}/kf5"
+CMAKE_ALIGN_SYSROOT[3] = "KF5Config, -S${libdir}/kconfig/kf5, -S${STAGING_LIBDIR_NATIVE}/kconfig/kf5"

 PACKAGES =+ "${PN}-bin"

--- a/recipes-kde/kf5/tier1/kconfig/kconfig.inc
+++ b/recipes-kde/kf5/tier1/kconfig/kconfig.inc
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "03112534b86d98716cf61865d0ea2497"
-SRC_URI[sha256sum] = "498332f1c3fbb5e0d681cf6807502c1fe0aef74e79b29cd1e60e4096924949c2"
+SRC_URI[md5sum] = "061b6eedc15239368e5bd60645b99a50"
+SRC_URI[sha256sum] = "36a4c887080bff674bccd302985ff9a401d8e1a8a0649616ff686f4d1ddceee8"

 # REVISIT remove ugly hack for wayland-only environments
 SRC_URI += " \
--- a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc
+++ b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc
@@ -7,5 +7,5 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5 mime

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "25a40738d380e465ae5161cbaa2b282c"
-SRC_URI[sha256sum] = "5479180bcb6034cfcfbe779d88d91e11233f2120ba6314d180a1f87ad3f02c09"
+SRC_URI[md5sum] = "978c394967cbf1677a6adf75ddc807fe"
+SRC_URI[sha256sum] = "ee7785642f3bcbb513c6a236f8f13a14809ee58b69a7a885c4c63688acbac817"
--- a/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb
+++ b/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb
@@ -11,8 +11,8 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "cd6d6dbfc47cb82a7fb0b81adc24aad7"
-SRC_URI[sha256sum] = "3db7b90f37ac78c813e2554ce48591b3535732207b1c94deed3a13aea554132e"
+SRC_URI[md5sum] = "075272719a8d04a10f9c8d202fc6e5b3"
+SRC_URI[sha256sum] = "487d4859bf3e87e10ba76907f3417ec0b21624fda6d6aed25ca687affee03c51"

 CMAKE_ALIGN_SYSROOT[1] = "KF5DBusAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5DBusAddons, -S${includedir}, -S${STAGING_INCDIR}"
--- a/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb
+++ b/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb
@@ -10,8 +10,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "avahi"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "31c35cb2b97f150d103484501cc55aca"
-SRC_URI[sha256sum] = "256a5c9c1598b0b4f55730efc198e5c6d27aea38bd245725b204e29dc0a517de"
+SRC_URI[md5sum] = "9b5d3628895cc6f09adf47856fc392ab"
+SRC_URI[sha256sum] = "34ec8043f4bf0a226f6e615952360de501ce1b24b1ac9a5fd0f30fa61da6778b"

 CMAKE_ALIGN_SYSROOT[1] = "KF5DNSSD, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5DNSSD, -S${includedir}, -S${STAGING_INCDIR}"
--- a/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb
+++ b/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb
@@ -12,8 +12,8 @@ DEPENDS += " \
 "

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "bfba32b6ee6f1288fef0d7156bf81961"
-SRC_URI[sha256sum] = "136cb22285eeb7e15a02cdcc8e8bc65edc777dd923125bd64695eb10c9ff5d9f"
+SRC_URI[md5sum] = "d8a16a939ca84b04ec31b4b57a979bd7"
+SRC_URI[sha256sum] = "bf4b419964849f87e599313da8d2d0fe15cbfc1d12495d052be692c7e3927594"

 CMAKE_ALIGN_SYSROOT[1] = "KF5GuiAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5GuiAddons, -S${includedir}, -S${STAGING_INCDIR}"
--- a/recipes-kde/kf5/tier1/ki18n/ki18n.inc
+++ b/recipes-kde/kf5/tier1/ki18n/ki18n.inc
@@ -8,5 +8,5 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "051c7cab151f9d361d6da83968fb68d2"
-SRC_URI[sha256sum] = "5d9ae669b2c6a7637489ffb04d603762512fe8c78501ea5318acc387741e7167"
+SRC_URI[md5sum] = "cbea420a939fedd13f6d4c0b9279b758"
+SRC_URI[sha256sum] = "0926ef9fd9a1f7fe74c251c4fc155855fad2347eb37fb1e4dde12ea012c17493"
--- a/recipes-kde/kf5/tier1/kidletime/kidletime.bb
+++ b/recipes-kde/kf5/tier1/kidletime/kidletime.bb
@@ -10,8 +10,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcb qtx11extras libxscrnsaver", "", d)}"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "aba67367441db87daf4705e5cd0b4449"
-SRC_URI[sha256sum] = "4d430e6c345893df892a701a9cfab48c704057e3e18e65abec8014a05069576f"
+SRC_URI[md5sum] = "5ea44a48edb80307ad19d0fa6dac6384"
+SRC_URI[sha256sum] = "71256b1c1380fb2f7002db59b3f34ba492605193a48ceb7697ff66040ab6461c"

 SRC_URI += "file://0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch"

--- a/recipes-kde/kf5/tier1/kimageformats/kimageformats.bb
+++ b/recipes-kde/kf5/tier1/kimageformats/kimageformats.bb
@@ -6,14 +6,11 @@ LIC_FILES_CHKSUM = " \

 inherit kde-kf5

-DEPENDS += " \
-    karchive \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)} \
-"
+DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "610989615ba775f55bf07f1b5f5b3bf9"
-SRC_URI[sha256sum] = "e458c182338331c2617372876ddc24984886c006e5bba425261e0dc5621375be"
+SRC_URI[md5sum] = "023449bdce8c1dd8241bafafed7c006a"
+SRC_URI[sha256sum] = "cc5e4977fe26278374f1b18cc1225a7e921b5401cea2bc95f35893ae0960dff8"

 FILES_${PN} += " \
    ${OE_QMAKE_PATH_PLUGINS} \
--- a/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb
+++ b/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb
@@ -9,8 +9,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "qtdeclarative"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "83b9a034bbfaedf0cc12191157899006"
-SRC_URI[sha256sum] = "e44a5c4ba997993057e8ebda6df400c3f1b97bf81d11bb02af27950ff1cd749d"
+SRC_URI[md5sum] = "a9bbb20d5e0df44afd95f552fd9a116b"
+SRC_URI[sha256sum] = "84e3b054746921f44c66be76e8ae791a9e71e4c3648af497a114731a543cb964"

 CMAKE_ALIGN_SYSROOT[1] = "KF5ItemModels, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5ItemModels, -S${includedir}, -S${STAGING_INCDIR}"
--- a/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb
+++ b/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5 cmake-lib

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "324c058163bb418b26d9cba403e5133d"
-SRC_URI[sha256sum] = "98078899862514cc16ceff0275fe5eab43bc14e8f361af11a8e3c45a2fc5a284"
+SRC_URI[md5sum] = "bb909fcb3e98cfb55082e48d2ca6d669"
+SRC_URI[sha256sum] = "6b785b151c5e02e652d25371a133193ca60b9209a8cba6968c00e67f1d80eb82"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5ItemViews, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-kde/kf5/tier1/kplotting/kplotting.bb
+++ b/recipes-kde/kf5/tier1/kplotting/kplotting.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 inherit kde-kf5 cmake-lib

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "6906f6da8a6d680cd86d1ee96f80bf2b"
-SRC_URI[sha256sum] = "4a960a0bbeb364702dfecd4cff61c4082bc7a04736ed76d4deef821f7b246676"
+SRC_URI[md5sum] = "57803cd443bc0a1d1c957c71f08e7899"
+SRC_URI[sha256sum] = "8c15aeb060130fb04f5c11d28085ed7bb04fcd85d7aa8da0cb2e99dd5eea38ca"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5Plotting, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb
+++ b/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb
@@ -10,8 +10,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "qttools"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "c4b6185dac9cecd6af6eea3b56f2271f"
-SRC_URI[sha256sum] = "1e099d9e021dc44fdee54220b30d3f48a72900fa88e8273ee7fea2895946a8bd"
+SRC_URI[md5sum] = "13f7cdb060d00905021f63ce24705219"
+SRC_URI[sha256sum] = "61eebbe729dba31fccfdd1178e50d4c2c9e4b221f193f2a0d2e57ec6d9f9d819"

 CMAKE_ALIGN_SYSROOT[1] = "KF5WidgetsAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5WidgetsAddons, -S${includedir}, -S${STAGING_INCDIR}"
--- a/recipes-kde/kf5/tier1/kwindowsystem/files/0001-config-kwindowsystem.h.cmake-fix-path-to-plugins.patch
+++ b/recipes-kde/kf5/tier1/kwindowsystem/files/0001-config-kwindowsystem.h.cmake-fix-path-to-plugins.patch
@@ -0,0 +1,28 @@
+From 4ed9c206257199eb8ea47fb7abecf993b0c0a23e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 14 Aug 2015 21:53:55 +0200
+Subject: [PATCH] config-kwindowsystem.h.cmake: fix path to plugins
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/config-kwindowsystem.h.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/config-kwindowsystem.h.cmake b/src/config-kwindowsystem.h.cmake
+index 9afe81f..7bc1d03 100644
+--- a/src/config-kwindowsystem.h.cmake
+++ b/src/config-kwindowsystem.h.cmake
+@@ -10,4 +10,4 @@
+ #cmakedefine01 KWINDOWSYSTEM_HAVE_XRENDER
+ 
+ /* Path to xcb plugin */
+-#define XCB_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/org.kde.kwindowsystem.platforms/KF5WindowSystemX11Plugin.so"
+#define XCB_PLUGIN_PATH "${PLUGIN_INSTALL_DIR}/kf5/org.kde.kwindowsystem.platforms/KF5WindowSystemX11Plugin.so"
+-- 
+2.1.0
+
--- a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
+++ b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
@@ -9,8 +9,9 @@ inherit kde-kf5 cmake-lib cmake-auto-align-paths
 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)}"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "ae52891201ea66b15d94a4f5a2717a5f"
-SRC_URI[sha256sum] = "b8228dddcc6487e234f81239bea7ca7ae261af8fef7b9e5d7a8b49aa3ac5d0dd"
+SRC_URI += "file://0001-config-kwindowsystem.h.cmake-fix-path-to-plugins.patch"
+SRC_URI[md5sum] = "c1a5c3dee013ee189d3279a9e58189e3"
+SRC_URI[sha256sum] = "67567ba32268d0a5365106b7e98e69eb77880271580c68adbf0d128f32691f06"

 FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
 FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/*/.debug"
--- a/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb
+++ b/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb
@@ -7,8 +7,8 @@ inherit kde-kf5 cmake-lib pkgconfig cmake-auto-align-paths
 DEPENDS += "modemmanager"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "df3b50fe7df5b7c409d80b83beb0337f"
-SRC_URI[sha256sum] = "1cae698fe3624db365443bba099ab2b1e606a36466a9518b87383b1641ffac94"
+SRC_URI[md5sum] = "79a4865a6b4c60f180511c35fa1b664e"
+SRC_URI[sha256sum] = "5f25e9c9e1554338c8ffad30c5fee0d652d29d343a570e89d221143b3b3f6026"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5ModemManagerQt, -S${includedir}, -S${STAGING_INCDIR}"
--- a/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
+++ b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
@@ -7,8 +7,8 @@ inherit kde-kf5 pkgconfig cmake-lib cmake-auto-align-paths
 DEPENDS += "networkmanager"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "45b8586afc97200ea687996fc5ce2327"
-SRC_URI[sha256sum] = "3c5473e9fda6d2978deb602c42a4af84529578d2971a7c54d224e17867e95a54"
+SRC_URI[md5sum] = "5bd6cc807ce152c241aa33a16339710a"
+SRC_URI[sha256sum] = "96fec981a95c4e0a20e4b7878dd0d0702434af1dee3a1a3d1ce2cba2390a4886"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5NetworkManagerQt, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andreas Müller	b6b5e326f8	Merge pull request #11 from Tarnyko/jethro kactivites: fix build	2016-06-11 22:00:31 +02:00
Andreas Müller	a7f73b678f	Merge pull request #12 from Tarnyko/jethro2 kmix: initial add 15.12.0	2016-06-11 22:00:11 +02:00
Manuel Bachmann	f9a61af624	kmix: initial add 15.12.0 KMix is KDE's audio mixer, and has recently been ported to KDE Frameworks 5. Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>	2016-06-07 15:15:47 +00:00
Manuel Bachmann	392a9911c4	kactivites: fix build kactivities was not compiling, due to "desktopfileparser" trying to locate "kfileitemactionplugin.desktop" in the target's default /usr/*/share directories. Add the host datadir to fix this. Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>	2016-06-07 13:29:29 +00:00
Andreas Müller	e6d01af499	sonnet: add PACKAGECONFIG for hunspell disabled by default Came up when building with meta-office in layers. A patch moving hunspell to meta-oe is pending. Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>	2016-01-30 00:23:28 +01:00
Andreas Müller	846605a482	libqtxdg: handle application's PATH in desktop files Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>	2016-01-19 09:23:09 +01:00