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
232 changed files with 2089 additions and 1306 deletions
--- a/82
+++ b/82
@@ -18,6 +18,84 @@ antimony:
 ..........

 misc:
-* follow meta-qt5 to 5.5 / reduce meta-qt5 overrrides (pull #1)
 * proper gpgme solution see commit 618331ae
-* kjsembedded-native dummy?
+
+
+* Optionals / PACKAGECONFIG / CMAKE_DISABLE_FIND_PACKAGE_<PackageName>:
+
+superandy@localhost cortexa8t2hf-vfp-neon-angstrom-linux-gnueabi]$ grep -r 'The following OPTIONAL packages have been found' `find -name log.do_configure`
+./plasma-nm/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kded/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kde-cli-tools/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./libksysguard/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kmenuedit/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdesu/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./ktexteditor/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdesignerplugin/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kfilemetadata/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./networkmanager-qt/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./plasma-framework/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./frameworkintegration/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kwallet/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kwallet/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdeplasma-addons/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./modemmanager-qt/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./ksysguard/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./plasma-workspace/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./sddm-kcm/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./muon/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kwayland-integration/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdeclarative/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kpeople/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kio-extras/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./libkscreen/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kcoreaddons/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kcrash/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kde-gtk-config/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./plasma-desktop/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./plasma-desktop/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./karchive/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kjobwidgets/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./khtml/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kidletime/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kjs/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kpackage/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kitemmodels/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kio/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kxmlgui/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./bluez-qt/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kinit/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kimageformats/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./marble/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdbusaddons/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdenlive/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kwindowsystem/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./ksshaskpass/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./filelight/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdoctools/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kservice/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./solid/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kwin/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kguiaddons/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./khotkeys/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./powerdevil/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./ark/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./plasma-mediacenter/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdelibs4support/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./sddm/0.13.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kglobalaccel/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kate/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./knotifications/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./dolphin/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./konsole/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./knotifyconfig/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kactivities/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./breeze/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kdnssd/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kconfigwidgets/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./user-manager/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kinfocenter/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kinfocenter/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./kwayland/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+./oxygen/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
+
--- a/classes/cmake-lib.bbclass
+++ b/classes/cmake-lib.bbclass
@@ -1,52 +1,86 @@
 # This class helps to align paths for cmake files in build sysroot while 
 # keeping proper paths for target packages/rootfs
 #
-# Alignment is controlled by
+# Alignment is controlled by:
 #
-# CMAKE_ALIGN_SYSROOT[unique-id] = "dir, search, replace"
+#   CMAKE_ALIGN_SYSROOT[<unique-id>] = "<dir>, <search>, <replace>"
 #
-# 'unique-id': 
-#    string value of your choice e.g. "1", "2"...
-#    !!COMMON PITFALL!!: Copy & Paste CMAKE_ALIGN_SYSROOT lines without updating unique-id -> 
-#    not all lines are evaluated!!
+#   <unique-id>:
+#      string value of your choice e.g. "1", "2"...
+#      !!COMMON PITFALL!!: Copy & Paste CMAKE_ALIGN_SYSROOT lines without updating unique-id ->
+#      not all lines are evaluated!!
 #
-# 'dir':
-#    cmake configuration files are usually installed as
+#   <dir>:
+#      cmake configuration files are usually installed as
 #
-#    1. ${libdir}/cmake/<CMakePackageName>/*.cmake
-#    or
-#    2. ${datadir}/cmake/<CMakePackageName>/*.cmake
-#    
-#    'dir' can be any matching part of 1. and 2. but suggestion is to use
-#    is <CMakePackageName>
+#      1. ${libdir}/cmake/<CMakePackageName>/*.cmake
+#      or
+#      2. ${datadir}/cmake/<CMakePackageName>/*.cmake
 #
-# 'search'/'replace':
-#    cmake configuration files are scanned and the resulting string found in 'search'
-#    is replaced by resulting string of 'replace'. To create a resulting string currently
-#    6 command-line like options are available (see parseparam below):
+#      'dir' can be any matching part of 1. and 2. but suggestion is to use
+#      is <CMakePackageName>
+#
+#   <search>/<replace>:
+#      cmake configuration files are scanned and the resulting string found in 'search'
+#      is replaced by resulting string of 'replace'. To create a resulting string currently
+#      6 command-line like options are available (see parseparam below):
+#
+#        -f<file-in-WORKDIR>:
+#          Resulting string is taken from the file <file-in-WORKDIR>. This option should be
+#          choosen for longer strings or stings containg ','.
+#        -F<file-in-WORKDIR>:
+#          same as -f but bitbake variables are expanded e.g '${libdir}' -> '/usr/lib'
+#        -s<string>
+#          Resulting string is <string>
+#        -S<string>
+#          same as -s but bitbake variables are expanded e.g '${libdir}' -> '/usr/lib'
+#        -c<shell-command>
+#          Resulting string is created by the shell command found in <shell-command>
+#        -C<shell-command>
+#          same as -c but bitbake variables are expanded BEFORE executing shell command
+#
+#
+# Native overriding:
+#
+#   CMAKE_ALIGN_SYSROOT_class-native[<unique-id>] = "<dir>, <search>, <replace>"
+#
+# Native extended recipe -> no native alignement:
+#
+#   CMAKE_ALIGN_SYSROOT_class-native[<unique-id>] = "ignore"
+#   CMAKE_ALIGN_SYSROOT[<unique-id>] = "<dir>, <search>, <replace>"
+#
+# Native extended recipe -> no cross alignement:
+#
+#   CMAKE_ALIGN_SYSROOT_class-native[<unique-id>] = "<dir>, <search>, <replace>"
+#   CMAKE_ALIGN_SYSROOT[<unique-id>] = "ignore"
 #
-#      -f<file-in-WORKDIR>:
-#        Resulting string is taken from the file <file-in-WORKDIR>. This option should be
-#        choosen for longer strings or stings containg ','.
-#      -F<file-in-WORKDIR>:
-#        same as -f but bitbake variables are expanded e.g '${libdir}' -> '/usr/lib'
-#      -s<string>
-#        Resulting string is <string>
-#      -S<string>
-#        same as -f but bitbake variables are expanded e.g '${libdir}' -> '/usr/lib'
-#      -c<shell-command>
-#        Resulting string is created by the shell command found in <shell-command>
-#      -C<shell-command>
-#        same as -c but bitbake variables are expanded BEFORE executing shell command

-# -c<shell-command>

 # filename for the file containg full names of all cmakefiles staged
 CMAKEINSTALLED = "${WORKDIR}/staged_cmake_files"

+# global helper to get CMAKE_ALIGN_SYSROOT array
+def get_align_flags(d):
+    ret = {}
+    if bb.data.inherits_class('native', d):
+        ret = d.getVarFlags("CMAKE_ALIGN_SYSROOT_class-native") or {}
+    if ret == {}:
+        ret = d.getVarFlags("CMAKE_ALIGN_SYSROOT") or {}
+    return ret
+
+# global helper to check CMAKE_ALIGN_SYSROOT array contains 'ignore'
+def get_flags_ignore(flags):
+    if flags and flags.values().count('ignore') > 0:
+        return True
+    return False
+
+
 # 1. basic checks for CMAKE_ALIGN_SYSROOT
 python () {
-    cmakehideflags = d.getVarFlags("CMAKE_ALIGN_SYSROOT") or {}
+    cmakehideflags = get_align_flags(d)
+    if get_flags_ignore(cmakehideflags):
+        return
+
    pn = d.getVar('PN', True)
    if cmakehideflags:
        for flag, flagval in sorted(cmakehideflags.items()):
@@ -120,14 +154,16 @@ python do_populate_sysroot_append() {
        else:
            bb.fatal("Parameter %s is too short for CMAKE_ALIGN_SYSROOT[%s] in %s" % (param, flag, pn))

-    # first check if cmake files were installed to sysroot
+    cmakehideflags = get_align_flags(d)
+    if get_flags_ignore(cmakehideflags):
+        return
+
+    # check if cmake files were installed to sysroot
    tmpfile = d.getVar('CMAKEINSTALLED', True)
    if (not os.path.isfile(tmpfile)) or os.path.getsize(tmpfile) == 0:
        bb.warn("There were no cmake files installed by %s" % pn)
    else:
        # parse CMAKE_ALIGN_SYSROOT[..]
-        cmakehideflags = d.getVarFlags("CMAKE_ALIGN_SYSROOT") or {}
-
        for flag, flagval in sorted(cmakehideflags.items()):
            items = flagval.split(",")

@@ -180,6 +216,10 @@ python do_populate_sysroot_append() {
                    bb.warn("No cmake replacements performed in %s for CMAKE_ALIGN_SYSROOT[%s]" % (pn, flag))
 }

-do_populate_sysroot[vardeps] += "CMAKE_ALIGN_SYSROOT"
-# REVISIT: CMAKE_ALIGN_SYSROOT cause configure rerun
-sysroot_cleansstate[vardeps] += "CMAKE_ALIGN_SYSROOT"
+do_populate_sysroot[vardeps] += "CMAKE_ALIGN_SYSROOT CMAKE_ALIGN_SYSROOT_class-native"
+
+# change of CMAKE_ALIGN_SYSROOT causes configure rerun which currently seems
+# the only way to force a rebuild at change of CMAKE_ALIGN_SYSROOT for recipes
+# depending on this recipe
+
+sysroot_cleansstate[vardeps] += "CMAKE_ALIGN_SYSROOT CMAKE_ALIGN_SYSROOT_class-native"
--- a/classes/kde-apps.bbclass
+++ b/classes/kde-apps.bbclass
@@ -1,7 +1,7 @@
 inherit kde-base

-KDE_APP_VERSION = "15.08.0"
+KDE_APP_VERSION = "15.12.0"

-SRC_URI = "http://download.kde.org/stable/applications/${KDE_APP_VERSION}/src/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"

 RRECOMMENDS_${PN} += "qtbase-plugins"
--- a/classes/kde-base.bbclass
+++ b/classes/kde-base.bbclass
@@ -1,9 +1,20 @@
 DEPENDS += "qtbase extra-cmake-modules-native"

-KDE_BRANCH ?= "master"
+KDE_MIRROR = "http://download.kde.org"

-# default git
-SRC_URI = "git://anongit.kde.org/${BPN};protocol=git;branch=${KDE_BRANCH}"
+MIRRORS += "\
+${KDE_MIRROR}	http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde \n \
+${KDE_MIRROR}	http://mirrors.mit.edu/kde \n \
+${KDE_MIRROR}	http://mirror.cc.columbia.edu/pub/software/kde \n \
+${KDE_MIRROR}	http://ftp.is.co.za/mirror/ftp.kde.org \n \
+${KDE_MIRROR}	http://mirror.squ.edu.om/kde \n \
+${KDE_MIRROR}	http://ftp.fi.muni.cz/pub/kde \n \
+${KDE_MIRROR}	http://mirrors.fe.up.pt/pub/kde \n \
+${KDE_MIRROR}	http://mirror.its.dal.ca/kde \n \
+${KDE_MIRROR}	http://kde.c3sl.ufpr.br \n \
+"
+
+SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"

 # extra-cmake-modules cause dependent to check for python
 inherit cmake_qt5 cmake-extra-sanity pythonnative
@@ -13,10 +24,10 @@ FILES_${PN}-dev += "${libdir}/cmake"
 FILES_${PN}-dbg += "${libdir}/plugins/kf5/.debug"

 EXTRA_OECMAKE += " \
-    -DECM_MKSPECS_INSTALL_DIR=${libdir}/${QT_DIR_NAME}/mkspecs/modules \
+    -DECM_MKSPECS_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \
    -DCMAKE_INSTALL_DATADIR=share \
    -DCMAKE_INSTALL_DBUSINTERFACEDIR=share/dbus-1/interfaces \
    -DKDE_INSTALL_QTPLUGINDIR=${OE_QMAKE_PATH_PLUGINS} \
    -DKDE_INSTALL_QMLDIR=${OE_QMAKE_PATH_QML} \
 "
-FILES_${PN}-dev += "${libdir}/${QT_DIR_NAME}/mkspecs"
+FILES_${PN}-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 = "http://download.kde.org/stable/frameworks/5.13/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.13.0"
+KF5_VERSION = "5.18.0"

-SRC_URI = "http://download.kde.org/stable/frameworks/5.13/${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.4.0"
+PLASMA_VERSION = "5.5.3"

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

-# we need this for bleeding edge qtwayland - this can go in 5.5 hopefully
-SRC_URI += "file://0001-Add-a-function-for-QPA-plugins-to-explicitly-destroy.patch"
-
 # session management only for x11 environment
 PACKAGECONFIG_DISTRO += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "sm", "", d)}"
--- a/extends-meta-qt5/qttools_git.bbappend
+++ b/extends-meta-qt5/qttools_git.bbappend
@@ -2,6 +2,15 @@ inherit cmake-lib

 DEPENDS += "${BPN}-native"

-# native binaries
+
+# It's really time for us to publish cmake-lib.bbclass
+SRC_URI_remove = " \
+    file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \
+"
+
+# native ignore
+CMAKE_ALIGN_SYSROOT_class-native[1] = "ignore"
+
+# cross -> native binaries
 CMAKE_ALIGN_SYSROOT[1] = "Qt5Help, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
 CMAKE_ALIGN_SYSROOT[2] = "Qt5LinguistTools, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
--- a/extends-meta-qt5/qtwayland_git.bbappend
+++ b/extends-meta-qt5/qtwayland_git.bbappend
@@ -1,9 +0,0 @@
-SRCREV = "0e4e0a7c6be2928cc4300c8ef41d10ed8b3b316c"
-QT_MODULE_BRANCH = "5.5"
-QT_VERSION = "5.5.0"
-
-LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
-                    file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
-                    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
--- a/extends-meta-qt5/qtxmlpatterns-native_git.bb
+++ b/extends-meta-qt5/qtxmlpatterns-native_git.bb
@@ -1,13 +0,0 @@
-require recipes-qt/qt5/qt5-git.inc
-require qt-native-ext.inc
-
-# There are no LGPLv3-only licensed files in this component.
-LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
-    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
-    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-SRCREV = "c21924d67a8ef39282afdf3ae6fef798dfca7135"
--- a/recipes-hawaii/qtconfiguration/files/0001-fix-build-with-qt-5.5.patch
+++ b/recipes-hawaii/qtconfiguration/files/0001-fix-build-with-qt-5.5.patch
@@ -0,0 +1,36 @@
+From 9d6d7a17b26935658c8fc546712e423fbd2cfad3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 13 Sep 2015 23:36:56 +0200
+Subject: [PATCH] fix build with qt 5.5
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+src/configuration/qgvariantutils.cpp:99:26: error: variable 'QDataStream s' has initializer but incomplete type
+             QDataStream s(&a, QIODevice::ReadOnly);
+                          ^
+
+Upstream-Status: Submitted [1]
+
+[1] https://github.com/hawaii-desktop/qtconfiguration/pull/1
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/configuration/qgvariantutils.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/configuration/qgvariantutils.cpp b/src/configuration/qgvariantutils.cpp
+index 757f56d..b5add00 100644
+--- a/src/configuration/qgvariantutils.cpp
+++ b/src/configuration/qgvariantutils.cpp
+@@ -39,6 +39,7 @@
+ #include <QtCore/QDebug>
+ #include <QtCore/QUrl>
+ #include <QtCore/QStringList>
+#include <QDataStream>
+ 
+ #include "qgvariantutils.h"
+ 
+-- 
+2.1.0
+
--- a/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb
+++ b/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb
@@ -11,7 +11,10 @@ inherit hawaii cmake-lib

 DEPENDS += "dconf"

-SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
+SRC_URI = " \
+    git://github.com/hawaii-desktop/${BPN}.git \
+    file://0001-fix-build-with-qt-5.5.patch \
+"
 SRCREV = "804739d73de982fc144ff45653c243cefcfa79cb"

 S = "${WORKDIR}/git"
--- a/recipes-kde/apps/ark/ark.bb
+++ b/recipes-kde/apps/ark/ark.bb
@@ -0,0 +1,42 @@
+SUMMARY = "Ark is KDE's file archiver"
+LICENSE = "GPLv2 & LGPLv3"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
+    file://COPYING.icons;md5=6e01bfa20e899e8ad569d5488923cbd2 \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += "\
+    libarchive \
+    karchive \
+    kconfig \
+    kcrash \
+    kdbusaddons \
+    kdoctools \
+    ki18n \
+    kiconthemes \
+    khtml \
+    kio \
+    kservice \
+    kpty \
+    kwidgetsaddons \
+" 
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "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 \
+    ${OE_QMAKE_PATH_PLUGINS} \
+"
+
+FILES_${PN}-dbg += " \
+    ${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
@@ -0,0 +1,41 @@
+From b7285c71f5b04bc55441217bf963078b38d6bad4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 11 Oct 2015 21:41:27 +0200
+Subject: [PATCH] fix build with QT_NO_SESSIONMANAGER set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ app/main.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/app/main.cpp b/app/main.cpp
+index 4a95063..c3d3a61 100644
+--- a/app/main.cpp
+++ b/app/main.cpp
+@@ -175,6 +175,7 @@ int main(int argc, char **argv)
+     KDBusService dbusService(KDBusService::Multiple);
+ 
+     //session restoring
+#ifndef QT_NO_SESSIONMANAGER
+     if (application.isSessionRestored()) {
+         if (!KMainWindow::canBeRestored(1)) {
+             return -1;
+@@ -186,7 +187,9 @@ int main(int argc, char **argv)
+             delete window;
+             return -1;
+         }
+-    } else { //new ark window (no restored session)
+    } else
+#endif
+    { //new ark window (no restored session)
+ 
+         // open any given URLs
+         const QStringList urls = parser.positionalArguments();
+-- 
+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] = "0180479093fa5b1fcd915c058d99dd37"
-SRC_URI[sha256sum] = "3f42c9c6fab0fe40b42cad455800f577dc6fa45d282ccc27a26ef200abe2c967"
+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
@@ -0,0 +1,27 @@
+SUMMARY = "Bovo is a Gomoku like game for two players"
+DESCRIPTION = "Bovo is a Gomoku (from Japanese 五目並べ - lit. 'five points') like game for two players, where the opponents alternate in placing their respective pictogram on the game board. (Also known as: Connect Five, Five in a row, X and O, Naughts and Crosses)"
+LICENSE = "GPLv2 & GFDL-1.2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=3c8ea28d12b8a786603a5394fc50096d \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += "\
+    kcoreaddons \
+    kdbusaddons \
+    kdoctools \
+    kxmlgui \
+    libkdegames \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "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] = "800309abf7c1a2d82a97bf261b31a770"
-SRC_URI[sha256sum] = "f4657968dd6a69469cbfc7ef20c4ff8b33bf670ce417ee7d5893c4c839694f89"
+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] = "11760d094c2c3e3fff0e89b81d4db118"
-SRC_URI[sha256sum] = "7ac16d7150b7c5e1d6350cf679981d675c995303a7f68eab1290763d3fd35ad9"
+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 \
--- 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] = "6d11da9a7aa087483727ad4b73083be6"
-SRC_URI[sha256sum] = "dbb627b001421b4f653aff005ca97bc7de1240a5bab339b3a2483a4ceea44878"
+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/kapman/kapman.bb
+++ b/recipes-kde/apps/kapman/kapman.bb
@@ -1,4 +1,7 @@
 SUMMARY = "Kapman is a clone of the well known game Pac-Man"
+DESCRIPTION = "Kapman is a clone of the well known game Pac-Man.\
+\
+You must run through the maze to eat all pills without being captured by a ghost. By eating an energizer, Kapman gets the ability to eat ghosts for a few seconds. When a stage is cleared of pills and energizer the player is taken to the next stage with slightly increased game speed."
 LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -21,8 +24,8 @@ DEPENDS += "\
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "986696147ec64e5d3ca96815ee3f7c73"
-SRC_URI[sha256sum] = "b87a50b277c20fba2cb217bb2328e80de5e9dbdd098a0ccc87f58226c96a48b6"
+SRC_URI[md5sum] = "fc9a511409d12da3273ca040a9802ac3"
+SRC_URI[sha256sum] = "340d5f206705f955990f1d5742ac37adb2874e6ee6529df6f8e4ade3aefeedd4"

 FILES_${PN} += " \
    ${datadir}/kxmlgui5 \
--- a/recipes-kde/apps/kate/files/0001-fix-build-for-qtbase-build-without-session-support-Q.patch
+++ b/recipes-kde/apps/kate/files/0001-fix-build-for-qtbase-build-without-session-support-Q.patch
@@ -9,15 +9,15 @@ Content-Transfer-Encoding: 8bit

 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- kate/src/kateapp.cpp        | 5 ++++-
- kate/src/katemainwindow.cpp | 2 ++
+ kate/kateapp.cpp            | 5 ++++-
+ kate/katemainwindow.cpp     | 2 ++
 kwrite/main.cpp             | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

 diff --git a/kate/src/kateapp.cpp b/kate/src/kateapp.cpp
 index 4c26f33..03fd159 100644
--- a/kate/src/kateapp.cpp
-+++ b/kate/src/kateapp.cpp
+--- a/kate/kateapp.cpp
+++ b/kate/kateapp.cpp
@@ -99,10 +99,13 @@ bool KateApp::init()
     // set KATE_PID for use in child processes
     qputenv("KATE_PID", QString::fromLatin1("%1").arg(QCoreApplication::applicationPid()).toLatin1().constData());
@@ -35,8 +35,8 @@ index 4c26f33..03fd159 100644
         if (!startupKate()) {
 diff --git a/kate/src/katemainwindow.cpp b/kate/src/katemainwindow.cpp
 index 464e20c..8efc401 100644
--- a/kate/src/katemainwindow.cpp
-+++ b/kate/src/katemainwindow.cpp
+--- a/kate/katemainwindow.cpp
+++ b/kate/katemainwindow.cpp
@@ -467,9 +467,11 @@ bool KateMainWindow::queryClose()
 {
     // session saving, can we close all views ?
--- a/recipes-kde/apps/kate/files/0002-fix-build-for-sessionless-kconfig.patch
+++ b/recipes-kde/apps/kate/files/0002-fix-build-for-sessionless-kconfig.patch
@@ -8,14 +8,14 @@ Content-Transfer-Encoding: 8bit

 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- kate/src/kateapp.cpp | 2 ++
- kwrite/kwrite.cpp    | 2 ++
+ kate/kateapp.cpp   | 2 ++
+ kwrite/kwrite.cpp  | 2 ++
 2 files changed, 4 insertions(+)

-diff --git a/kate/src/kateapp.cpp b/kate/src/kateapp.cpp
+diff --git a/kate/kateapp.cpp b/kate/kateapp.cpp
 index 03fd159..ae2c793 100644
--- a/kate/src/kateapp.cpp
-+++ b/kate/src/kateapp.cpp
+--- a/kate/kateapp.cpp
+++ b/kate/kateapp.cpp
@@ -121,6 +121,7 @@ bool KateApp::init()
 
 void KateApp::restoreKate()
--- 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] = "fdc3f4b38f7595434d4148494f546132"
-SRC_URI[sha256sum] = "834bd05c2e565d030cb58e47ae5a1bc0f487242bcca7b8d54de0fd73ace13656"
+SRC_URI[md5sum] = "80a3a02c3ab25f614e523b881e5483b8"
+SRC_URI[sha256sum] = "ae979ac3b5c18ddb2a9701e59cf0e70b9e366c1fa08325bb771a95de3a12526f"

 SRC_URI += " \
    file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
--- a/recipes-kde/apps/katomic/katomic.bb
+++ b/recipes-kde/apps/katomic/katomic.bb
@@ -1,4 +1,5 @@
 SUMMARY = "Katomic is a fun and educational game built around molecular geometry"
+DESCRIPTION = "KAtomic is a fun educational game built around molecular geometry. It employs simplistic two-dimensional looks at different chemical elements."
 LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -24,8 +25,8 @@ DEPENDS += "\
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "5e336006d70b9786ae9d50c861af6c18"
-SRC_URI[sha256sum] = "03f190d17aef394b1eeb37ff70eeaa7e7280865eb01149ebee48f2083e1663a8"
+SRC_URI[md5sum] = "3af891e3527a254a901fa1ca88412f63"
+SRC_URI[sha256sum] = "1a85acea5ce335cb111bf34f1f4f281e08e737698795eaf3f05a148c9721fa69"
 SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"

 FILES_${PN} += " \
--- 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
@@ -0,0 +1,36 @@
+From 616528cad6a98b2604eb8365f55538a738e7db2e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 11 Oct 2015 21:34:06 +0200
+Subject: [PATCH] fix build with QT_NO_SESSIONMANAGER set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ main.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/main.cpp b/main.cpp
+index 0a02928..9614c70 100644
+--- a/main.cpp
+++ b/main.cpp
+@@ -78,9 +78,12 @@ int main(int argc, char **argv)
+ 
+   KDBusService service;
+ 
+#ifndef QT_NO_SESSIONMANAGER
+   if (app.isSessionRestored())
+       RESTORE(KBounceMainWindow)
+-  else {
+  else
+#endif
+  {
+       KBounceMainWindow *w = new KBounceMainWindow;
+       w->show();
+   }
+-- 
+2.1.0
+
--- a/recipes-kde/apps/kbounce/kbounce.bb
+++ b/recipes-kde/apps/kbounce/kbounce.bb
@@ -0,0 +1,36 @@
+SUMMARY = "KBounce is a single player arcade game with the elements of puzzle"
+DESCRIPTION = "KBounce is a single player arcade game with the elements of puzzle. It is played on a field, surrounded by wall, with two or more balls bouncing around within the walls. The object of the game is to build new walls to decrease the size of the active field."
+LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+"
+
+inherit kde-apps
+
+DEPENDS += "\
+    kcoreaddons \
+    kconfig \
+    kdbusaddons  \
+    ki18n \
+    kguiaddons \
+    kconfigwidgets \
+    kiconthemes \
+    kcompletion \
+    ktextwidgets \
+    kxmlgui \
+    kio \
+    knotifyconfig \
+    libkdegames \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "87eb036391a6cd78e1ea1a70f995cac3"
+SRC_URI[sha256sum] = "47904cc34aeff65b1340a5371b3e81ccc7959b6d0bb66d6a0ed298948f94ed49"
+SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
+
+FILES_${PN} += " \
+    ${datadir}/kxmlgui5 \
+    ${datadir}/icons \
+"
--- a/recipes-kde/apps/kdenlive/kdenlive.bb
+++ b/recipes-kde/apps/kdenlive/kdenlive.bb
@@ -29,10 +29,12 @@ DEPENDS += "\
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "3a08051a2abfbfe2343df70f06630c4a"
-SRC_URI[sha256sum] = "3768ee66dc48bf1a506284e0c39f2e61ca9467a484d50987f3d9c2c1863e4274"
+SRC_URI[md5sum] = "62fc024bc9616756b5ad6444308e636f"
+SRC_URI[sha256sum] = "5a6f4ae4bd07c64b90a3ebe88775b457c9c1d8b3a23820203d86df114183fbf8"

-SRC_URI += "file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch"
+SRC_URI += " \
+    file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \
+"
 EXTRA_OECMAKE += "-DMLT_PREFIX=${prefix}"

 FILES_${PN} += " \
--- a/recipes-kde/apps/kdiamond/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
+++ b/recipes-kde/apps/kdiamond/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
@@ -0,0 +1,38 @@
+From cb9bb7f24cd21fb0fa1742a4316ad489f6c8cf6d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 11 Oct 2015 21:24:16 +0200
+Subject: [PATCH] fix build with QT_NO_SESSIONMANAGER set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/main.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index b27de6f..556fb16 100644
+--- a/src/main.cpp
+++ b/src/main.cpp
+@@ -70,10 +70,14 @@ int main(int argc, char **argv)
+         KgDifficultyLevel::VeryHard
+     );
+     KDBusService service;
+#ifndef QT_NO_SESSIONMANAGER
+     // see if we are starting with session management
+     if (app.isSessionRestored()) {
+         RESTORE(MainWindow);
+-    } else {
+    }
+    else
+#endif
+    {
+         MainWindow *window = new MainWindow;
+         window->show();
+     }
+-- 
+2.1.0
+
--- a/recipes-kde/apps/kdiamond/kdiamond.bb
+++ b/recipes-kde/apps/kdiamond/kdiamond.bb
@@ -0,0 +1,35 @@
+SUMMARY = "KDiamond is a single player puzzle game"
+DESCRIPTION = "KDiamond is a single player puzzle game. The object of the game is to build lines of three similar diamonds."
+LICENSE = "GPLv2 & GFDL-1.2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+"
+
+inherit kde-apps
+
+DEPENDS += "\
+    kcoreaddons \
+    kconfig \
+    kdbusaddons \
+    kdoctools \
+    kwidgetsaddons \
+    ki18n \
+    kguiaddons \
+    kconfigwidgets \
+    kiconthemes \
+    kxmlgui \
+    knotifications \
+    knotifyconfig \
+    libkdegames \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "7c94647e942d75ff1b10bf83cdc6973d"
+SRC_URI[sha256sum] = "e504c5b15e55f80afcc3da7ea4cec1efb5a56b906d8badf0db39382604d38713"
+SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
+
+FILES_${PN} += " \
+    ${datadir}/k*5 \
+    ${datadir}/icons \
+"
--- a/recipes-kde/apps/kio-extras/kio-extras.bb
+++ b/recipes-kde/apps/kio-extras/kio-extras.bb
@@ -42,8 +42,8 @@ DEPENDS += " \
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "4e2bb6dc68355e874d0a4e5fbd6c4669"
-SRC_URI[sha256sum] = "b72384e7ad29a7eca7bce344cf1a8f48cd557444bd0afeced01c817826f3e074"
+SRC_URI[md5sum] = "819bf5ec77953460993529076e0b9023"
+SRC_URI[sha256sum] = "e7409ae4b788d0484f8d026580ae821487993d791a48bd14f435b447e93fc950"

 FILES_${PN} += " \
    ${datadir}/kio_bookmarks \
@@ -64,5 +64,5 @@ FILES_${PN} += " \

 FILES_${PN}-dbg += " \
    ${OE_QMAKE_PATH_PLUGINS}/.debug \
-    ${OE_QMAKE_PATH_PLUGINS}/kf5/kio/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \
 "
--- a/recipes-kde/apps/kmix/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
+++ b/recipes-kde/apps/kmix/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
@@ -0,0 +1,26 @@
+--- a/apps/KMixApp.cpp	2016-06-07 16:48:58.967601212 +0200
+++ b/apps/KMixApp.cpp	2016-06-07 16:49:47.720048427 +0200
+@@ -80,7 +80,11 @@
+ 	 */
+ 	creationLock.lock();
+ 
+#ifndef QT_NO_SESSIONMANAGER
+ 	bool restore = isSessionRestored(); // && KMainWindow::canBeRestored(0);
+#else
+	bool restore = false;
+#endif
+ 	kDebug() << "Starting KMix using kepvisibility=" << hasArgKeepvisibility << ", failsafe=" << reset << ", sessionRestore=" << restore;
+ 	int createCount = 0;
+ 	if (restore)
+--- a/apps/kmix.cpp	2016-06-07 16:50:51.464632922 +0200
+++ b/apps/kmix.cpp	2016-06-07 16:50:24.112382155 +0200
+@@ -116,9 +116,11 @@
+ 		recreateGUI(false, QString(), true, reset);
+ 	}
+ 
+#ifndef QT_NO_SESSIONMANAGER
+ 	if (!kapp->isSessionRestored() ) // done by the session manager otherwise
+#endif
+ 	setInitialSize();
+ 
+ 	fixConfigAfterRead();
--- a/recipes-kde/apps/kmix/kmix.bb
+++ b/recipes-kde/apps/kmix/kmix.bb
@@ -0,0 +1,52 @@
+SUMMARY = "KDE's audio mixer"
+LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
+    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+"
+
+inherit kde-apps
+
+DEPENDS += " \
+    alsa-lib \
+    libcanberra \
+    \
+    kconfigwidgets \
+    kdbusaddons \
+    kdelibs4support \
+    kglobalaccel \
+    ki18n \
+    kiconthemes \
+    kxmlgui \
+    plasma-framework \
+"
+
+PACKAGECONFIG = "pulseaudio"    
+PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "f9d015862b40c9bb28307233ee012bd8"
+SRC_URI[sha256sum] = "e0e3ca3dac5605faaf7b447288675f557e1fd4205574885e2c1bfb205f37da31"
+
+SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
+
+EXTRA_OECMAKE += "-DKMIX_KF5_BUILD=1"
+
+FILES_SOLIBSDEV = ""
+
+FILES_${PN} += " \
+    ${datadir}/k*5 \
+    ${datadir}/plasma \
+    ${datadir}/icons \
+    ${datadir}/dbus-1 \
+    \
+    ${libdir}/libkdeinit5*.so \
+    ${OE_QMAKE_PATH_PLUGINS} \
+"
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/plasma/.debug \
+    ${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] = "00d056cc45aa5ac06dde4f2796ac79ce"
-SRC_URI[sha256sum] = "de5f504f9b036f85a771dc60fb5f161a78c99d71ecc6f3d9de1df91a56f795ce"
+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
--- a/recipes-kde/apps/kwalletmanager/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
+++ b/recipes-kde/apps/kwalletmanager/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
@@ -0,0 +1,37 @@
+From 6ec28a23f2850f6e06e3637b8af2bb956f5a448b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 11 Oct 2015 18:21:50 +0200
+Subject: [PATCH] fix build with QT_NO_SESSIONMANAGER set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/manager/kwalletmanager.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/manager/kwalletmanager.cpp b/src/manager/kwalletmanager.cpp
+index 64a90dd..6ff9c88 100644
+--- a/src/manager/kwalletmanager.cpp
+++ b/src/manager/kwalletmanager.cpp
+@@ -101,12 +101,14 @@ void KWalletManager::configUI() {
+                 break;
+             }
+         }
+#ifndef QT_NO_SESSIONMANAGER
+         if (!isOpen && qApp->isSessionRestored()) {
+             delete _tray;
+             _tray = 0;
+             QTimer::singleShot(0, qApp, SLOT(quit()));
+             return;
+         }
+#endif
+     } else {
+         _tray = 0;
+     }
+-- 
+2.1.0
+
--- a/recipes-kde/apps/kwalletmanager/kwalletmanager.bb
+++ b/recipes-kde/apps/kwalletmanager/kwalletmanager.bb
@@ -0,0 +1,42 @@
+SUMMARY = "KDE Wallet Manager is a tool to manage the passwords on your KDE system"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
+    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += " \
+    kcoreaddons \
+    kdoctools \
+    kauth \
+    kwallet \
+    kservice \
+    kcmutils \
+    kdelibs4support \
+    ki18n \
+    kxmlgui \
+    kconfig \
+    kconfigwidgets \
+    kdbusaddons \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "9d78904e2038b0f01f9d84d6b4545826"
+SRC_URI[sha256sum] = "ce269540a3c7330f7bf8b8b7bd6722dcc5585a0190355165adc0ef670f6e61e9"
+SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
+
+FILES_${PN} += " \
+    ${datadir}/dbus-1 \
+    ${datadir}/polkit-1 \
+    ${datadir}/icons \
+    ${datadir}/k*5 \
+    ${libdir}/kauth \
+    ${OE_QMAKE_PATH_PLUGINS} \
+"
+
+FILES_${PN}-dbg += " \
+    ${libdir}/kauth/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+"
--- a/recipes-kde/apps/libkdegames/files/0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch
+++ b/recipes-kde/apps/libkdegames/files/0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch
@@ -33,7 +33,7 @@ index b5d8ffe..538d7c8 100644
 -    DBusAddons DNSSD Declarative
 +    DBusAddons DNSSD
     I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion JobWidgets TextWidgets GlobalAccel XmlGui Crash
-     Bookmarks KIO NewStuff KDELibs4Support)
+     Bookmarks KIO NewStuff)
 
 +if(BUILD_KGDECLARATIVE)
 +    find_package(KF5 REQUIRED COMPONENTS Declarative)
@@ -81,5 +81,5 @@ index b5d8ffe..538d7c8 100644
 
 set(KDEGAMES_VERSION 7.0.0)
 -- 
-2.1.0
+2.5.0

--- 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] = "76a75c3fa55aebb01a7fb1441cb18f7c"
-SRC_URI[sha256sum] = "47f7c00b756bb37e8f04423131390f6ac8d242ce52ce788691d8d80a20028a49"
+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/marble/files/0001-align-path-of-designer-plugins.patch
+++ b/recipes-kde/apps/marble/files/0001-align-path-of-designer-plugins.patch
@@ -0,0 +1,31 @@
+From 51a1a623dbdeac52b0afd383189e509f6b61df9e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 16 Sep 2015 15:20:30 +0200
+Subject: [PATCH] align path of designer plugins
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 68b3d78..57c4792 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -199,7 +199,7 @@ add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget suppo
+ 
+ set(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX} CACHE PATH  "Base directory for executables and libraries" FORCE)
+ if (NOT QT_PLUGINS_DIR)
+-   set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins)
+   set(QT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qt5/plugins)
+ endif()
+ 
+ ####################################################
+-- 
+2.1.0
+
--- a/recipes-kde/apps/marble/marble.bb
+++ b/recipes-kde/apps/marble/marble.bb
@@ -0,0 +1,64 @@
+SUMMARY = "Marble is a Virtual Globe and World Atlas"
+LICENSE = "GPLv3 & GFDL-1.2 & LGPLv2 & MIT"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPL-3;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
+    file://LICENSE.txt;md5=e9b5891877660f283be4bc396de0570f \
+    file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+"
+
+inherit kde-apps
+
+DEPENDS += " \
+    qtsvg \
+    qtwebkit \
+    \
+    kconfig \
+    krunner \
+    kservice \
+    ki18n \
+    kio \
+    knewstuff \
+    kwallet \
+    kparts \
+    kcoreaddons \
+    kparts \
+    plasma-framework \
+    kdoctools \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "a7a481936281a7d584b9168d98fcd5d5"
+SRC_URI[sha256sum] = "6aa7f939a3221e2a40f62548d8af0718c10b6253a28472b233aeccc062b30d06"
+SRC_URI += "file://0001-align-path-of-designer-plugins.patch"
+
+PACKAGES =+ " \
+    ${PN}-mobile ${PN}-qt ${PN}-touch \
+    ${PN}-designer-plugin-dbg ${PN}-designer-plugin \
+"
+
+FILES_${PN}-mobile = "${bindir}/${BPN}-mobile"
+FILES_${PN}-qt = "${bindir}/${BPN}-qt"
+FILES_${PN}-touch = "${bindir}/${BPN}-touch"
+
+FILES_${PN} += " \
+    ${datadir}/config.kcfg \
+    ${datadir}/icons \
+    ${datadir}/k*5 \
+    ${datadir}/appdata \
+    ${OE_QMAKE_PATH_PLUGINS} \
+"
+
+FILES_${PN}-dbg += " \
+    ${libdir}/marble/plugins/.debug \
+    ${libdir}/marble/plugins/org/kde/edu/marble/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+"
+
+FILES_${PN}-designer-plugin += " \
+    ${OE_QMAKE_PATH_PLUGINS}/designer \
+"
+
+FILES_${PN}-designer-plugin-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/designer/.debug \
+"
--- a/recipes-kde/apps/spectacle/spectacle.bb
+++ b/recipes-kde/apps/spectacle/spectacle.bb
@@ -0,0 +1,37 @@
+SUMMARY = "he new screenshot capture utility, replaces KSnapshot"
+LICENSE = "GPLv2 & GFDL-1.2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.DOC;md5=10b9de612d532fdeeb7fe8fcd1435cc6 \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += " \
+    kcoreaddons \
+    kwidgetsaddons \
+    kdbusaddons \
+    knotifications \
+    kconfig \
+    ki18n \
+    kio \
+    kxmlgui \
+    kwindowsystem \
+    kdoctools \
+"
+
+# REVISIT optionals
+DEPENDS += " \
+    libkscreen \
+    xcb-util-cursor \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "bedebdd924cf5a650c87b1306d4e6a94"
+SRC_URI[sha256sum] = "303b4739c544e3292a19f4cca4b8f8627f4430b18deb87dbe3e189324974ce7a"
+
+FILES_${PN} += " \
+    ${datadir}/dbus-1 \
+    ${datadir}/khotkeys \
+    ${datadir}/knotifications5 \
+"
--- a/recipes-kde/find-non-auto-version-recipes
+++ b/recipes-kde/find-non-auto-version-recipes
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+grep -r 'PV ' | grep -v VERSION
--- a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc
+++ b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc
@@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 inherit kde-kf5-porting-aids perlnative

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "f28699a6421aa478b98e76f6dbe6683a"
-SRC_URI[sha256sum] = "28178afd677838339ac86afd8887cb0a5d8a0ded77d0438b7c118639c07043c6"
+SRC_URI[md5sum] = "332bd1a8e3d131a5cd7774f3d1092bc3"
+SRC_URI[sha256sum] = "c23439fe7373d5e1e153e7e0f67ee6bb573da901659bb67068740f0dbda0097d"
 SRC_URI += "file://0001-create_hash_table-avoid-polution-of-files-with-build.patch"
--- 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
@@ -21,9 +21,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 7e6b3b9..3e60563 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -16,28 +16,11 @@ include(CMakeFindFrameworks)
- set(KF5_VERSION "5.10.0") # handled by release scripts
- set(KF5_DEP_VERSION "5.9.0") # handled by release scripts
+@@ -20,29 +20,11 @@ include(CMakeFindFrameworks)
+ 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)
@@ -48,6 +48,7 @@ index 7e6b3b9..3e60563 100644
 -find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
 -find_package(KF5XmlGui ${KF5_DEP_VERSION} REQUIRED)
 -find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED)
+-find_package(KDED ${KF5_DEP_VERSION} REQUIRED)
 +find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
 
 if(WIN32)
@@ -141,7 +142,7 @@ index 64a53d8..9f2e8ac 100644
     kdecore/kcalendarera.cpp
     kdecore/kcalendarsystem.cpp
     kdecore/kcalendarsystemcoptic.cpp
-@@ -108,96 +78,6 @@ set(libkdelibs4support_SRCS
+@@ -108,95 +108,6 @@ set(libkdelibs4support_SRCS
     kdecore/ktzfiletimezone.cpp
     kdecore/klocale.cpp
     kdecore/klocale_kde.cpp
@@ -159,7 +160,6 @@ index 64a53d8..9f2e8ac 100644
 -    kdeui/kdialog.cpp
 -    kdeui/kdialogqueue.cpp
 -    kdeui/kfontcombobox.cpp
-    kdeui/fonthelpers.cpp
 -    kdeui/kfontdialog.cpp
 -    kdeui/khuesaturationselect.cpp
 -    kdeui/kpassivepopupmessagehandler.cpp
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
@@ -29,12 +29,18 @@ DEPENDS += " \
    kwidgetsaddons \
    kwindowsystem \
    kxmlgui \
+    kded \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
 "

 # uncomment for broken gelib getaddr / AI_PASSIVE
 #EXTRA_OECMAKE += "-DHAVE_GOOD_GETADDRINFO=OFF"

+do_compile_prepend() {
+    # Error: Could not locate service type file kservicetypes5/ "kdedmodule.desktop" , tried ...
+    export XDG_DATA_HOME=${STAGING_DATADIR}
+}
+
 do_configure_append() {
    # fix KCONFIG_COMPILER_LOCATION
    sed -i 's:${STAGING_LIBDIR_NATIVE}:${libdir}:g' ${B}/src/config-kstandarddirs.h
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc
+++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5-porting-aids perlnative

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "f78e3c6886449b211bb9934d7fcd4dc8"
-SRC_URI[sha256sum] = "430f18cf3c72211913602feafd1e723b60e6653d187041f436dfa722b88a96c2"
+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] = "8fbcac4ad03f9c05560aad629f72653a"
-SRC_URI[sha256sum] = "b594e6a9e9dbfbcd977454b01a0dd7fe37345f1191a248b469106838718bd357"
+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] = "46d322b756d75de73cf70e2cbae8351c"
-SRC_URI[sha256sum] = "28b288a40ea602d4254396f79ea8476319c42610ebc13997e531bb990f59d446"
+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] = "1bc722946d71dcaba481721e7d14ebaf"
-SRC_URI[sha256sum] = "35108d0d7f5acb48b5b399fee0c61fd1eb62d00a1677d9db2692ff35643d43a0"
+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
@@ -7,8 +7,8 @@ inherit kde-kf5-porting-aids cmake-lib
 DEPENDS += "qtdeclarative kconfig kcoreaddons ki18n kio kservice plasma-framework solid threadweaver"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "253f3fa45128074b0303b7fc72aebea4"
-SRC_URI[sha256sum] = "8aa0b679c7780791a9f2075f1404af4924defec1f34dab6c2135796b2e3d49fa"
+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}"
--- 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] = "e1c3a9de659aa78922ef170cea1f0fdd"
-SRC_URI[sha256sum] = "106532a667a63d8b9aa39d8f857d5156f4e939d4f927c0809cf478b41472b83b"
+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,8 +7,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "qtdeclarative"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "3f7f51e8d7b6fdeacba4f3faebed95c3"
-SRC_URI[sha256sum] = "8891e31c5329d0616a2fdded390f215673bfff3fb32d3745b47d2278a7a39e31"
+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/karchive/files/0001-avoid-autotests.patch
+++ b/recipes-kde/kf5/tier1/karchive/files/0001-avoid-autotests.patch
@@ -0,0 +1,30 @@
+From 39b270db699edb25293c49fe8904a810534c48b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 16 Dec 2015 21:03:20 +0100
+Subject: [PATCH] avoid autotests
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d1f96d..92eec98 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -58,7 +58,6 @@ ecm_setup_version(${KF5_VERSION}
+     SOVERSION 5)
+ 
+ add_subdirectory(src)
+-add_subdirectory(autotests)
+ add_subdirectory(tests)
+ 
+ 
+-- 
+2.5.0
+
--- a/recipes-kde/kf5/tier1/karchive/karchive-native.bb
+++ b/recipes-kde/kf5/tier1/karchive/karchive-native.bb
@@ -1,3 +1,7 @@
 require ${BPN}.inc

+SRC_URI += " \
+    file://0001-avoid-autotests.patch \
+"
+
 inherit native
--- 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] = "dd01dc1252cb3d862959970ef7d7f5eb"
-SRC_URI[sha256sum] = "5f06e723282f30eb8b0064016f6c05355875012139008d6d7663f9180904e961"
+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] = "307f6103c25cff1a6c5be9f80c530866"
-SRC_URI[sha256sum] = "f5f7ddb4c2e9ab90ed1075816509e3d0bc851586d0df3d02c827563c6757322c"
+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/files/0003-keep-gui-stuff-out-of-native-build.patch
+++ b/recipes-kde/kf5/tier1/kconfig/files/0003-keep-gui-stuff-out-of-native-build.patch
@@ -1,6 +1,6 @@
 From 5dbf63f820aac695f093f42722e5b312bb3b7834 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Fri, 12 Dec 2014 11:26:14 +0100
+Date: Sat, 14 Nov 2015 21:45:16 +0100
 Subject: [PATCH 2/2] keep gui stuff out of native build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -15,12 +15,12 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 2 files changed, 1 insertion(+), 2 deletions(-)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3cd0863..17c1279 100644
+index 0d8f4d1..34edb5b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -7,7 +7,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+@@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
- set(REQUIRED_QT_VERSION 5.2.0)
+ set(REQUIRED_QT_VERSION 5.3.0)
 
 -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Xml)
 +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml)
@@ -28,17 +28,15 @@ index 3cd0863..17c1279 100644
 include(KDEFrameworkCompilerSettings)
 include(KDECMakeSettings)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f7c79ce..464ae2b 100644
+index 916d51f..d320f36 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -1,7 +1,6 @@
- ecm_create_qm_loader(kconfig_QM_LOADER kconfig5_qt)
- 
+@@ -1,5 +1,4 @@
 add_subdirectory(core)
 -add_subdirectory(gui)
 add_subdirectory(kconfig_compiler)
 add_subdirectory(kconf_update)
 add_subdirectory(kreadconfig)
 -- 
-1.8.3.1
+2.1.0

--- 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] = "d470179fc4c8a2060b94452d25d466c8"
-SRC_URI[sha256sum] = "f79cb8465336a13a0012ae52d47bd4cd8754af14dd95935644a650c6f0ae1e62"
+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] = "6b433cfd7f6b6a6f5c69806a12594e79"
-SRC_URI[sha256sum] = "bd42571c44ab2b6cc4514bcc16e8f689945ffab13b04e394fa192e9058a58961"
+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] = "e51a450042e6e3a694bb2c9a1303d748"
-SRC_URI[sha256sum] = "02f9968e3bae65a7de36f3a6a908feff69d95bec0ab7b2ab2b7602860b4521f0"
+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] = "aa6c92111aec32bf7428356bfbebda18"
-SRC_URI[sha256sum] = "d9b8cc9f4cb89350352d18e95c928b8263dffbc705c98006cdc1138c39454ac9"
+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] = "62ab7a6b1829b31b1d3be9f611e051ee"
-SRC_URI[sha256sum] = "4731f30535e7c1bfb57f29cbd44d45f6ec32969dd356c45bff6cb1cf6188635c"
+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/files/0003-avoid-autotests.patch
+++ b/recipes-kde/kf5/tier1/ki18n/files/0003-avoid-autotests.patch
@@ -0,0 +1,30 @@
+From dbb6f1726e50e3ce963f2822d69d7bb406c526ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 16 Dec 2015 20:52:43 +0100
+Subject: [PATCH] avoid autotests
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a4bd8d9..cc427e7 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -58,7 +58,6 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+     ki18n_install(po)
+ endif()
+ add_subdirectory(src)
+-add_subdirectory(autotests)
+ 
+ # create a Config.cmake and a ConfigVersion.cmake file and install them
+ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5I18n")
+-- 
+2.5.0
+
--- a/recipes-kde/kf5/tier1/ki18n/ki18n-native.bb
+++ b/recipes-kde/kf5/tier1/ki18n/ki18n-native.bb
@@ -5,6 +5,7 @@ inherit native
 SRC_URI += " \
    file://0001-CMakeLists.txt-do-not-search-for-libintl-gettext.patch \
    file://0002-do-not-install-po-files-for-native-build.patch \
+    file://0003-avoid-autotests.patch \
 "

 EXTRA_OECMAKE += "-DBUILD_WITH_QTSCRIPT=OFF"
--- a/recipes-kde/kf5/tier1/ki18n/ki18n.bb
+++ b/recipes-kde/kf5/tier1/ki18n/ki18n.bb
@@ -7,7 +7,7 @@ CMAKE_ALIGN_SYSROOT[1] = "KF5I18n, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5I18n, -S${includedir}, -S${STAGING_INCDIR}"
 # revisit python?

-DEPENDS += "${BPN}-native qtscript"
+DEPENDS += "${BPN}-native qtscript qtdeclarative"

 FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/kf5"
 FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/kf5/.debug"
--- 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] = "cfd83c271590f9e627fafd3a2a0420c7"
-SRC_URI[sha256sum] = "b50f3c2938aa27dc15a64a994a4318c198b77577a6c56a467dec6474a38af9c7"
+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] = "2461e099b2bf54ef26e0c1a7891db120"
-SRC_URI[sha256sum] = "623591eb891566c4e00ba338aea61a63eec35fdc71b737961e5e358e1a25d7b4"
+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
@@ -9,8 +9,8 @@ inherit kde-kf5
 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "6fbf6f618f3e8287ab79d15e7bbbd683"
-SRC_URI[sha256sum] = "9e9a529152200ee7b0b0328091aecec7be33a9affd8765394277f21925551953"
+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
@@ -6,9 +6,11 @@ LIC_FILES_CHKSUM = " \

 inherit kde-kf5 cmake-lib

+DEPENDS += "qtdeclarative"
+
 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "9de370faf78290dbb7faecb4f8f70f73"
-SRC_URI[sha256sum] = "aa51252bcab824de9edd7851f9e03ac987630a38c5f454b9d09d5c0daad696ad"
+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] = "28ec6325a44946432cf5c06cb5a07955"
-SRC_URI[sha256sum] = "fcc9b4c1ae89d686c2633bbddccc72c6407274b753e1ec341f4a4fe89dc85f45"
+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] = "4177271c93a3c8094620bd615761fbd9"
-SRC_URI[sha256sum] = "18b6ba0d10728149e559eafabae90a38b6df29fd6a8a4a0f20e39045bc539b38"
+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] = "46d49208e2bd219a79fe2a54b956bc2f"
-SRC_URI[sha256sum] = "3189446e9482d7d3bdddda9736fc44226a4205997166c298dd61419cf30a43a7"
+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/kwindowsystem.bb
+++ b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
@@ -10,8 +10,8 @@ DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx1

 PV = "${KF5_VERSION}"
 SRC_URI += "file://0001-config-kwindowsystem.h.cmake-fix-path-to-plugins.patch"
-SRC_URI[md5sum] = "a907421be1461569667ffdd0f7bfae63"
-SRC_URI[sha256sum] = "c75868139adaa11122df2399466f8bc30d04287ce8ae778859fa2aa283dc30a2"
+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] = "2b83e0f1e3d36d9afaaaf7e45a03aa28"
-SRC_URI[sha256sum] = "b096bd71999a533c5d414577d48cb4455831866411a3e6fafe476271ef69449d"
+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] = "c1f71c733c5b4e03ad0af4a558c6dc8f"
-SRC_URI[sha256sum] = "29a821326733290efd7f28b763fed22a0a47376dcd400187d0363a2f52de629b"
+SRC_URI[md5sum] = "5bd6cc807ce152c241aa33a16339710a"
+SRC_URI[sha256sum] = "96fec981a95c4e0a20e4b7878dd0d0702434af1dee3a1a3d1ce2cba2390a4886"

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

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "65cad682f4e55f02e0a547eb84e779b5"
-SRC_URI[sha256sum] = "332a509923e2354c6bbd04e0d4d2c217e89bbb016d9e5b674a4f44cbe2c206e8"
+SRC_URI[md5sum] = "783ceff0aed29a57235fb05abca41b6a"
+SRC_URI[sha256sum] = "909b0ebd982e028935885709983be2a22c01c9442a906f64d3f20d3734899346"

 CMAKE_ALIGN_SYSROOT[1] = "KF5Solid, -S${libdir}, -S${STAGING_LIBDIR}"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Solid, -S${includedir}, -S${STAGING_INCDIR}"
--- a/recipes-kde/kf5/tier1/sonnet/files/0003-make-build-of-hunspell-optional.patch
+++ b/recipes-kde/kf5/tier1/sonnet/files/0003-make-build-of-hunspell-optional.patch
@@ -0,0 +1,43 @@
+From e0b2cd6d9a7339f5e73d4fe19a4a0ad07223f571 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 29 Jan 2016 22:23:11 +0100
+Subject: [PATCH] make build of hunspell optional
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Finding hunspell is done by a taylored solution which does not seem to
+support disable.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/plugins/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
+index f275f63..dbad160 100644
+--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
+@@ -35,6 +35,9 @@ endif ()
+ #   add_subdirectory( enchant )
+ #endif ()
+ 
+option(BUILD_HUNSPELL "Build hunspell" OFF)
+
+if(BUILD_HUNSPELL)
+ find_package(HUNSPELL)
+ set_package_properties(HUNSPELL PROPERTIES
+     URL "http://hunspell.sourceforge.net/"
+@@ -44,6 +47,7 @@ set_package_properties(HUNSPELL PROPERTIES
+ if (HUNSPELL_FOUND)
+    add_subdirectory( hunspell )
+ endif ()
+endif ()
+ 
+ 
+ find_package(VOIKKO)
+-- 
+2.5.0
+
--- a/recipes-kde/kf5/tier1/sonnet/sonnet.bb
+++ b/recipes-kde/kf5/tier1/sonnet/sonnet.bb
@@ -11,6 +11,17 @@ do_configure_append() {
 	sed -i 's:\./parsetrigrams:${STAGING_BINDIR_NATIVE}/parsetrigrams:' ${B}/data/CMakeFiles/trigrams_sonnet.dir/build.make
 }

+FILES_${PN} += " \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/sonnet \
+"
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/sonnet/.debug \
+"
+
 CMAKE_ALIGN_SYSROOT[1] = "KF5Sonnet, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Sonnet, -S${includedir}, -S${STAGING_INCDIR}"

+PACKAGECONFIG ??= ""
+PACKAGECONFIG[hunspell] = "-DBUILD_HUNSPELL=ON,-DBUILD_HUNSPELL=OFF, hunspell"
+
--- a/recipes-kde/kf5/tier1/sonnet/sonnet.inc
+++ b/recipes-kde/kf5/tier1/sonnet/sonnet.inc
@@ -5,5 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 inherit kde-kf5

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "99729551e032db0322b0915a4eba5d68"
-SRC_URI[sha256sum] = "a7743a3c36b6cd27c008d4a7bf8062e4ac59a4d32e6a2e33139e19ac444c4716"
+SRC_URI[md5sum] = "8fb3c2fac12e7c2671c3318f41bc4161"
+SRC_URI[sha256sum] = "6ffa49bab59dba0080c03a8b7863efd53006239350f634575b4aabe9f496009d"
+SRC_URI += "file://0003-make-build-of-hunspell-optional.patch"
--- a/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb
+++ b/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 inherit kde-kf5 cmake-lib

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "2ffb07e5dc0656dfc5fb162d12a315ce"
-SRC_URI[sha256sum] = "d6d7d1f578f58c4a7d1f644c95f4c1d3f37c14792e8332e94da530aba2ca1b1a"
+SRC_URI[md5sum] = "4abcb4004837be65830b47fd8f2bc6a3"
+SRC_URI[sha256sum] = "a4d417b3e9488e9c62a2a9d2ee38846bb53b20d0f4ee4a1b034f7b0ffdde8901"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5ThreadWeaver, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-kde/kf5/tier2/kauth/kauth.inc
+++ b/recipes-kde/kf5/tier2/kauth/kauth.inc
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "461842d488b050cfedd918227f7b6420"
-SRC_URI[sha256sum] = "73d67cbabaa89fe877ed60f5b95a46152bcca96fa8331403e137c7eb5bea33c8"
+SRC_URI[md5sum] = "2732f1ad8224a63fe7a89e7471b6c29c"
+SRC_URI[sha256sum] = "96803c911621798ea1dc4df17c93691c762e4abc8d2ae010613a0cbed8f17b92"

 SRC_URI += " \
 	file://0001-Make-autotests-optional.patch \
--- a/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb
+++ b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb
@@ -9,8 +9,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "kconfig kwidgetsaddons"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "a189b396126e3a901a6ca122b976277d"
-SRC_URI[sha256sum] = "6489e289933ebc8e0c8b3fc9d095e380b877ed390b5c3ca28753707d225f8748"
+SRC_URI[md5sum] = "af520088daa15b0ead9fe6077059359b"
+SRC_URI[sha256sum] = "cb9cd9e2c156df65f6de8057ad855808922b072cf042882de91c9f4aef23723e"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5Completion, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-kde/kf5/tier2/kcrash/files/0001-align-path-to-drkonqi.patch
+++ b/recipes-kde/kf5/tier2/kcrash/files/0001-align-path-to-drkonqi.patch
@@ -1,45 +0,0 @@
-From 400a073a899a56940f8f8c6986591abb5a3f7313 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Mon, 9 Feb 2015 09:50:39 +0100
-Subject: [PATCH] align path to drkonqi
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-we do not have a shared libexec
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
- src/config-kcrash.h.cmake | 1 +
- src/kcrash.cpp            | 4 +++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/config-kcrash.h.cmake b/src/config-kcrash.h.cmake
-index f1b3a9b..3ac6dfd 100644
--- a/src/config-kcrash.h.cmake
-+++ b/src/config-kcrash.h.cmake
-@@ -2,3 +2,4 @@
- 
- #define kde_socklen_t socklen_t
- #define CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}"
-+#define CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}"
-diff --git a/src/kcrash.cpp b/src/kcrash.cpp
-index d72d8f8..caa6600 100644
--- a/src/kcrash.cpp
-+++ b/src/kcrash.cpp
-@@ -209,7 +209,9 @@ void KCrash::setDrKonqiEnabled(bool enabled)
- {
-     s_launchDrKonqi = enabled ? 1 : 0;
-     if (s_launchDrKonqi && !s_drkonqiPath) {
-        const QList<QString> paths = QFile::decodeName(qgetenv("LIBEXEC_PATH")).split(QLatin1Char(':'));
-+        QList<QString> paths = QFile::decodeName(qgetenv("LIBEXEC_PATH")).split(QLatin1Char(':'));
-+        /* take care of per-package libexec dir for plasma-workspace as origin of drkonqi */
-+        paths.append(QFile::decodeName(CMAKE_INSTALL_FULL_LIBDIR "/plasma-workspace"));
-         const QString exec = QStandardPaths::findExecutable(QLatin1String("drkonqi"), paths);
-         if (exec.isEmpty()) {
-             s_drkonqiPath = qstrdup(CMAKE_INSTALL_FULL_LIBEXECDIR "/drkonqi");
-- 
-1.9.3
-
--- a/recipes-kde/kf5/tier2/kcrash/kcrash.bb
+++ b/recipes-kde/kf5/tier2/kcrash/kcrash.bb
@@ -9,10 +9,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "kcoreaddons kwindowsystem"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "f261f5f1aff9bfce0abea333ce3aa89a"
-SRC_URI[sha256sum] = "16152d3757618aa8bba4a5b52f93a1f6ce0e0cbbac12e958b3e4f0e0aa348b1d"
-
-SRC_URI += "file://0001-align-path-to-drkonqi.patch"
+SRC_URI[md5sum] = "6503c2c7b8df59be593f73df87a5efcd"
+SRC_URI[sha256sum] = "bcf4f57ecf3393e73ea3754c4930887fab34422f27e85059a492ac0af23f6266"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5Crash, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc
+++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc
@@ -11,8 +11,8 @@ inherit kde-kf5 perlnative
 DEPENDS += "docbook-xml-dtd4 docbook-xsl-stylesheets liburi-perl-native"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "1801a3e97110d734178814b5cd45059a"
-SRC_URI[sha256sum] = "2e9b5bbe20e0542d87d4ac24e2f27cc905a109a08a4f12f825102df372cd0418"
+SRC_URI[md5sum] = "75f85023291440e81cf2fc70e412cd18"
+SRC_URI[sha256sum] = "ed702ac3da6561404b24908049947bf7903feff4c0748460d0eea44216250782"

 SRC_URI += " \
 	file://0001-Add-cmdline-param-to-help-find-xsl.patch \
--- a/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb
+++ b/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = " \
 inherit kde-kf5 cmake-lib pkgconfig

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "24aac6639ae4d2e9452a89d60eb2d125"
-SRC_URI[sha256sum] = "dda9b99bdadda6f410554a98105c0301db495341ba8854d69240001d140cf530"
+SRC_URI[md5sum] = "62d98eec25d779bad419752793ff88e0"
+SRC_URI[sha256sum] = "a4ea5c0a7f460f4850c39a2d447948b395b8c5b11441a74c281c30d40bb468a5"

 # TODO: optionals PACKAGECONFIG (poppler-qt5 / exiv2 / ffmpeg / epub)
 DEPENDS += " \
--- a/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb
+++ b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb
@@ -9,8 +9,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "kcoreaddons kwidgetsaddons ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "92b86b2b57098ee0e67b648224e82abb"
-SRC_URI[sha256sum] = "0410329ed4d99c726fbb05f1701b9837e5bf2da6a554b74bfe45b1c7558b586e"
+SRC_URI[md5sum] = "fb8c4e9d823b3a8ec084f8c710909147"
+SRC_URI[sha256sum] = "4f8be6a0161eca799d481a7b0763ed4377bad329dd1ff653ed793adb7982bb3f"

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

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "9326887967351b87e673628171cf19e9"
-SRC_URI[sha256sum] = "3b7edf852f855b2074e16a5572b8eb68bd9d4e7e11c41568227240f32604c512"
+SRC_URI[md5sum] = "d7d25c868bad8fb567877924d33770df"
+SRC_URI[sha256sum] = "1f1aa098983c37cab4949c2d79b833986a8446910a18f76b3715e648b6c8f1da"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5Notifications, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-kde/kf5/tier2/kpackage/kpackage.bb
+++ b/recipes-kde/kf5/tier2/kpackage/kpackage.bb
@@ -10,8 +10,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "karchive ki18n kcoreaddons kconfig kdoctools"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "b865c7d38fe72efb819b58a116e848d1"
-SRC_URI[sha256sum] = "8a420240173360a0423de0d3c5e1ef9c66e6174c69db8d8224ebb23746ff6d79"
+SRC_URI[md5sum] = "5c4a2ac94e8d1b8f47286eaca83cab0c"
+SRC_URI[sha256sum] = "29d295d9542ff18b4dd0a4cbe5039858a2babec0091f7cff54929e379cd60293"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5Package, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-kde/kf5/tier2/kpty/kpty.bb
+++ b/recipes-kde/kf5/tier2/kpty/kpty.bb
@@ -10,8 +10,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "kcoreaddons ki18n"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "9831c8231ac70ec4f1bf6d744dcebf63"
-SRC_URI[sha256sum] = "60977d4c87279c0a6a2c684012cc9790baaeec11b042968a21aab64cc3fe6730"
+SRC_URI[md5sum] = "03ff4be4bbb45979c34419a5d05d7cbb"
+SRC_URI[sha256sum] = "a107df2ed1dba12c6975e17def71042d3bdbab6497634d4ea4986421740f5fad"

 CMAKE_ALIGN_SYSROOT[1] = "KF5Pty, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Pty, -S${includedir}, -S${STAGING_INCDIR}"
--- a/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb
+++ b/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb
@@ -7,8 +7,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "ki18n"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "8505e76f2e45febe316ab83ee31ece3f"
-SRC_URI[sha256sum] = "b7972e35492f98658aa456a48902330c4c82ad7d08315ef626269b0e5f3cceb1"
+SRC_URI[md5sum] = "a417abc36106520833a6a9b240b874e3"
+SRC_URI[sha256sum] = "d150694ee1b852961c6fe5401b75c818303208062d43e7dd6fe7244f7db3f53e"

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

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "67bceaf70f9da493161c0eb94a214099"
-SRC_URI[sha256sum] = "78d59a31b74da08089589f2df89f06b541447da3546edcccd2477add499e2f95"
+SRC_URI[md5sum] = "90894895db301b7ab069d272a5b99bdc"
+SRC_URI[sha256sum] = "88a2e89a102674e8fab19103e979550ebe2c4b31c05b29f6c18fe500b669b669"

 SRC_URI += " \
    file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch \
@@ -44,6 +44,7 @@ FILES_${PN} += "${datadir} \
 FILES_${PN}-dbg += " \
    ${libdir}/*/.debug \
    ${OE_QMAKE_PATH_QML}/org/kde/baloo/.debug \
+    ${OE_QMAKE_PATH_QML}/org/kde/baloo/experimental/.debug/ \
    ${OE_QMAKE_PATH_PLUGINS}/.debug \
    ${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \
 "
--- a/recipes-kde/kf5/tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch
+++ b/recipes-kde/kf5/tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch
@@ -1,6 +1,6 @@
-From 432cefd14f0056c5c81587079fe93c9244f59b5e Mon Sep 17 00:00:00 2001
+From e770efcd3bcdbf0e885c8db2df10fa1bd09b4c06 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Tue, 9 Dec 2014 14:48:36 +0100
+Date: Sun, 11 Oct 2015 17:56:45 +0200
 Subject: [PATCH] fix build for QT_NO_SESSIONMANAGER
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -10,26 +10,25 @@ Upstream-Status: pending

 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- src/file/main.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
+ src/file/extractor/main.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)

-diff --git a/src/file/main.cpp b/src/file/main.cpp
-index e46ce47..c8b0c8b 100644
--- a/src/file/main.cpp
-+++ b/src/file/main.cpp
-@@ -38,7 +38,10 @@
+diff --git a/src/file/extractor/main.cpp b/src/file/extractor/main.cpp
+index cf9fec7..7c12646 100644
+--- a/src/file/extractor/main.cpp
+++ b/src/file/extractor/main.cpp
+@@ -29,7 +29,9 @@
+ #include <QByteArray>
 
- #include <QDBusConnection>
 #include <QApplication>
-+
 +#ifndef QT_NO_SESSIONMANAGER
 #include <QSessionManager>
 +#endif
 
- int main(int argc, char** argv)
+ int main(int argc, char* argv[])
 {
-@@ -57,11 +60,13 @@ int main(int argc, char** argv)
-     QApplication app(argc, argv);
+@@ -47,11 +49,13 @@ int main(int argc, char* argv[])
+ 
     app.setQuitOnLastWindowClosed(false);
 
 +#ifndef QT_NO_SESSIONMANAGER
@@ -40,8 +39,8 @@ index e46ce47..c8b0c8b 100644
     QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
 +#endif
 
-     KConfig config(QLatin1String("baloofilerc"));
-     KConfigGroup group = config.group("Basic Settings");
+     Baloo::App appObject;
+     return app.exec();
 -- 
-1.8.3.1
+2.1.0

--- a/recipes-kde/kf5/tier3/kactivities/kactivities.bb
+++ b/recipes-kde/kf5/tier3/kactivities/kactivities.bb
@@ -9,22 +9,32 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "boost kconfig kcoreaddons ki18n kservice kwindowsystem kglobalaccel kxmlgui kio kdbusaddons kdeclarative kcmutils"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "c524c7b82ea76e332fade27061586875"
-SRC_URI[sha256sum] = "570a3ea95b47e132a6ed965cc0d31eb932dcd9e8d9bdd1920343731e691c2e4c"
+SRC_URI[md5sum] = "984c74b7ef242703990caa8b2a0b187e"
+SRC_URI[sha256sum] = "b95e76570963a9f8797f103e32ddf58382c104e935fc27de3f48eea3db300a5b"

 SRC_URI += "file://0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch"

+do_compile_prepend() {
+    # Error: Could not locate service type file kservicetypes5/ "kfileitemactionplugin.desktop" , tried ...
+    export XDG_DATA_HOME=${STAGING_DATADIR}
+}
+
 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5Activities, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "KF5Activities, -S${includedir}, -S${STAGING_INCDIR}"

+FILES_SOLIBSDEV = "${libdir}/libKF5Activities*${SOLIBSDEV}"
+
 FILES_${PN} += " \
    ${datadir}/k*5 \
+    ${libdir}/libkactivitymanagerd_plugin.so \
    ${OE_QMAKE_PATH_PLUGINS} \
    ${OE_QMAKE_PATH_QML}/org/kde \
 "
 FILES_${PN}-dbg += " \
    ${OE_QMAKE_PATH_PLUGINS}/.debug \
    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \
    ${OE_QMAKE_PATH_QML}/org/kde/*/.debug \
+    ${OE_QMAKE_PATH_QML}/org/kde/*/*/.debug \
 "
--- a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
+++ b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
@@ -9,8 +9,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "kconfigwidgets kconfig kiconthemes kxmlgui"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "da4abc3e0f2acc90d97a4bc4edc86405"
-SRC_URI[sha256sum] = "8f9acfdc3350cab97c58381067e25bb0df37a3da148612195667d3082fdcba3e"
+SRC_URI[md5sum] = "66b54cef3432c2a36db1dba8916add93"
+SRC_URI[sha256sum] = "363c56b19b25d19eaa3b8988fcb6000823cca0637ac5460bc4a61c2d82712262"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5Bookmarks, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb
+++ b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb
@@ -9,8 +9,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "kitemviews kconfigwidgets kcoreaddons ki18n kiconthemes kservice kxmlgui kdeclarative"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "25b99cda37941ac81e22b8b51a5be3cb"
-SRC_URI[sha256sum] = "8ba03c5dc0baedb70ce28a4653ae69dda86a35ab24e29cbf787438390a184c8e"
+SRC_URI[md5sum] = "71a5229d1c5648c4cb218a042c1fa018"
+SRC_URI[sha256sum] = "d7e141b1adee96079c749547070ad5cd14fa3ca49d39750e0a3d60161118a3d4"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5KCMUtils, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
+++ b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
@@ -9,8 +9,8 @@ inherit kde-kf5 cmake-lib
 DEPENDS += "kauth kconfig kcodecs kdoctools kguiaddons kwidgetsaddons"

 PV = "${KF5_VERSION}"
-SRC_URI[md5sum] = "8fd3b16a2175475764d77972b980e075"
-SRC_URI[sha256sum] = "fe9f245df8692ede7feb6f080b1450f3a26281e6318bab1c4cb969321811b6d4"
+SRC_URI[md5sum] = "ed946b78eb19c3fe1458ec78606d089c"
+SRC_URI[sha256sum] = "35a25df3d79ec4ae50f80e496218b8898564011f6eadbe7cb742e70b08102122"

 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "KF5ConfigWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/Show More
+++ b/Show More