sddm-autologin.pam: remove pam_permit.so

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

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

TODO

@@ -1,104 +0,0 @@
-qmmp: PACKAGECONFIGIZE:
-WARNING: qmmp-1.0.9-r0 do_package_qa: QA Issue: qmmp rdepends on libfaad, but it isn't a build dependency, missing faad2 in DEPENDS or PACKAGECONFIG? [build-deps]
-WARNING: qmmp-1.0.9-r0 do_package_qa: QA Issue: qmmp rdepends on wavpack, but it isn't a build dependency, missing wavpack in DEPENDS or PACKAGECONFIG? [build-deps]
-WARNING: qmmp-1.0.9-r0 do_package_qa: QA Issue: qmmp rdepends on libmms, but it isn't a build dependency, missing libmms in DEPENDS or PACKAGECONFIG? [build-deps]
-WARNING: qmmp-1.0.9-r0 do_package_qa: QA Issue: qmmp rdepends on libmodplug, but it isn't a build dependency, missing libmodplug in DEPENDS or PACKAGECONFIG? [build-deps]
-
-
-qt5.6:
-* check build wayland only / no session management
-
-kde missing:
-* plasma-sdk
-
-..........
-
-issues:
-
-hawaii:
-* unable to start session
-
-..........
-
-misc:
-* proper gpgme solution see commit 618331ae
-
-
-* Optionals / PACKAGECONFIG / CMAKE_DISABLE_FIND_PACKAGE_<PackageName>:
-
-superandy@localhost cortexa8t2hf-vfp-neon-angstrom-linux-gnueabi]$ grep -r 'The following OPTIONAL packages have been found' `find -name log.do_configure`
-./plasma-nm/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kded/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kde-cli-tools/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./libksysguard/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kmenuedit/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kdesu/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./ktexteditor/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kdesignerplugin/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kfilemetadata/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./networkmanager-qt/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./plasma-framework/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./frameworkintegration/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kwallet/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kwallet/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kdeplasma-addons/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./modemmanager-qt/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./ksysguard/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./plasma-workspace/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./sddm-kcm/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./muon/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kwayland-integration/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kdeclarative/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kpeople/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kio-extras/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./libkscreen/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kcoreaddons/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kcrash/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kde-gtk-config/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./plasma-desktop/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./plasma-desktop/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./karchive/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kjobwidgets/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./khtml/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kidletime/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kjs/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kpackage/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kitemmodels/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kio/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kxmlgui/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./bluez-qt/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kinit/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kimageformats/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./marble/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kdbusaddons/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kdenlive/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kwindowsystem/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./ksshaskpass/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./filelight/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kdoctools/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kservice/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./solid/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kwin/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kguiaddons/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./khotkeys/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./powerdevil/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./ark/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./plasma-mediacenter/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kdelibs4support/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./sddm/0.13.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kglobalaccel/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kate/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./knotifications/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./dolphin/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./konsole/15.08.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./knotifyconfig/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kactivities/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./breeze/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kdnssd/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kconfigwidgets/5.16.0-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./user-manager/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kinfocenter/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kinfocenter/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./kwayland/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-./oxygen/5.4.3-r0/temp/log.do_configure:-- The following OPTIONAL packages have been found:
-

classes/cmake_extra_sanity.bbclass

@@ -24,15 +24,15 @@ do_install_append() {
         error=
         # check for genarated sources
         for f in `find ${B} -name '*.h' -o -name '*.cpp'` ; do
-            if grep -q '${STAGING_DIR}' $f ; then
-                bbwarn "$f contains links to build host sysroot!"
+            if grep -q 'recipe-sysroot' $f ; then
+                bbwarn "$f contains links to build sysroot!"
                 error=true
             fi
         done
 
         # check installed cmake files
         for f in `find ${D} -name '*.cmake'` ; do
-            if grep -q '${STAGING_DIR}' "$f" ; then
+            if grep -q 'recipe-sysroot' "$f" ; then
                 bbwarn "$f contains links to build host sysroot!"
                 error=true
             fi

classes/cmake_lib.bbclass

@@ -57,6 +57,8 @@
 
 inherit cmake_sysroot
 
+SSTATE_SYSROOT = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}"
+
 # global helper to get CMAKE_ALIGN_SYSROOT array
 def get_align_flags(d):
     ret = {}

classes/cmake_native_dummy.bbclass

@@ -1,22 +0,0 @@
-#
-# Class to create dummy native binaries so cmake can reference them
-# Inspired by binconfig-disabled.bbclass
-#
-
-inherit native
-
-# The list of scripts which should be disabled.
-CMAKE_DUMMY_BINARIES ?= ""
-
-do_install () {
-    install -d ${D}${bindir}
-    for x in ${CMAKE_DUMMY_BINARIES}; do
-        echo "#!/bin/sh" > ${D}${bindir}/$x
-        # Make the disabled script emit invalid parameters for those configure
-        # scripts which call it without checking the return code.
-        echo "echo '--should-not-have-used-$x'" >> ${D}${bindir}/$x
-        echo "exit 1" >> ${D}${bindir}/$x
-        chmod 755 ${D}${bindir}/$x
-    done
-}
-

classes/cmake_qt5_extra.bbclass

@@ -0,0 +1,7 @@
+inherit cmake_qt5 cmake_extra_sanity
+
+EXTRA_OECMAKE += " \
+    -DCMAKE_QT5_EX_PATH_HOST_HEADERS=${STAGING_INCDIR} \
+"
+
+FILES_${PN}-dev += "${datadir}/cmake ${libdir}/cmake"

classes/kde-apps.bbclass

@@ -1,6 +1,6 @@
 inherit kde-base
 
-KDE_APP_VERSION = "16.12.1"
+KDE_APP_VERSION = "17.12.3"
 
 SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"
 

classes/kde-base.bbclass

@@ -17,7 +17,7 @@ ${KDE_MIRROR}	http://kde.c3sl.ufpr.br \n \
 SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
 
 # extra-cmake-modules cause dependent to check for python
-inherit cmake_qt5 cmake_extra_sanity pythonnative
+inherit cmake_qt5_extra pythonnative
 
 do_compile_prepend() {
     export XDG_DATA_HOME=${STAGING_DATADIR}
@@ -33,6 +33,8 @@ EXTRA_OECMAKE += " \
     -DCMAKE_INSTALL_DBUSINTERFACEDIR=share/dbus-1/interfaces \
     -DKDE_INSTALL_QTPLUGINDIR=${OE_QMAKE_PATH_PLUGINS} \
     -DKDE_INSTALL_QMLDIR=${OE_QMAKE_PATH_QML} \
+    -DKDE_PATH_EXTERNAL_HOST_LIBEXECS=${STAGING_LIBEXECDIR_NATIVE} \
+    -DKDE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} \
 "
 
 FILES_${PN} += " \

classes/kde-kf5-porting-aids.bbclass

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

classes/kde-kf5.bbclass

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

classes/kde-plasma.bbclass

@@ -1,6 +1,6 @@
 inherit kde-base
 
-PLASMA_VERSION = "5.9.1"
+PLASMA_VERSION = "5.12.4"
 
 SRC_URI = "${KDE_MIRROR}/stable/plasma/${PV}/${BPN}-${PV}.tar.xz"
 

classes/liri.bbclass

@@ -1,8 +1,10 @@
-SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
+LIRI_GIT_BRANCH ?= "develop"
 
-DEPENDS += "qtbase qtdeclarative qtquickcontrols extra-cmake-modules-native"
+SRC_URI = "git://github.com/lirios/${@'${BPN}'.replace('liri-', '')}.git;protocol=git;branch=${LIRI_GIT_BRANCH}"
 
-inherit cmake_qt5 cmake_extra_sanity pkgconfig
+DEPENDS += "qtbase qtdeclarative extra-cmake-modules-native"
+
+inherit cmake_qt5_extra pkgconfig
 
 EXTRA_OECMAKE += " \
     -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \

classes/lxqt.bbclass

@@ -1,8 +1,8 @@
-inherit cmake_qt5 cmake_extra_sanity
+inherit cmake_qt5_extra
 
 HOMEPAGE = "http://lxqt.org/"
 
-DEPENDS += "lxqt-build-tools qtbase"
+DEPENDS += "lxqt-build-tools qtbase qttools-native"
 
 SRC_URI = "git://github.com/lxde/${BPN}.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"

classes/qemu-ext.bbclass

@@ -0,0 +1,27 @@
+inherit qemu
+
+DEPENDS += "qemu-native"
+
+# slightly reworked qemu_run_binary: qemu.bbclass expects binary in sysroot but
+# our binary is not (yet) installed
+# ${@qemu_run_binary_local(d, '$D', '/usr/bin/test_app')} [test_app arguments]
+#
+def qemu_run_binary_local(data, rootfs_path, binary):
+    qemu_binary = qemu_target_binary(data)
+    if qemu_binary == "qemu-allarch":
+        qemu_binary = "qemuwrapper"
+
+    libdir = rootfs_path + data.getVar("libdir", False)
+    base_libdir = rootfs_path + data.getVar("base_libdir", False)
+    extra_libdir = data.getVar("QEMU_EXTRA_LIBDIR", False)
+    if extra_libdir:
+        extra_libdir = ":" + extra_libdir
+    else:
+        extra_libdir = ""
+    qemu_options = data.getVar("QEMU_OPTIONS", True)
+
+    return "PSEUDO_UNLOAD=1 " + qemu_binary + " " + qemu_options + " -L " + rootfs_path\
+            + " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + extra_libdir + " "\
+            + binary
+
+

classes/qt5-translation.bbclass

@@ -36,7 +36,7 @@ python qt_do_split_locales() {
         translocation = '%s%s' % (dvar, transvar)
         transfiles = glob.glob(translocation)
         for l in sorted(transfiles):
-            lib, locale = l.replace('.qm', '').split("_",1)
+            lib, locale = os.path.basename(l.replace('.qm', '')).split("_",1)
             if not locale in locales:
                 locales.append(locale)
 

conf/layer.conf

@@ -8,6 +8,12 @@ BBFILES += "${LAYERDIR}/extends-*/*.bb ${LAYERDIR}/extends-*/*.bbappend"
 
 BBFILE_COLLECTIONS += "meta-qt5-extra"
 BBFILE_PATTERN_meta-qt5-extra := "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-qt5-extra = "7"
+BBFILE_PRIORITY_meta-qt5-extra = "20"
 
-LAYERDEPENDS_meta-qt5-extra = "core qt5-layer openembedded-layer networking-layer"
+LAYERDEPENDS_meta-qt5-extra = "core qt5-layer openembedded-layer networking-layer multimedia-layer"
+LAYERSERIES_COMPAT_meta-qt5-extra = "rocko"
+
+LICENSE_PATH += "${LAYERDIR}/files/licenses"
+
+# required for fluxbox - supplied by e.g fedora glibc-common
+HOSTTOOLS_NONFATAL += "gencat"

extends-meta-qt5/qtbase/0002-qdbusxml2cpp-prepare-commandline-string-manipulation.patch

@@ -17,12 +17,13 @@ diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qd
 index 76401da..3a712d2 100644
 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
 +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
-@@ -289,9 +289,11 @@ static QString moc(const QString &name)
+@@ -289,9 +289,12 @@ static QString moc(const QString &name)
  
  static QTextStream &writeHeader(QTextStream &ts, bool changesWillBeLost)
  {
 +	QString strCmdLine = commandLine;
 +	strCmdLine.replace(QStringLiteral("STRING_FULL_PATH"), QStringLiteral("STRING_PATH"));
++	strCmdLine.replace(QStringLiteral("recipe-sysroot"), QStringLiteral("recipe--sysroot"));
      ts << "/*" << endl
         << " * This file was generated by " PROGRAMNAME " version " PROGRAMVERSION << endl
 -       << " * Command line was: " << commandLine << endl

extends-meta-qt5/qtbase_git.bbappend

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

extends-meta-qt5/qttools_git.bbappend

@@ -5,12 +5,13 @@ DEPENDS += "${BPN}-native"
 
 # 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 \
+    file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
 "
 
 # native ignore
 CMAKE_ALIGN_SYSROOT_class-native[1] = "ignore"
+CMAKE_ALIGN_SYSROOT_class-nativesdk[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}"
+CMAKE_ALIGN_SYSROOT[1] = "Qt5Help, -S${bindir}${QT_DIR_NAME}, -s${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}"
+CMAKE_ALIGN_SYSROOT[2] = "Qt5LinguistTools, -S${bindir}${QT_DIR_NAME}, -s${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}"

extends-oe-core/boost_%.bbappend

@@ -1,2 +0,0 @@
-PACKAGECONFIG ?= "python"
-

extends-oe-core/gpgme/0001-return-unknown-as-host.patch

@@ -1,33 +0,0 @@
-From 84427b2fd68f6c56f3919fdddad63cf5b5541730 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Thu, 4 Dec 2014 13:31:15 +0100
-Subject: [PATCH] return unknown as host
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-this is intended for native build which cannot know target host
-
-Upstream-Status: Inappropriate [cross build specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 92375e6..4564c05 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -989,7 +989,7 @@ AH_BOTTOM([
- # Substitution used for gpgme-config
- GPGME_CONFIG_LIBS="-lgpgme"
- GPGME_CONFIG_CFLAGS=""
--GPGME_CONFIG_HOST="$host"
-+GPGME_CONFIG_HOST="unknown"
- AC_SUBST(GPGME_CONFIG_API_VERSION)
- AC_SUBST(GPGME_CONFIG_LIBS)
- AC_SUBST(GPGME_CONFIG_CFLAGS)
--- 
-1.8.3.1
-

extends-oe-core/gpgme/gpgme.pc

@@ -1,10 +0,0 @@
-prefix=/usr
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: gpgme
-Description: GNU Privacy Guard Made Easy
-Version: 1.4.3
-Requires:
-Libs: -L${libdir} -lgpgme -lassuan -lgpg-error
-Cflags: -I${includedir}

extends-oe-core/gpgme/pkgconfig.patch

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

extends-oe-core/gpgme_%.bbappend

@@ -0,0 +1,6 @@
+inherit cmake_lib
+
+CMAKE_ALIGN_SYSROOT_class-native[1] = "ignore"
+
+CMAKE_ALIGN_SYSROOT[1] = "Gpgmepp, -S${includedir}, -s${CMAKE_QT5_EX_PATH_HOST_HEADERS}"
+CMAKE_ALIGN_SYSROOT[2] = "Gpgmepp, -S${libdir}, -s${OE_QMAKE_PATH_HOST_LIBS}/"

extends-oe-core/gpgme_1.6.0.bb

@@ -1,46 +0,0 @@
-SUMMARY = "High-level GnuPG encryption/signing API"
-DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management"
-HOMEPAGE = "http://www.gnupg.org/gpgme.html"
-BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
-
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \
-                    file://src/gpgme.h.in;endline=23;md5=5027eec93a996272a9a0a6a86cf35775 \
-                    file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
-
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/${BP}.tar.bz2 \
-           file://gpgme.pc \
-           file://pkgconfig.patch \
-          "
-
-SRC_URI_append_class-native = " file://0001-return-unknown-as-host.patch"
-
-SRC_URI[md5sum] = "60d730d22e8065fd5de309e8b98e304b"
-SRC_URI[sha256sum] = "b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d"
-
-DEPENDS = "libgpg-error libassuan"
-
-inherit autotools texinfo pkgconfig
-
-PACKAGES =+ "${PN}-pthread"
-FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"
-FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*"
-
-CFLAGS_append_libc-musl = " -D__error_t_defined "
-do_configure_prepend () {
-	# Else these could be used in preference to those in aclocal-copy
-	rm -f ${S}/m4/gpg-error.m4
-	rm -f ${S}/m4/libassuan.m4
-}
-
-do_install_append () {
-        install -d ${D}${libdir}/pkgconfig
-        install -m 0644 ${WORKDIR}/gpgme.pc ${D}${libdir}/pkgconfig/
-}
-
-do_install_append_class-native () {
-	sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}${bindir}/gpgme-config
-}
-
-BBCLASSEXTEND = "native"

files/licenses/CC-BY-SA-4.0

@@ -0,0 +1,396 @@
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More_considerations
+     for the public: 
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  d. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  e. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  f. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  g. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  h. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  i. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  j. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  k. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+       4. If You Share Adapted Material You produce, the Adapter's
+          License You apply must not prevent recipients of the Adapted
+          Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material; and
+
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
+

recipes-greenisland/greenisland/greenisland-native.bb

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

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

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

recipes-greenisland/greenisland/greenisland.bb

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

recipes-greenisland/greenisland/greenisland.inc

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

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

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

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

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

recipes-hawaii/cinema/cinema_git.bb

@@ -1,15 +0,0 @@
-SUMMARY = "Simple video player for the Hawaii desktop environment"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://src/main.cpp;beginline=9;endline=24;md5=abd5b11c017f98f28850382a61e02a30"
-
-inherit qmake5
-
-DEPENDS = "qtbase qtdeclarative qtquickcontrols qtmultimedia"
-SRC_URI = " \
-	git://github.com/plfiorini/${BPN}.git;protocol=git;branch=master \
-	file://0001-Make-install-work.patch \
-"
-SRCREV = "66290bce6b5a9074f13886b42370f95677ef50d6"
-PV = "git${SRCPV}"
-
-S = "${WORKDIR}/git"

recipes-hawaii/cinema/files/0001-Make-install-work.patch

@@ -1,27 +0,0 @@
-From 39d0534a47ade0b83348ad789d3a75fbaf8fb868 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Wed, 8 Jan 2014 22:36:35 +0100
-Subject: [PATCH] Make install work
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- src/src.pro | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/src.pro b/src/src.pro
-index 8045652..9ad4e2f 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -19,3 +19,6 @@ OTHER_FILES += \
-     qml/ControlBar.qml \
-     qml/Utils.js \
-     qml/SeekControl.qml
-+
-+target.path = /usr/bin
-+INSTALLS += target
--- 
-1.8.3.1
-

recipes-hawaii/eyesight/eyesight_git.bb

@@ -1,14 +0,0 @@
-SUMMARY = "Image viewer for the Hawaii desktop environment"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-inherit hawaii
-
-DEPENDS += "qttools-native"
-
-SRCREV = "7ff55701dde114df2911c937143499f73d0f4e09"
-PV = "0.1.4+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-FILES_${PN} += "${datadir}/appdata"

recipes-hawaii/fluid/fluid_git.bb

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

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

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

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

@@ -1,58 +0,0 @@
-SUMMARY = "Hawaii desktop environment shell"
-LICENSE = "GPLv2 & LGPLv2"
-LIC_FILES_CHKSUM = " \
-	file://LICENSE.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-	file://LICENSE.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
-"
-
-inherit hawaii systemd pythonnative distro_features_check
-
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-SRC_URI += " \
-    file://0001-find-host-s-git.patch \
-"
-SRCREV = "d02a209082819e3bfa3edd167328b4ed52ebf6e1"
-PV = "0.8.0+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-DEPENDS += " \
-    qtwayland-native \
-    wayland \
-    libqtxdg \
-    solid \
-    libhawaii \
-    greenisland \
-"
-
-# REVISIT optionals
-DEPENDS += " \
-    alsa-lib \
-    pulseaudio \
-"
-
-EXTRA_OECMAKE += " \
-    -DSYSTEMD_USER_UNIT_DIR=${systemd_system_unitdir} \
-"
-
-PACKAGECONFIG[nm_qt] = "-DENABLE_NETWORK_MANAGER=ON,-DENABLE_NETWORK_MANAGER=OFF,networkmanager-qt modemmanager-qt"
-PACKAGECONFIG ??= "nm_qt"
-
-SYSTEMD_SERVICE_${PN} = "hawaii.service"
-
-# for starter scripts
-RDEPENDS_${PN} = "qttools-tools qtwayland-plugins"
-
-# REVISIT optionals
-RRECOMMENDS_${PN} += " \
-    fluid \
-    hawaii-wallpapers \
-    hawaii-icon-theme \
-"
-
-FILES_${PN} += " \
-    ${datadir} \
-    ${systemd_unitdir} \
-    ${OE_QMAKE_PATH_QML} \
-"

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

@@ -1,33 +0,0 @@
-SUMMARY = "System preferences for the Hawaii desktop environment"
-LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = " \
-	file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
-"
-
-inherit hawaii
-
-DEPENDS += " \
-    greenisland \
-    libhawaii \
-    polkit-qt-1 \
-    kscreen \
-"
-
-SRCREV = "f1ce43687a0c9dcdbf0cd5640d38bbbc348dd123"
-PV = "0.8.0"
-S = "${WORKDIR}/git"
-
-EXTRA_OECMAKE += "-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools"
-
-FILES_${PN} += " \
-    ${OE_QMAKE_PATH_QML} \
-"
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake \
-"
-
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "HawaiiSystemPreferences, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "HawaiiSystemPreferences, -S${includedir}, -S${STAGING_INCDIR}"

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

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

recipes-hawaii/hawaii-wallpapers/hawaii-wallpapers_git.bb

@@ -1,12 +0,0 @@
-SUMMARY = "Wallpapers for the Hawaii desktop environment"
-LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
-
-inherit hawaii
-
-SRCREV = "ffca94dc6917ba0109dbd837cc3579fd0cde6357"
-PV = "0.4.90+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-FILES_${PN} += "${datadir}"

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

@@ -1,15 +0,0 @@
-SUMMARY = "Styles for applications using QtQuick Controls"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
-
-inherit hawaii
-
-SRCREV = "9aaaf3b8681dc2253d812aa7f37b8ed5e1651959"
-PV = "0.8.0"
-
-S = "${WORKDIR}/git"
-
-FILES_${PN} += " \
-    ${datadir}/color-schemes \
-    ${OE_QMAKE_PATH_QML} \
-"

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

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

recipes-hawaii/libhawaii/libhawaii_git.bb

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

recipes-hawaii/packagegroups/hawaii-world.bb

@@ -1,27 +0,0 @@
-SUMMARY = "Hawaii desktop package collection"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
-
-inherit packagegroup
-
-RDEPENDS_${PN} = " \
-    cinema \
-    eyesight \
-    fluid \
-    greenisland \
-    hawaii-icon-theme \
-    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "hawaii-shell", "",d)} \
-    hawaii-system-preferences \
-    hawaii-terminal \
-    hawaii-wallpapers \
-    hawaii-widget-styles \
-    hawaii-workspace \
-    libhawaii \
-    qtaccountsservice \
-    qtconfiguration \
-    swordfish \
-"
-
-# wind was a X11 mauios approach. For dependencies (kdeclarative does not build 
-# for raspi) keep out
-# wind

recipes-hawaii/qtaccountsservice/qtaccountsservice_git.bb

@@ -1,21 +0,0 @@
-SUMMARY = "Qt-style API to use freedesktop.org's AccountsService DBus service"
-LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSE.LGPLv21;md5=4fbd65380cdd255951079008b364516c \
-"
-
-inherit hawaii
-
-SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
-SRCREV = "74728c9f092ba7166b96414cb85e268f3c3ed4d1"
-
-S = "${WORKDIR}/git"
-PV = "0.6.0+git${SRCPV}"
-
-FILES_${PN} += "${OE_QMAKE_PATH_QML}/QtAccountsService"
-FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/QtAccountsService/.debug"
-FILES_${PN}-dev += "${libdir}/cmake"
-
-CMAKE_ALIGN_SYSROOT[1] = "QtAccountsService, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_ALIGN_SYSROOT[2] = "QtAccountsService, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"

recipes-hawaii/qtconfiguration/qtconfiguration_0.3.1.bb

@@ -1,25 +0,0 @@
-SUMMARY = "Modules for fluid and dynamic applications development with QtQuick"
-LICENSE = "BSD & GFDL-1.3 & GPLv3 & LGPLv2.1"
-LIC_FILES_CHKSUM = " \
-	file://LICENSE.BSD;md5=5bd3079664b3473c826ea30fd8d55687 \
-	file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
-	file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
-	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
-"
-
-inherit hawaii
-
-DEPENDS += "dconf"
-
-SRC_URI = " \
-    git://github.com/hawaii-desktop/${BPN}.git \
-"
-SRCREV = "fd37e4f7a19b593e44f35e59a5a19aecc4f268a9"
-
-S = "${WORKDIR}/git"
-
-FILES_${PN} += "${libdir}/hawaii/qml/Hawaii/Configuration"
-FILES_${PN}-dbg += "${libdir}/hawaii/qml/Hawaii/Configuration/.debug"
-FILES_${PN}-dev += "${libdir}/cmake"
-
-

recipes-hawaii/swordfish/swordfish_git.bb

@@ -1,19 +0,0 @@
-SUMMARY = "File manager"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-inherit hawaii
-
-DEPENDS += "qttools"
-
-SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git;protocol=git;branch=master"
-SRCREV = "0f1d9294cbf9d4ac235c31d10b0c7166845e098f"
-PV = "0.1.90+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-CXXFLAGS += "-fPIC"
-EXTRA_OECMAKE += "-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools"
-
-FILES_${PN} += "${libdir}/hawaii/qml ${datadir}"
-FILES_${PN}-dbg += "${libdir}/hawaii/qml/Swordfish/.debug"

recipes-hawaii/wind/wind_0.4.0.bb

@@ -1,28 +0,0 @@
-SUMMARY = "Wind theme for Maui and Hawaii"
-LICENSE = "GPLv2 & BSD & LGPLv2.1"
-LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-	file://COPYING.BSD;md5=9e96e13a1a76211bcdb0255a5d42b01d \
-	file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
-"
-
-inherit hawaii
-
-DEPENDS += "plasma-framework"
-
-SRC_URI = "git://github.com/mauios/${BPN}.git;protocol=git;branch=master"
-SRCREV = "cc5d4de41aaeb63611701c0a739a93bc31bccf50"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECMAKE += "-DENABLE_WIDGETS_FACTORY:bool=ON"
-
-PACKAGES =+ "${PN}-grub ${PN}-plymouth ${PN}-widget-factory"
-
-FILES_${PN}-grub = "/boot"
-FILES_${PN}-plymouth = "${datadir}/plymouth/themes"
-FILES_${PN}-widget-factory = "${bindir}/*widget-factory"
-FILES_${PN} += " \
-    ${datadir} \
-    ${OE_QMAKE_PATH_QML} \
-"

recipes-kdab/hotspot/hotspot_git.bb

@@ -0,0 +1,31 @@
+SUMMARY = "The Linux perf GUI for performance analysis"
+LICENSE = "GPLv2+ | KDAB-Commercial"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.txt;md5=a6b8a64054f1549420f27724acd2337a \
+    file://LICENSE.GPL.txt;md5=eed541e1ee57f0373b3cb5824dfe6b93 \
+    file://LICENSE.US.txt;md5=1cf6e30372544be558f7146a7e229cdd \
+"
+
+inherit kde-base pkgconfig gettext gtk-icon-cache
+
+DEPENDS += " \
+    elfutils \
+    ki18n-native \
+    kcoreaddons-native \
+    kauth-native \
+    kconfig-native \
+    threadweaver \
+    kconfigwidgets \
+    kitemviews \
+    kitemmodels \
+    kio \
+    solid \
+"
+SRC_URI = "gitsm://github.com/KDAB/hotspot.git"
+SRCREV = "a41a0a5ba1fead202bfdcb2198f192114d030484"
+S = "${WORKDIR}/git"
+PV = "1.1.0+git${SRCPV}"
+
+FILES_${PN} += "${datadir}/icons"
+
+RDEPENDS_${PN} += "perf"

recipes-kde/apps/ark/ark.bb

@@ -10,10 +10,12 @@ inherit kde-apps gtk-icon-cache
 DEPENDS += "\
     libarchive \
     karchive \
-    kconfig \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
     kcrash \
     kdbusaddons \
-    kdoctools \
+    kdoctools-native \
     ki18n \
     kiconthemes \
     khtml \
@@ -21,11 +23,13 @@ DEPENDS += "\
     kservice \
     kpty \
     kwidgetsaddons \
-" 
+    kitemmodels \
+    sonnet-native \
+"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "08b9058d317b9e5667bb0eaf2a4136c9"
-SRC_URI[sha256sum] = "b54c137098bbf77d99a54e526a58a83aca73db1cf1fabbbc4bccdf09a1bee8d0"
+SRC_URI[md5sum] = "e9ab1b82b80b3901de35cdaf3b32267a"
+SRC_URI[sha256sum] = "b13d102e06eeaf080270a710a6b82d11d444fde78f0c701ac5efca682cfb5642"
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 FILES_${PN} += " \

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

@@ -6,26 +6,32 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
 Upstream-Status: Pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+
 ---
  app/main.cpp | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/app/main.cpp b/app/main.cpp
-index a9539b5..91f96ab 100644
+index 0396400..5924683 100644
 --- a/app/main.cpp
 +++ b/app/main.cpp
-@@ -178,6 +178,7 @@ int main(int argc, char **argv)
+@@ -206,6 +206,7 @@ int main(int argc, char **argv)
      // This is needed to prevent Dolphin from freezing when opening an archive.
-     KDBusService dbusService(KDBusService::Multiple);
+     KDBusService dbusService(KDBusService::Multiple | KDBusService::NoExitOnFailure);
  
 +#ifndef QT_NO_SESSIONMANAGER
      // Session restoring.
      if (application.isSessionRestored()) {
          if (!KMainWindow::canBeRestored(1)) {
-@@ -190,8 +191,9 @@ int main(int argc, char **argv)
+@@ -218,8 +219,9 @@ int main(int argc, char **argv)
              delete window;
              return -1;
          }

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

@@ -5,18 +5,19 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += "\
-    kconfig \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
     kio \
     ki18n \
     kservice \
     kfilemetadata \
     baloo \
-    kdelibs4support \
-" 
+"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "5d3f8f89d833033794b170e6b9db4cbd"
-SRC_URI[sha256sum] = "4bff2f4abd9d65f39e2b44189312bac139908362e8888c114bbf3d107902217c"
+SRC_URI[md5sum] = "959165128d97a132b2b18d886af6c4f1"
+SRC_URI[sha256sum] = "10956500e389cce6b043fbda7bdc16916cda75548f285268025d72dc5546c1be"

recipes-kde/apps/bovo/bovo.bb

@@ -9,16 +9,18 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps gtk-icon-cache
 
 DEPENDS += "\
-    kcoreaddons \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
     kdbusaddons \
-    kdoctools \
+    kdoctools-native \
     kxmlgui \
     libkdegames \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "ec6c38f965585beaba124eb78cce40fd"
-SRC_URI[sha256sum] = "7dba4db8e72fdbe6fb552b4d8428676cf5cc490456518b918a650b616f8660b6"
+SRC_URI[md5sum] = "6076cadd753fe67dac2967bb81d2a66f"
+SRC_URI[sha256sum] = "498fcca291345cd5bba61f1163916ad059b7691083d10a3e910eff130072ea97"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \

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

@@ -2,19 +2,25 @@ SUMMARY = "Plugins for Dolphin"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += "\
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    kdesignerplugin-native \
+    kdelibs4support-native \
+    kdelibs4support \
+    sonnet-native \
     kxmlgui \
     ki18n \
     kio \
-    kdelibs4support \
     dolphin \
-" 
+"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "c33684a8b47e439e68775a164455fb54"
-SRC_URI[sha256sum] = "ff46afcdefb334bef5b8aca4bdcea1f2f133472e1e0922fb63361280ab6b3abd"
+SRC_URI[md5sum] = "6dc086cfb23a47f46c99946f71406004"
+SRC_URI[sha256sum] = "8e31695ea1ddfd58b35059d5389e5b9b401fd10294d50765a834ae81a8e6bb2d"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \

recipes-kde/apps/dolphin/dolphin.bb

@@ -5,18 +5,21 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += " \
-    kdoctools \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    kdoctools-native \
+    sonnet-native \
+    \
     kinit \
     kcmutils \
     knewstuff \
-    kcoreaddons \
     ki18n \
     kdbusaddons \
     kbookmarks \
-    kconfig \
     kio \
     kparts \
     solid \
@@ -33,8 +36,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "149165d7954bfef08747e5bb7252a277"
-SRC_URI[sha256sum] = "b02bbfbe6d3f8eef6a6fd9b6ff6f5e90b47ad27c9f2e7ebcd25346287490fa6e"
+SRC_URI[md5sum] = "c79b7db37e9c5cd84eab7673eeb563d3"
+SRC_URI[sha256sum] = "40dc96fa05cf6a09c49329cd69c9f1079b4ddb57592c9ff0e957eec6e761a439"
 SRC_URI += " \
     file://0001-align-paths-to-phonon.patch \
     file://0002-fix-build-for-qtbase-without-session-management.patch \

recipes-kde/apps/dragon/dragon.bb

@@ -5,17 +5,19 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += " \
     phonon \
     \
-    kconfig \
+    kauth-native \
+    kconfig-native \
     kconfigwidgets \
-    kcoreaddons \
+    kcoreaddons-native \
     kcrash \
     kdbusaddons \
-    kdoctools \
+    kdoctools-native \
+    sonnet-native \
     ki18n \
     kjobwidgets \
     kio \
@@ -27,8 +29,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "0e5ca33aab8fdd0462494119e715195d"
-SRC_URI[sha256sum] = "3302f189878ab5d337035bc73b3e0e753e2bfb1a995f5e5810cbc0304dc26092"
+SRC_URI[md5sum] = "6352cbdc575a4b0da1eabce763d24602"
+SRC_URI[sha256sum] = "448725522965fd06779034fad9342526d9a1ac88c3ac5ea7b73e7cefc089b4c8"
 
 CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
 

recipes-kde/apps/filelight/filelight.bb

@@ -5,24 +5,26 @@ LIC_FILES_CHKSUM = " \
     file://COPYING-DOCS;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += "\
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    kdoctools-native \
+    sonnet-native \
     kio \
     kparts \
     solid \
     kxmlgui \
-    kcoreaddons \
-    kdoctools \
     ki18n \
-" 
+"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "2bac6bc332a44b9120ec1b7b8dbcc583"
-SRC_URI[sha256sum] = "f8a44821c01f84a8554f0d58e32bf6f351dd2d6ecb7e22b0544a40ebeb1e5d7d"
+SRC_URI[md5sum] = "3d00b1ca499e4bc55d71aa7ee21f6c7c"
+SRC_URI[sha256sum] = "ceaa8441d94651e665790af6cb419bf39b34b7246f4848b070a8a2dde78a1bcd"
 SRC_URI += " \
-    file://0001-do-not-build-docs.patch \
-    file://0002-fix-build-for-qtbase-build-without-session-support-Q.patch \
+    file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
 "
 
 FILES_${PN} += " \

recipes-kde/apps/filelight/files/0001-do-not-build-docs.patch

@@ -1,41 +0,0 @@
-From 517853035c99b29006a7b757651161859c6e9db5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Fri, 24 Apr 2015 11:26:38 +0200
-Subject: [PATCH] do not build docs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-docs creation fails with
-
-index.docbook:2: element para: validity error : ID gnu-fdl already defined
-...
-element div: validity error : ID header already defined
-element div: validity error : ID header_content already defined
-element div: validity error : ID header_left already defined
-element div: validity error : ID header_right already defined
-element div: validity error : ID header already defined
-element div: validity error : ID header_content already defined
-...
-
-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 834282f..35e51b6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,5 +60,5 @@ include_directories(src/)
- 
- add_subdirectory(src)
- add_subdirectory(misc)
--add_subdirectory(doc)
-+#add_subdirectory(doc)
- feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- 
-1.9.3
-

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

@@ -9,13 +9,13 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- src/app/main.cpp | 5 ++++-
+ src/main.cpp | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/src/app/main.cpp b/src/app/main.cpp
+diff --git a/src/main.cpp b/src/main.cpp
 index 2463a29..1709717 100644
---- a/src/app/main.cpp
-+++ b/src/app/main.cpp
+--- a/src/main.cpp
++++ b/src/main.cpp
 @@ -78,6 +78,7 @@ int main(int argc, char *argv[])
      options.process(app);
      about.processCommandLine(&options);

recipes-kde/apps/gwenview/gwenview.bb

@@ -2,7 +2,7 @@ SUMMARY = "A fast and easy to use image viewer for KDE"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b"
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += " \
     jpeg \
@@ -10,17 +10,23 @@ DEPENDS += " \
     lcms \
     phonon \
     kdelibs4support \
+    kdelibs4support-native \
     kded \
     kactivities \
-    kcoreaddons \
+    kcoreaddons-native \
+    kconfig-native \
+    kauth-native \
+    kdesignerplugin-native \
+    sonnet-native \
     kxmlgui \
     kfilemetadata \
     baloo \
+    libkdcraw \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "1d1ac5a3f9f9639b898db4008b9b52e6"
-SRC_URI[sha256sum] = "255df6966b34278a3375880ff6ff31000cc52ea69285e5da5e95a3c4ff782c64"
+SRC_URI[md5sum] = "c0e224d49d0e80e5f1e24f43de81920d"
+SRC_URI[sha256sum] = "3987dcfbfaea60130d98d7708f7c0f468eec3efff6f45241aeb08751882aff0d"
 
 SRC_URI += " \
     file://0001-Set-Kipi-package-properties.patch  \
@@ -32,6 +38,7 @@ CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
 FILES_${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/icons \
+    ${datadir}/solid \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
 

recipes-kde/apps/kalzium/kalzium.bb

@@ -0,0 +1,40 @@
+SUMMARY = "Periodic Table of Elements"
+LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
+"
+
+inherit kde-apps pythonnative gettext pkgconfig gtk-icon-cache
+
+DEPENDS += " \
+    qtsvg \
+    libeigen \
+    openbabel \
+    avogadrolibs \
+    \
+    karchive \
+    kconfig \
+    kcoreaddons \
+    kdoctools \
+    ki18n \
+    kdelibs4support \
+    khtml \
+    knewstuff \
+    kparts \
+    kplotting \
+    solid \
+    kunitconversion \
+    kwidgetsaddons \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "72bde526067b7f54ba7d13a69cac5fc7"
+SRC_URI[sha256sum] = "50050c85fb1760a99b7bbd0ed0f1047b4456139eb8d3f012005f6106e16a880e"
+
+FILES_${PN} += " \
+    ${datadir}/config.kcfg \
+    ${datadir}/kxmlgui5 \
+    ${datadir}/libkdeedu \
+"

recipes-kde/apps/kapman/kapman.bb

@@ -8,11 +8,13 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += "\
-    kcoreaddons \
-    kconfig \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    kdoctools-native \
     kwindowsystem \
     ki18n \
     kconfigwidgets \
@@ -24,8 +26,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "acc85096197530e2e02cb877cef3ce1f"
-SRC_URI[sha256sum] = "06addd40448ba9d7f58231b5bfcfa2d9ff94d19e726a5ef320d8dd1cd599bdf3"
+SRC_URI[md5sum] = "afc4665114cb52ff957d73542ad265b1"
+SRC_URI[sha256sum] = "9f5ccb8e1ab5ca50bae12992e567f7df419555d062fc4260faa46b58d052cf12"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/kate/kate.bb

@@ -6,13 +6,17 @@ LIC_FILES_CHKSUM = " \
     file://COPYING-LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += " \
     qtscript \
     \
-    kconfig \
-    kdoctools \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    sonnet-native \
+    kdoctools-native \
+    kpackage-native \
     kguiaddons \
     ki18n \
     kinit \
@@ -30,8 +34,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "ac0dbaa0f0b06e3cc96e9f87ea321f42"
-SRC_URI[sha256sum] = "984a82005897b553eab0525715b626f7467bc1d664b29ac7944860cd1d7012dc"
+SRC_URI[md5sum] = "4c6c8a35d1293f04c00bea822367837b"
+SRC_URI[sha256sum] = "e5b6a3ccb688ee358dadbcca86c0060a481ff60a81a472865429beba6bea2a10"
 
 SRC_URI += " \
     file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \

recipes-kde/apps/katomic/katomic.bb

@@ -9,8 +9,10 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps gtk-icon-cache
 
 DEPENDS += "\
-    kcoreaddons \
-    kconfig \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    kdoctools-native \
     kwidgetsaddons \
     ki18n \
     kguiaddons \
@@ -25,8 +27,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "64f10e943903513cadae909b280f6fd6"
-SRC_URI[sha256sum] = "57f4fc75c3383dacdfb7c7ad56c3da12878d4edff1079562af610c79695e54bd"
+SRC_URI[md5sum] = "a60927adb222fbd1c1c1482a3c03cd5d"
+SRC_URI[sha256sum] = "54b689973be0690bec5412f6198750bcfa63e71c5435543e6683e96705444cd2"
 SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
 
 FILES_${PN} += " \

recipes-kde/apps/kbounce/kbounce.bb

@@ -7,11 +7,13 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += "\
-    kcoreaddons \
-    kconfig \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    kdoctools-native \
     kdbusaddons  \
     ki18n \
     kguiaddons \
@@ -26,8 +28,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "e492a200a396cb0b76c675f1707d3e6d"
-SRC_URI[sha256sum] = "8ecdc1d391a8ede5db1eda50c7d212d6b5b4169bb74cb1c8bc6e630ace8c3481"
+SRC_URI[md5sum] = "4f80daf1b4c1f8c8ade43da1af1b224e"
+SRC_URI[sha256sum] = "7cd37fe9d5415e1dabcbf6cdb7f3c5aaa76bf9dc1144c400d2e58bddd0da1054"
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 FILES_${PN} += " \

recipes-kde/apps/kcalc/kcalc.bb

@@ -5,23 +5,25 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += "\
     gmp \
-    kconfig \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    kdoctools-native \
     kconfigwidgets \
-    kdoctools \
     kguiaddons \
     ki18n \
     kinit \
     knotifications \
     kxmlgui \
-" 
+"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "107022341aed3aef7c8d72b7de6c08a1"
-SRC_URI[sha256sum] = "fb390f2e980f12beab6179240f665cb431626ffa9dea8c24d67ad02813309859"
+SRC_URI[md5sum] = "6bd85ec27c474fd9c67e775e3fb6d5e3"
+SRC_URI[sha256sum] = "124d2cb3cad885fa948d17d485ceb406c782d2d456e18917128508aae5c49970"
 
 FILES_SOLIBSDEV = ""
 

recipes-kde/apps/kcolorchooser/kcolorchooser.bb

@@ -7,14 +7,17 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps gtk-icon-cache
 
 DEPENDS += "\
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
     ki18n \
     kwidgetsaddons \
     kxmlgui \
-" 
+"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "874e95369735955d827eff0aa69e65d3"
-SRC_URI[sha256sum] = "7fe83e765be9de06bde1535e55ef7eb974c78ae8b2b232cc92f5ee71ea1307ef"
+SRC_URI[md5sum] = "b7c26d70a8bd83e5b70f75535af46989"
+SRC_URI[sha256sum] = "d4a3df598ab18fa393c383d72528a399dcc2e33d3494a8fe4db098d67f5cc8f9"
 
 FILES_${PN} += " \
     ${datadir}/icons \

recipes-kde/apps/kdenlive/files/0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch

@@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b5a646d..7018636 100644
+index d33b65e..2c1c376 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -82,7 +82,7 @@ set_package_properties(MLT PROPERTIES
+@@ -108,7 +108,7 @@ set_package_properties(MLT PROPERTIES
                  TYPE RUNTIME
                  PURPOSE "Required to do video processing")
  
 -set(MLT_PREFIX ${MLT_ROOT_DIR})
-+SET(MLT_PREFIX "/usr" CACHE STRING "mlt prefix")
++set(MLT_PREFIX ${MLT_ROOT_DIR} CACHE STRING "mlt prefix")
  
  add_subdirectory(data)
- add_subdirectory(doc)
+ if(KF5DocTools_FOUND)
 -- 
-2.1.0
+2.14.3
 

recipes-kde/apps/kdenlive/kdenlive.bb

@@ -11,9 +11,11 @@ DEPENDS += "\
     qtsvg \
     qtwebkit \
     karchive \
+    kauth-native \
+    sonnet-native \
     kbookmarks \
-    kcoreaddons \
-    kconfig \
+    kcoreaddons-native \
+    kconfig-native \
     kconfigwidgets \
     kdbusaddons \
     kfilemetadata \
@@ -27,17 +29,19 @@ DEPENDS += "\
     kguiaddons \
     ktextwidgets \
     kiconthemes \
-    kdoctools \
+    kdoctools-native \
     xapian-core \
+    shared-mime-info-native \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "3c906a40f0c5649f4b1b68f4693352dc"
-SRC_URI[sha256sum] = "bca5e9293326aecd6ae295f9f579ba5d7880baf54183cb0a8d8c708f4f04768d"
+SRC_URI[md5sum] = "b2d2571e20547d54fe7b7108882e7e8d"
+SRC_URI[sha256sum] = "371f860365d01c4c0aebe931354cc99a646d44f17e6846c93ee2c002258f503e"
 
 SRC_URI += " \
     file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \
 "
+
 EXTRA_OECMAKE += "-DMLT_PREFIX=${prefix}"
 
 FILES_${PN} += " \

recipes-kde/apps/kdf/kdf.bb

@@ -7,9 +7,11 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps gtk-icon-cache
 
 DEPENDS += "\
+    kauth-native \
+    kconfig-native \
     kconfigwidgets \
-    kcoreaddons \
-    kdoctools \
+    kcoreaddons-native \
+    kdoctools-native \
     ki18n \
     kiconthemes \
     kio \
@@ -17,11 +19,11 @@ DEPENDS += "\
     knotifications \
     kwidgetsaddons \
     kxmlgui \
-" 
+"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "9bcb48e1de6483bf8a20315bb6d0ada9"
-SRC_URI[sha256sum] = "db89a2a7cf899fbbbda503ed53b881db495dfdf4799595b71013e3ea50380bda"
+SRC_URI[md5sum] = "9583927463f8afd583c112151c38bd41"
+SRC_URI[sha256sum] = "9776c270e2a8b43b8ad8b500015542f7249b5fcf2ce0b698e0866125032a00a3"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \

recipes-kde/apps/kdiamond/kdiamond.bb

@@ -6,13 +6,14 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += "\
-    kcoreaddons \
-    kconfig \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
     kdbusaddons \
-    kdoctools \
+    kdoctools-native \
     kwidgetsaddons \
     ki18n \
     kguiaddons \
@@ -25,8 +26,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "ab07c48b7b3155a5f049a35bf1a6fcc3"
-SRC_URI[sha256sum] = "6bf47c486d4b7d8138522579ea7013a9c5967c59bedcf6095251d3f951d77a9b"
+SRC_URI[md5sum] = "d3547836e884387da322086ebccacac8"
+SRC_URI[sha256sum] = "ac5f73ead36f30609d2ef1b8888b940e47e3bbbee54fda8c27765ddea5a295cc"
 SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 FILES_${PN} += " \

recipes-kde/apps/khelpcenter/khelpcenter.bb

@@ -4,30 +4,32 @@ LIC_FILES_CHKSUM = " \
     file://COPYING;md5=7108e5acd7ce861dee282297d7c2f38c \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += " \
     grantlee \
     xapian-core \
     \
+    kauth-native \
     karchive \
     kbookmarks \
-    kconfig \
-    kcoreaddons \
+    kconfig-native \
+    kcoreaddons-native \
     kdbusaddons \
-    kdoctools \
+    kdoctools-native \
     ki18n \
     kinit \
     khtml \
     kservice \
     kwindowsystem \
+    sonnet-native \
     \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "2690a92fc8edf166c5643ccdeb9e5deb"
-SRC_URI[sha256sum] = "648842ec7dd417d76f0b1bf8649e993f10bbc0fc37e5eaf31dcea83d6ed052df"
+SRC_URI[md5sum] = "533d441f6c4bc76b581eb4ffc5f17d1d"
+SRC_URI[sha256sum] = "f6c41fbc299bd3a4e9723e72903a0c88f443045e3695bfa3ca2ea6a831cfb07c"
 
 SRC_URI += " \
     file://0001-fix-build-for-qtbase-without-session-management.patch \

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

@@ -9,29 +9,34 @@ LIC_FILES_CHKSUM = " \
     file://man/LICENSE;md5=d975629b732b61cb58f9595c6baa9379 \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += " \
+    libssh \
     qtsvg \
+    qtwebengine \
     \
     exiv2 \
     kactivities \
     karchive \
-    kconfig \
+    kauth-native \
+    kconfig-native \
     kconfigwidgets \
-    kcoreaddons \
+    kcoreaddons-native \
     kdbusaddons \
-    kdoctools \
+    kdoctools-native \
+    kdesignerplugin-native \
+    sonnet-native \
     kdnssd \
     kiconthemes \
     ki18n \
     kio \
     khtml \
-    kdelibs4support \
     kpty \
     solid \
     kbookmarks \
     kguiaddons \
+    shared-mime-info-native \
 "
 
 # REVISIT optionals
@@ -44,8 +49,13 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "7afd2a4e1f645ef45450c1087e42206e"
-SRC_URI[sha256sum] = "2cb558a7658894ee67f9318bbd98949b8eda425e5a30ca2af761e5d54d807093"
+SRC_URI[md5sum] = "7b21d27f91c3da8147b962d0c805130d"
+SRC_URI[sha256sum] = "7ad2df61267c274507b1ee8d592ba829ca7e60efda4a16ba301dabb26102d1c5"
+
+# gperf creates hard #line links
+do_install_prepend() {
+    no_staging_check=true
+}
 
 FILES_${PN} += " \
     ${datadir}/kio_bookmarks \

recipes-kde/apps/kmag/kmag.bb

@@ -0,0 +1,28 @@
+SUMMARY = "KMag is a screen magnifier"
+LICENSE = "GPLv2 & GFDL-1.2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=38adfe5a9f2953129da1774430b28adf \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += "\
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    kdoctools-native \
+    kdoctools \
+    ki18n \
+    kio \
+    kxmlgui \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "a3a04fab22e33bed0682c1fd124571f6"
+SRC_URI[sha256sum] = "7ca8b5872832a9d0985daedb8f587b5057d7f569dee490b2a3d97c568beb2d59"
+
+FILES_${PN} += " \
+    ${datadir}/kxmlgui5 \
+    ${datadir}/icons \
+"

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

@@ -0,0 +1,44 @@
+From 9757ed6c44884eb7890f31e015f5788de88891ac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 21 Dec 2017 00:22:43 +0100
+Subject: [PATCH] Fix build with QT_NO_SESSIONMANAGER set
+
+---
+ apps/KMixApp.cpp | 4 ++++
+ apps/kmix.cpp    | 2 ++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/apps/KMixApp.cpp b/apps/KMixApp.cpp
+index d00309b..b00f27a 100644
+--- a/apps/KMixApp.cpp
++++ b/apps/KMixApp.cpp
+@@ -87,7 +87,11 @@ bool KMixApp::restoreSessionIfApplicable(bool hasArgKeepvisibility, bool reset)
+ 	 */
+ 	creationLock.lock();
+ 
++#ifndef QT_NO_SESSIONMANAGER
+ 	bool restore = qApp->isSessionRestored(); // && KMainWindow::canBeRestored(0);
++#else
++	bool restore = false;
++#endif
+ 	qCDebug(KMIX_LOG) << "Starting KMix using keepvisibility=" << hasArgKeepvisibility << ", failsafe=" << reset << ", sessionRestore=" << restore;
+ 	int createCount = 0;
+ 	if (restore)
+diff --git a/apps/kmix.cpp b/apps/kmix.cpp
+index b97852c..cd74d03 100644
+--- a/apps/kmix.cpp
++++ b/apps/kmix.cpp
+@@ -99,8 +99,10 @@ KMixWindow::KMixWindow(bool invisible, bool reset) :
+ 		recreateGUI(false, QString(), true, reset);
+ 	}
+ 
++#ifndef QT_NO_SESSIONMANAGER
+ 	if (!qApp->isSessionRestored() ) // done by the session manager otherwise
+ 		setInitialSize();
++#endif
+ 
+ 	fixConfigAfterRead();
+ 	theKMixDeviceManager->initHotplug();
+-- 
+2.9.5
+

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

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

recipes-kde/apps/kmix/kmix.bb

@@ -6,15 +6,22 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += " \
     alsa-lib \
     libcanberra \
     \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
     kconfigwidgets \
+    kpackage-native \
+    kdesignerplugin-native \
+    sonnet-native \
     kdbusaddons \
     kdelibs4support \
+    kdelibs4support-native \
     kglobalaccel \
     ki18n \
     kiconthemes \
@@ -26,10 +33,10 @@ PACKAGECONFIG = "pulseaudio"
 PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "0d887662c99c262b90831942bc0cc2be"
-SRC_URI[sha256sum] = "0f450623f1fc532cacf7b3fa5d1f00adb77e1be41bf08f472a276795f6398ca9"
+SRC_URI[md5sum] = "57de2ce3a71057563465c404e3b000ef"
+SRC_URI[sha256sum] = "b7260ae4a24571fec63aae2417c444b5a7e102e45dc1c834e60f0691718ddc89"
 
-SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
+SRC_URI += "file://0001-Fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 EXTRA_OECMAKE += "-DKMIX_KF5_BUILD=1"
 

recipes-kde/apps/kolourpaint/kolourpaint.bb

@@ -9,9 +9,14 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps gtk-icon-cache
 
 DEPENDS += "\
+    kauth-native \
+    kconfig-native \
+    kdesignerplugin-native \
+    sonnet-native \
     kdelibs4support \
+    kdelibs4support-native \
     kconfigwidgets \
-    kcoreaddons \
+    kcoreaddons-native \
     kdoctools \
     ki18n \
     kiconthemes \
@@ -21,11 +26,11 @@ DEPENDS += "\
     kwidgetsaddons \
     kxmlgui \
     libkexiv2 \
-" 
+"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "998e1a62f922cdf96ac848afaa8f148e"
-SRC_URI[sha256sum] = "6162b62146d84377f3b24b70288b41798e8177e931f67836e9a15adcc620cf19"
+SRC_URI[md5sum] = "09eea0db733a7fc1d13da924e46673bc"
+SRC_URI[sha256sum] = "1c0df432c88140c26d3e379a79b99d4c4c71dc75f492d9c6e36bba1ea71f6d97"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \

recipes-kde/apps/konsole/konsole.bb

@@ -7,20 +7,23 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.Unicode;md5=ca09fbc4ba99ecc01ce41d513908dcd3 \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += " \
+    kauth-native \
     kbookmarks \
     kcompletion \
     kconfig \
+    kconfig-native \
     kconfigwidgets \
     kcoreaddons \
+    kcoreaddons-native \
     kdoctools \
+    kdoctools-native \
     kguiaddons \
     ki18n \
     kiconthemes \
     kinit \
-    kdelibs4support \
     kio \
     knotifications \
     knotifyconfig \
@@ -31,13 +34,14 @@ DEPENDS += " \
     kwidgetsaddons \
     kwindowsystem \
     kxmlgui \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
+    sonnet-native \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)} \
 "
 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "ebe57e74bbcf6311eb449af12032583a"
-SRC_URI[sha256sum] = "d5a242c8e23c4002736402ef5ecbb840b60e0e149fc92b480223dfeb7647335a"
+SRC_URI[md5sum] = "6aea3f99260440c4d1321b25a7478572"
+SRC_URI[sha256sum] = "fa0997c14a96252177e4808636ec43509eadb1482d54bb8a86b85810283f6cbc"
 
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""

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

@@ -0,0 +1,36 @@
+From 14dad713bde33b66476e80dc8a13edd010925800 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 27 Sep 2017 20:39:15 +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 5cff693..f72afc9 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -73,9 +73,12 @@ int main(int argc, char **argv)
+     aboutData.processCommandLine(&parser);
+ 
+     KDBusService service;
++#ifndef QT_NO_SESSIONMANAGER
+     if (application.isSessionRestored()) {
+         RESTORE(KReversiMainWindow)
+-    } else {
++    } else
++#endif
++    {
+         KReversiMainWindow *mainWin = new KReversiMainWindow(0, parser.isSet(QStringLiteral("demo")));
+         mainWin->show();
+     }
+-- 
+2.9.5
+

recipes-kde/apps/kreversi/kreversi.bb

@@ -0,0 +1,40 @@
+SUMMARY = "KReversi is is a simple strategy game played against the computer"
+DESCRIPTION = "KReversi is is a simple one player strategy game played against the computer"
+LICENSE = "GPLv2 & GFDL-1.2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+"
+
+inherit kde-apps gettext
+
+DEPENDS += "\
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    kpackage-native \
+    kdoctools-native \
+    kconfig \
+    kconfigwidgets \
+    kcoreaddons \
+    kcrash \
+    kdbusaddons \
+    kdeclarative \
+    ki18n \
+    kiconthemes \
+    kio \
+    kxmlgui \
+    kwidgetsaddons \
+    kdoctools \
+    libkdegames \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "5ffbbdfd08f4ff1c6886fcca88962267"
+SRC_URI[sha256sum] = "cf01b8cd7c9f1714754d28e99462138dfda380322fb4da0cf0aa88771b40b0c2"
+SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
+
+FILES_${PN} += " \
+    ${datadir}/k*5 \
+    ${datadir}/icons \
+"

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

@@ -0,0 +1,319 @@
+From 86cad3e0edba28de83725bf7f55ceb68ff57d765 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 15 Mar 2018 14:47:57 +0100
+Subject: [PATCH] fix build with GLES2 only
+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@gmail.com>
+---
+ libs/ui/canvas/kis_mirror_axis.cpp           |  5 ++-
+ libs/ui/opengl/kis_opengl_canvas2.cpp        | 18 ++++++++++
+ libs/ui/opengl/kis_opengl_image_textures.cpp | 54 ++++++++++++++++++++++++----
+ libs/ui/opengl/kis_texture_tile.cpp          | 10 ++++++
+ 4 files changed, 79 insertions(+), 8 deletions(-)
+
+diff --git a/libs/ui/canvas/kis_mirror_axis.cpp b/libs/ui/canvas/kis_mirror_axis.cpp
+index 47d115c..a873040 100644
+--- a/libs/ui/canvas/kis_mirror_axis.cpp
++++ b/libs/ui/canvas/kis_mirror_axis.cpp
+@@ -157,6 +157,7 @@ void KisMirrorAxis::drawDecoration(QPainter& gc, const QRectF& updateArea, const
+     gc.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+ 
+     QOpenGLContext *ctx = QOpenGLContext::currentContext();
++#ifdef GL_MULTISAMPLE
+     bool hasMultisample = ((gc.paintEngine()->type() == QPaintEngine::OpenGL2) &&
+                            (ctx->hasExtension("GL_ARB_multisample")));
+ 
+@@ -167,7 +168,7 @@ void KisMirrorAxis::drawDecoration(QPainter& gc, const QRectF& updateArea, const
+         ctx->functions()->glEnable(GL_MULTISAMPLE);
+         gc.endNativePainting();
+     }
+-
++#endif
+     float halfHandleSize = d->handleSize / 2;
+ 
+     d->recomputeVisibleAxes(gc.viewport());
+@@ -225,11 +226,13 @@ void KisMirrorAxis::drawDecoration(QPainter& gc, const QRectF& updateArea, const
+         }
+     }
+ 
++#ifdef GL_MULTISAMPLE
+     if (hasMultisample) {
+         gc.beginNativePainting();
+         ctx->functions()->glDisable(GL_MULTISAMPLE);
+         gc.endNativePainting();
+     }
++#endif
+ 
+ }
+ 
+diff --git a/libs/ui/opengl/kis_opengl_canvas2.cpp b/libs/ui/opengl/kis_opengl_canvas2.cpp
+index ab471b0..c7f09b3 100644
+--- a/libs/ui/opengl/kis_opengl_canvas2.cpp
++++ b/libs/ui/opengl/kis_opengl_canvas2.cpp
+@@ -45,8 +45,10 @@
+ #include <QMessageBox>
+ 
+ #ifndef Q_OS_OSX
++#ifndef QT_OPENGL_ES_2
+ #include <QOpenGLFunctions_2_1>
+ #endif
++#endif
+ 
+ #define NEAR_VAL -1000.0
+ #define FAR_VAL 1000.0
+@@ -103,7 +105,9 @@ public:
+     QVector2D texCoords[6];
+ 
+ #ifndef Q_OS_OSX
++#ifndef QT_OPENGL_ES_2
+     QOpenGLFunctions_2_1 *glFn201;
++#endif
+ #endif
+ 
+     int xToColWithWrapCompensation(int x, const QRect &imageRect) {
+@@ -231,6 +235,7 @@ void KisOpenGLCanvas2::initializeGL()
+     KisOpenGL::initializeContext(context());
+     initializeOpenGLFunctions();
+ #ifndef Q_OS_OSX
++#ifndef QT_OPENGL_ES_2
+     if (!KisOpenGL::hasOpenGLES()) {
+         d->glFn201 = context()->versionFunctions<QOpenGLFunctions_2_1>();
+         if (!d->glFn201) {
+@@ -239,6 +244,7 @@ void KisOpenGLCanvas2::initializeGL()
+     } else {
+         d->glFn201 = nullptr;
+     }
++#endif
+ #endif
+ 
+     KisConfig cfg;
+@@ -396,18 +402,28 @@ void KisOpenGLCanvas2::paintToolOutline(const QPainterPath &path)
+     d->cursorShader->setUniformValue(d->cursorShader->location(Uniform::ModelViewProjection), modelMatrix);
+ 
+     if (!KisOpenGL::hasOpenGLES()) {
++#ifdef GL_LINE_SMOOTH_HINT
+         glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
++#endif
+ 
++#ifdef GL_COLOR_LOGIC_OP
+         glEnable(GL_COLOR_LOGIC_OP);
++#endif
+ #ifndef Q_OS_OSX
++#ifndef QT_OPENGL_ES_2
+         if (d->glFn201) {
+             d->glFn201->glLogicOp(GL_XOR);
+         }
++#endif
+ #else
++#ifdef GL_XOR
+         glLogicOp(GL_XOR);
++#endif
+ #endif
+     } else {
++#ifdef GL_BLEND
+         glEnable(GL_BLEND);
++#endif
+         glBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ZERO, GL_ONE, GL_ONE);
+     }
+ 
+@@ -446,7 +462,9 @@ void KisOpenGLCanvas2::paintToolOutline(const QPainterPath &path)
+     }
+ 
+     if (!KisOpenGL::hasOpenGLES()) {
++#ifdef GL_COLOR_LOGIC_OP
+         glDisable(GL_COLOR_LOGIC_OP);
++#endif
+     } else {
+         glDisable(GL_BLEND);
+     }
+diff --git a/libs/ui/opengl/kis_opengl_image_textures.cpp b/libs/ui/opengl/kis_opengl_image_textures.cpp
+index 1210c7b..8aa84b7 100644
+--- a/libs/ui/opengl/kis_opengl_image_textures.cpp
++++ b/libs/ui/opengl/kis_opengl_image_textures.cpp
+@@ -408,7 +408,11 @@ void KisOpenGLImageTextures::generateCheckerTexture(const QImage &checkImage)
+         if (checkImage.width() != BACKGROUND_TEXTURE_SIZE || checkImage.height() != BACKGROUND_TEXTURE_SIZE) {
+             img = checkImage.scaled(BACKGROUND_TEXTURE_SIZE, BACKGROUND_TEXTURE_SIZE);
+         }
++#ifdef GL_RGBA8
+         GLint format = GL_BGRA, internalFormat = GL_RGBA8;
++#else
++        GLint format = GL_BGRA, internalFormat = GL_BGRA;
++#endif
+         if (KisOpenGL::hasOpenGLES()) {
+             if (ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_format_BGRA8888"))) {
+                 format = GL_BGRA_EXT;
+@@ -541,18 +545,25 @@ void KisOpenGLImageTextures::updateTextureFormat()
+     QOpenGLContext *ctx = QOpenGLContext::currentContext();
+     if (!(m_image && ctx)) return;
+ 
++#ifdef GL_RGBA8
+     if (!KisOpenGL::hasOpenGLES()) {
+         m_texturesInfo.internalFormat = GL_RGBA8;
+         m_texturesInfo.type = GL_UNSIGNED_BYTE;
+         m_texturesInfo.format = GL_BGRA;
+-    } else {
++    } else
++#endif
++    {
+         m_texturesInfo.internalFormat = GL_BGRA8_EXT;
+         m_texturesInfo.type = GL_UNSIGNED_BYTE;
+         m_texturesInfo.format = GL_BGRA_EXT;
+         if(!ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_format_BGRA8888"))) {
+             // The red and blue channels are swapped, but it will be re-swapped
+             // by texture swizzle mask set in KisTextureTile::setTextureParameters
++#ifdef GL_RGBA8
+             m_texturesInfo.internalFormat = GL_RGBA8;
++#else
++            m_texturesInfo.internalFormat = GL_RGBA;
++#endif
+             m_texturesInfo.type = GL_UNSIGNED_BYTE;
+             m_texturesInfo.format = GL_RGBA;
+         }
+@@ -569,32 +580,48 @@ void KisOpenGLImageTextures::updateTextureFormat()
+     if (colorModelId == RGBAColorModelID) {
+         if (colorDepthId == Float16BitsColorDepthID) {
+ 
++#ifdef GL_RGBA16F
+             if (KisOpenGL::hasOpenGLES()) {
+                 m_texturesInfo.internalFormat = GL_RGBA16F;
+                 dbgUI << "Using half (GLES)";
+-            } else if (ctx->hasExtension("GL_ARB_texture_float")) {
++            } else
++#endif
++#ifdef GL_RGBA16F_ARB
++            if (ctx->hasExtension("GL_ARB_texture_float")) {
+                 m_texturesInfo.internalFormat = GL_RGBA16F_ARB;
+                 dbgUI << "Using ARB half";
+             }
+-            else if (ctx->hasExtension("GL_ATI_texture_float")) {
++            else
++#endif
++#ifdef GL_RGBA_FLOAT16_ATI
++            if (ctx->hasExtension("GL_ATI_texture_float")) {
+                 m_texturesInfo.internalFormat = GL_RGBA_FLOAT16_ATI;
+                 dbgUI << "Using ATI half";
+             }
++#endif
++            // make ifdefs 'else' happy
++            if(false) {}
+ 
+             bool haveBuiltInOpenExr = false;
+ #ifdef HAVE_OPENEXR
+             haveBuiltInOpenExr = true;
+ #endif
+ 
++#ifdef GL_HALF_FLOAT
+             if (haveBuiltInOpenExr && KisOpenGL::hasOpenGLES()) {
+                 m_texturesInfo.type = GL_HALF_FLOAT;
+                 destinationColorDepthId = Float16BitsColorDepthID;
+                 dbgUI << "Pixel type half (GLES)";
+-            } else if (haveBuiltInOpenExr && ctx->hasExtension("GL_ARB_half_float_pixel")) {
++            } else
++#endif
++#ifdef GL_HALF_FLOAT_ARB
++            if (haveBuiltInOpenExr && ctx->hasExtension("GL_ARB_half_float_pixel")) {
+                 m_texturesInfo.type = GL_HALF_FLOAT_ARB;
+                 destinationColorDepthId = Float16BitsColorDepthID;
+                 dbgUI << "Pixel type half";
+-            } else {
++            } else 
++#endif
++            {
+                 m_texturesInfo.type = GL_FLOAT;
+                 destinationColorDepthId = Float32BitsColorDepthID;
+                 dbgUI << "Pixel type float";
+@@ -602,22 +629,32 @@ void KisOpenGLImageTextures::updateTextureFormat()
+             m_texturesInfo.format = GL_RGBA;
+         }
+         else if (colorDepthId == Float32BitsColorDepthID) {
++            m_texturesInfo.internalFormat = GL_RGBA;
++#ifdef GL_RGBA32F
+             if (KisOpenGL::hasOpenGLES()) {
+                 m_texturesInfo.internalFormat = GL_RGBA32F;
+                 dbgUI << "Using float (GLES)";
+-            } else if (ctx->hasExtension("GL_ARB_texture_float")) {
++            } else
++#endif
++#ifdef GL_RGBA32F_ARB
++            if (ctx->hasExtension("GL_ARB_texture_float")) {
+                 m_texturesInfo.internalFormat = GL_RGBA32F_ARB;
+                 dbgUI << "Using ARB float";
+-            } else if (ctx->hasExtension("GL_ATI_texture_float")) {
++            } else
++#endif
++#ifdef GL_RGBA_FLOAT32_ATI
++            if (ctx->hasExtension("GL_ATI_texture_float")) {
+                 m_texturesInfo.internalFormat = GL_RGBA_FLOAT32_ATI;
+                 dbgUI << "Using ATI float";
+             }
++#endif
+ 
+             m_texturesInfo.type = GL_FLOAT;
+             m_texturesInfo.format = GL_RGBA;
+             destinationColorDepthId = Float32BitsColorDepthID;
+         }
+         else if (colorDepthId == Integer16BitsColorDepthID) {
++#ifdef GL_RGBA16
+             if (!KisOpenGL::hasOpenGLES()) {
+                 m_texturesInfo.internalFormat = GL_RGBA16;
+                 m_texturesInfo.type = GL_UNSIGNED_SHORT;
+@@ -625,9 +662,11 @@ void KisOpenGLImageTextures::updateTextureFormat()
+                 destinationColorDepthId = Integer16BitsColorDepthID;
+                 dbgUI << "Using 16 bits rgba";
+             }
++#endif
+             // TODO: for ANGLE, see if we can convert to 16f to support 10-bit display
+         }
+     }
++#ifdef GL_RGBA16
+     else {
+         // We will convert the colorspace to 16 bits rgba, instead of 8 bits
+         if (colorDepthId == Integer16BitsColorDepthID && !KisOpenGL::hasOpenGLES()) {
+@@ -639,6 +678,7 @@ void KisOpenGLImageTextures::updateTextureFormat()
+         }
+         // TODO: for ANGLE, see if we can convert to 16f to support 10-bit display
+     }
++#endif
+ 
+     if (!m_internalColorManagementActive &&
+             colorModelId != destinationColorModelId) {
+diff --git a/libs/ui/opengl/kis_texture_tile.cpp b/libs/ui/opengl/kis_texture_tile.cpp
+index d8fb03d..90e9996 100644
+--- a/libs/ui/opengl/kis_texture_tile.cpp
++++ b/libs/ui/opengl/kis_texture_tile.cpp
+@@ -34,17 +34,27 @@ void KisTextureTile::setTextureParameters()
+ 
+     f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+     f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
++#ifdef GL_TEXTURE_MIN_LOD
+     f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_LOD, 0);
++#endif
++#ifdef GL_TEXTURE_MAX_LOD
+     f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, m_numMipmapLevels);
++#endif
++#ifdef GL_TEXTURE_BASE_LEVEL
+     f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
++#endif
++#ifdef GL_TEXTURE_MAX_LEVEL
+     f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, m_numMipmapLevels);
++#endif
+ 
++#ifdef GL_RGBA8
+     if (m_texturesInfo->internalFormat == GL_RGBA8 && m_texturesInfo->format == GL_RGBA) {
+         // If image format is RGBA8, swap the red and blue channels for the proper colour
+         // This is for OpenGL ES support and only used if lacking GL_EXT_texture_format_BGRA8888
+         f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
+         f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_RED);
+     }
++#endif
+ 
+     f->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+ }
+-- 
+2.14.3
+

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

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

recipes-kde/apps/krita/krita_3.3.3.bb

@@ -1,14 +1,14 @@
 SUMMARY = "Krita is a free digital painting application"
-LICENSE = "GPLv2 & BSD & LGPL-2.0"
+LICENSE = "GPLv3 & BSD"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=8608b1f74c58ebcb11718f46e8619749 \
+    file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
     file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
-    file://COPYING.LIB;md5=cc4eecf2379e7a2a5f3d0441d680f82a \
 "
 
 inherit kde-apps gtk-icon-cache
 
 DEPENDS += " \
+    qtmultimedia \
     curl \
     poppler \
     boost \
@@ -17,11 +17,12 @@ DEPENDS += " \
     exiv2 \
     fftw \
     \
+    kauth-native \
     karchive \
-    kconfig \
+    kconfig-native \
     kwidgetsaddons \
     kcompletion \
-    kcoreaddons \
+    kcoreaddons-native \
     kguiaddons \
     ki18n \
     kitemmodels \
@@ -31,18 +32,21 @@ DEPENDS += " \
     kcrash \
 "
 
-PV = "3.1.1"
 SRC_URI = " \
-    ${KDE_MIRROR}/stable/krita/${PV}/${BPN}-${PV}.tar.gz \
-    file://0001-fix-build-with-GLES2.patch \
+    ${KDE_MIRROR}/stable/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
+    file://0001-fix-build-with-GLES2-only.patch \
 "
-SRC_URI[md5sum] = "322831adc0bc5c7d7ed298f152d57fe7"
-SRC_URI[sha256sum] = "62ef2c4b9b19563c1e2e6dc0643dd0880e04469dd5798373401d8dd666720e8f"
+SRC_URI[md5sum] = "eb3224bbf09b7b88364c6308cd5a5d18"
+SRC_URI[sha256sum] = "bec04e3392e9b311477c5c6a50e2201b43a3afda91d9b24a0fc8e3399585865d"
+
+OECMAKE_GENERATOR="Unix Makefiles"
 
 # krita has lots of include_directories(SYSTEM ${FOO_DIR})
 # have no better way to make gcc6 happy
 do_configure_append() {
-     sed -i 's:-isystem:-I:g' `find ${B} -name *.make`
+     for makefile in `find ${B} -name *.make` ; do
+         sed -i 's:-isystem:-I:g' $makefile
+     done
 }
 
 # HACK - but overidable by BSP

recipes-kde/apps/ksystemlog/ksystemlog.bb

@@ -7,20 +7,22 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps gtk-icon-cache
 
 DEPENDS += " \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    kdoctools-native \
+    sonnet-native \
     kxmlgui \
-    kcoreaddons \
     kwidgetsaddons \
     kitemviews \
     kio \
-    kconfig \
     karchive \
-    kdoctools \
     kcompletion \
     ktextwidgets \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "ff692ae5a71862ffc40eba8296470083"
-SRC_URI[sha256sum] = "06c1ef9378ac0477247627a2d0f1dfd659cbb5f76da790e17199d9ba3fc35c56"
+SRC_URI[md5sum] = "540d4f44309d8fdbadec063a52d9aaec"
+SRC_URI[sha256sum] = "991203b77c322f7a56f73b2ae381c3b57ebc9c913b5dc0a98898f681796cd252"
 
 FILES_${PN} += "${datadir}/kxmlgui5"

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

@@ -6,31 +6,37 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+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
+index 2672c7c..c505d23 100644
 --- a/src/manager/kwalletmanager.cpp
 +++ b/src/manager/kwalletmanager.cpp
-@@ -101,12 +101,14 @@ void KWalletManager::configUI() {
+@@ -100,12 +100,14 @@ void KWalletManager::configUI() {
                  break;
              }
          }
 +#ifndef QT_NO_SESSIONMANAGER
          if (!isOpen && qApp->isSessionRestored()) {
              delete _tray;
-             _tray = 0;
+             _tray = nullptr;
              QTimer::singleShot(0, qApp, SLOT(quit()));
              return;
          }
 +#endif
      } else {
-         _tray = 0;
+         _tray = nullptr;
      }
 -- 
 2.1.0

recipes-kde/apps/kwalletmanager/kwalletmanager.bb

@@ -8,23 +8,24 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps gtk-icon-cache
 
 DEPENDS += " \
-    kcoreaddons \
-    kdoctools \
-    kauth \
+    kcoreaddons-native \
+    kdoctools-native \
+    kauth-native \
+    kconfig-native \
+    sonnet-native \
     kwallet \
     kservice \
     kcmutils \
-    kdelibs4support \
     ki18n \
     kxmlgui \
-    kconfig \
+    kconfig-native \
     kconfigwidgets \
     kdbusaddons \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "26f200d763f3f2545631938edff10089"
-SRC_URI[sha256sum] = "c126171e517a070be54a24c6f0a38c190fb630f75c174567a231f1b4337e729a"
+SRC_URI[md5sum] = "44da3a1ce114df919edb8b94dfa8c8bd"
+SRC_URI[sha256sum] = "a129051f2f93baaecbde8c302ff528a1d4218da8ca27caadd6befa12baa69ad3"
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
 
 FILES_${PN} += " \

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

@@ -10,17 +10,16 @@ Upstream-Status: Pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- CMakeLists.txt               |  4 ++--
- cmake/FindKwaveVersion.cmake |  2 +-
- cmake/KwaveL10N.cmake        | 12 ++++++------
- doc/CMakeLists.txt           |  2 +-
- 4 files changed, 10 insertions(+), 10 deletions(-)
+ CMakeLists.txt        |  4 ++--
+ cmake/KwaveL10N.cmake | 12 ++++++------
+ doc/CMakeLists.txt    |  2 +-
+ 3 files changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4b7a784..af4748d 100644
+index b509ab1..ffb7baa 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -79,7 +79,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+@@ -91,7 +91,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
  
  INCLUDE(FindRequiredProgram)
  
@@ -29,7 +28,7 @@ index 4b7a784..af4748d 100644
  INCLUDE(FindKwaveVersion)
  
  #############################################################################
-@@ -393,7 +393,7 @@ ADD_CUSTOM_TARGET(distfiles
+@@ -406,7 +406,7 @@ ADD_CUSTOM_TARGET(distfiles
  #############################################################################
  ### uninstall support                                                     ###
  
@@ -38,25 +37,12 @@ index 4b7a784..af4748d 100644
  
  CONFIGURE_FILE(
      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/uninstall.cmake.in
-diff --git a/cmake/FindKwaveVersion.cmake b/cmake/FindKwaveVersion.cmake
-index 75ce140..2b1cfeb 100644
---- a/cmake/FindKwaveVersion.cmake
-+++ b/cmake/FindKwaveVersion.cmake
-@@ -49,7 +49,7 @@ MESSAGE(STATUS "Building Kwave version ${KWAVE_VERSION_FULL}")
- #############################################################################
- ### ISO formated date                                                     ###
- 
--FIND_REQUIRED_PROGRAM(DATE_EXECUTABLE date)
-+SET(DATE_EXECUTABLE date)
- 
- EXECUTE_PROCESS(
-     COMMAND
 diff --git a/cmake/KwaveL10N.cmake b/cmake/KwaveL10N.cmake
-index 4112628..00d4d78 100644
+index 64ef8e2..cb615f2 100644
 --- a/cmake/KwaveL10N.cmake
 +++ b/cmake/KwaveL10N.cmake
-@@ -15,12 +15,12 @@
- ##                                                                          #
+@@ -22,12 +22,12 @@
+ #                                                                           #
  #############################################################################
  
 -FIND_REQUIRED_PROGRAM(FIND_EXECUTABLE find)
@@ -75,10 +61,10 @@ index 4112628..00d4d78 100644
  SET(PO_SRC_DIR "${CMAKE_SOURCE_DIR}/po")
  SET(PO_BIN_DIR "${CMAKE_BINARY_DIR}/po")
 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index a7e4295..fba93d6 100644
+index 37a3626..6d4b6cc 100644
 --- a/doc/CMakeLists.txt
 +++ b/doc/CMakeLists.txt
-@@ -21,7 +21,7 @@ SET(UPDATE_PLUGIN_XREF     ${CMAKE_SOURCE_DIR}/bin/update-plugin-xref.pl)
+@@ -28,7 +28,7 @@ SET(UPDATE_PLUGIN_XREF     ${CMAKE_SOURCE_DIR}/bin/update-plugin-xref.pl)
  SET(_index_docbook         ${CMAKE_CURRENT_SOURCE_DIR}/en/index.docbook)
  SET(_index_docbook_updated ${CMAKE_CURRENT_BINARY_DIR}/index-updated.docbook)
  
@@ -88,5 +74,5 @@ index a7e4295..fba93d6 100644
  #############################################################################
  ### how to convert from svg to png                                        ###
 -- 
-2.7.4
+2.9.3
 

recipes-kde/apps/kwave/kwave.bb

@@ -1,7 +1,7 @@
 SUMMARY = "Kwave is a sound editor for KDE"
-LICENSE = "GPLv2 & LGPLv2 & CC-BY-SA-3.0 & GFDL-1.2 & BSD"
+LICENSE = "GPLv2 & LGPLv2 & CC-BY-SA-3.0 & CC-BY-SA-4.0 & GFDL-1.2 & BSD"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES;md5=6c77bb99378a665445fdbd62703e919c \
+    file://LICENSES;md5=90ff5adc50ce32f0425aaa40f1e606bf \
     file://GNU-LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 "
 
@@ -14,12 +14,14 @@ DEPENDS += "\
     libsamplerate0 \
     \
     kcompletion \
-    kconfig \
+    kconfig-native \
+    kauth-native \
     kconfigwidgets \
-    kcoreaddons \
+    kcoreaddons-native \
     kcrash \
     kdbusaddons \
-    kdoctools \
+    kdoctools-native \
+    sonnet-native \
     ki18n \
     kiconthemes \
     kio \
@@ -31,8 +33,8 @@ DEPENDS += "\
 
 PV = "${KDE_APP_VERSION}"
 SRC_URI += "file://0001-FIND_REQUIRED_PROGRAM-is-broken-use-the-tools-direct.patch"
-SRC_URI[md5sum] = "b6277f92208fd86c53af5b68532e3e86"
-SRC_URI[sha256sum] = "e28aa2b91219b2a3df0b70da265bf8db48a4abb9980aba01096ed493e54b21eb"
+SRC_URI[md5sum] = "f96b60911d674dedb44771fbaef8560d"
+SRC_URI[sha256sum] = "cf665ba77c9e8372e09d34ec19eb69b4d3be80e1b1f6fb96fcc1b1c0649310f3"
 
 # Aagh: To select a soundcard we need to select another type - so keep oss in as dummy
 #EXTRA_OECMAKE += "-DWITH_OSS=OFF"

recipes-kde/apps/libkdcraw/libkdcraw.bb

@@ -0,0 +1,17 @@
+SUMMARY = "Libkdcraw is a C++ interface around LibRaw library"
+LICENSE = "GPLv2 & BSD & LGPLv2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
+    file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \
+    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+"
+
+inherit kde-apps
+
+DEPENDS += "\
+    libraw \
+" 
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[md5sum] = "60112edfec27a3f31dbed12067c1052b"
+SRC_URI[sha256sum] = "cc02d7bfef7fed0f35ea5e1467e6d67939ca0bf2ca5551169cc4e7b11b2de286"

recipes-kde/apps/libkdegames/files/0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch

@@ -1,85 +0,0 @@
-From fffc82666c0cc3002b140b3598defc4923ce7bbf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 26 Apr 2015 17:28:12 +0200
-Subject: [PATCH] CMakeLists.txt: add an option BUILD_KGDECLARATIVE disabled by
- default
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-on machines not supporting x11-egl (Raspberrypi / TI armv7) kdeclarative fails
-to build. By this option we get the chance to build the library for these
-machines and still suppprting many games.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- CMakeLists.txt | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b5d8ffe..538d7c8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,13 +8,18 @@ set (QT_MIN_VERSION "5.3.0")
- find_package(ECM 1.3.0 REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
- 
-+option(BUILD_KGDECLARATIVE "Build kgdeclarativeview" OFF)
- 
- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test)
- find_package(KF5 REQUIRED COMPONENTS CoreAddons Config WidgetsAddons Codecs Archive
--    DBusAddons DNSSD Declarative
-+    DBusAddons DNSSD
-     I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion JobWidgets TextWidgets GlobalAccel XmlGui Crash
-     Bookmarks KIO NewStuff)
- 
-+if(BUILD_KGDECLARATIVE)
-+    find_package(KF5 REQUIRED COMPONENTS Declarative)
-+endif()
-+
- include(FeatureSummary)
- include(GenerateExportHeader)
- include(ECMPackageConfigHelpers)
-@@ -98,7 +103,6 @@ set(kdegames_LIB_SRCS
-     kgamerenderedobjectitem.cpp
-     kgamerendererclient.cpp
-     kgamerenderer.cpp
--    kgdeclarativeview.cpp
-     kgimageprovider.cpp
-     kgdifficulty.cpp
-     kgtheme.cpp
-@@ -107,6 +111,10 @@ set(kdegames_LIB_SRCS
-     kstandardgameaction.cpp
- )
- 
-+if(BUILD_KGDECLARATIVE)
-+	set(kdegames_LIB_SRCS kgdeclarativeview.cpp)
-+endif()
-+
- add_library(KF5KDEGames SHARED ${kdegames_LIB_SRCS})
- 
- generate_export_header(KF5KDEGames BASE_NAME libkdegames EXPORT_MACRO_NAME KDEGAMES_EXPORT DEPRECATED_MACRO_NAME KDE_DEPRECATED)
-@@ -117,7 +125,6 @@ target_link_libraries(KF5KDEGames
-                       Qt5::Xml
-                       Qt5::Svg
-                       Qt5::Quick
--                      KF5::Declarative
-                       KF5::KIOWidgets
-                       KF5::NewStuff
-                       KF5::IconThemes
-@@ -132,6 +139,10 @@ target_link_libraries(KF5KDEGames
-                       KF5::ConfigWidgets
- )
- 
-+if(BUILD_KGDECLARATIVE)
-+    target_link_libraries(KF5KDEGames PRIVATE KF5::Declarative)
-+endif()
-+
- target_include_directories(KF5KDEGames INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KF5KDEGames;${KF5_INCLUDE_INSTALL_DIR}/KF5KDEGames/KDE;${KF5_INCLUDE_INSTALL_DIR}>")
- 
- set(KDEGAMES_VERSION 7.0.0)
--- 
-2.5.0
-

recipes-kde/apps/libkdegames/libkdegames.bb

@@ -5,11 +5,13 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps
+inherit kde-apps gettext
 
 DEPENDS += "\
-    kcoreaddons \
-    kconfig \
+    kcoreaddons-native \
+    kpackage-native \
+    kauth-native \
+    kconfig-native \
     kwidgetsaddons \
     kcodecs \
     karchive \
@@ -33,19 +35,17 @@ DEPENDS += "\
     kdelibs4support \
     kparts \
     solid \
+    sonnet-native \
     kxmlgui \
     kdoctools \
+    kdeclarative \
     \
     openal-soft \
-" 
+"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "820885a12f1b78f1087261556eb09b59"
-SRC_URI[sha256sum] = "51277bc284d27beec64103eff5b11cb9d672efd5c265f5f1a6bb9951290ba128"
-SRC_URI += "file://0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch"
-
-PACKAGECONFIG[kgdeclarative] = "-DBUILD_KGDECLARATIVE=Yes,-DBUILD_KGDECLARATIVE=No, kdeclarative"
-PACKAGECONFIG ??= ""
+SRC_URI[md5sum] = "e8fde2ad87216cbd29002786c0de29e9"
+SRC_URI[sha256sum] = "6d12bf8f389e07dc8cd8681e61757c817082ffb5e9e409e488a17da9dae501ce"
 
 FILES_${PN} += " \
     ${datadir}/carddecks \

recipes-kde/apps/libkexiv2/libkexiv2.bb

@@ -13,5 +13,5 @@ DEPENDS += "\
 " 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "e28e3fb8d04047a6810f70fa46cd5534"
-SRC_URI[sha256sum] = "0d0f583071e735afe4ce9fae8c8317bfa43e49a71468099758a11312264bdc56"
+SRC_URI[md5sum] = "1ec4ef8f065ac034669158b498682a64"
+SRC_URI[sha256sum] = "8f8ea9817ca16df2736925e6f0c4fd5b4c1dbe5eb8eb209c760a75625bc2f9f7"

recipes-kde/apps/lokalize/lokalize.bb

@@ -11,22 +11,23 @@ DEPENDS += "\
     qtscript \
     hunspell \
 	\
+    kauth-native \
     ki18n \
     kio \
     kxmlgui \
     knotifications \
-    kconfig \
-    kcoreaddons \
-    kdoctools \
+    kconfig-native \
+    kcoreaddons-native \
+    kdoctools-native \
     kross \
-    sonnet \
+    sonnet-native \
     kdbusaddons \
     kcrash \
-" 
+"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "31d6be64f5133aa2db94a4f6c984fcea"
-SRC_URI[sha256sum] = "fac8e0a7a31f07020bc4726eb7b0079537dfe8d44b04fb9a89d8991b90fec3b1"
+SRC_URI[md5sum] = "068d66195bde7baaf6f0bc178b274a0a"
+SRC_URI[sha256sum] = "e9ae73a9bba912018160d0556561c15dea8e8ef0872b76dd348414b27d3dae58"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \

recipes-kde/apps/marble/marble.bb

@@ -7,13 +7,14 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps cmake_lib
+inherit kde-apps cmake_lib gettext
 
 DEPENDS += " \
     qtsvg \
     qtwebkit \
     \
-    kconfig \
+    kconfig-native \
+    kauth-native \
     krunner \
     kservice \
     ki18n \
@@ -21,15 +22,17 @@ DEPENDS += " \
     knewstuff \
     kwallet \
     kparts \
-    kcoreaddons \
+    kcoreaddons-native \
     kparts \
     plasma-framework \
-    kdoctools \
+    kdoctools-native \
+    sonnet-native \
+    kpackage-native \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "f8c45f7e5cf2798709af7802a5d0dc1a"
-SRC_URI[sha256sum] = "1ac83cf09a515b5a0739a524225aeb5933c90620d06de72bb1a74f3de3c562c3"
+SRC_URI[md5sum] = "c878d04b3145caf2f4fec66b700ec481"
+SRC_URI[sha256sum] = "f1004b0a63767cfba91865623598c309ca7529a7e37ccf451d439f5edbb6f8dd"
 SRC_URI += "file://0001-align-path-of-designer-plugins.patch"
 
 EXTRA_OECMAKE += "-DMARBLE_PRI_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules"

recipes-kde/apps/minuet/minuet.bb

@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps gtk-icon-cache
 
 DEPENDS += "\
+    kcoreaddons-native \
+    kdoctools-native \
     qtquickcontrols2 \
     fluidsynth \
     drumstick \
@@ -19,8 +21,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "6176e552d8f9539468acd55fd1500501"
-SRC_URI[sha256sum] = "4be531d78eb1c2896110ecdc94e6fcfe0d3e6d54df48c9fbb78b93c18105541e"
+SRC_URI[md5sum] = "8ac3c50c3f1b885253fee172c81cc2ce"
+SRC_URI[sha256sum] = "0bf1f32fedb3345a7bf3fba715fc670edf442c53cc150a30f43311bde66519aa"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/okteta/okteta.bb

@@ -10,12 +10,16 @@ inherit kde-apps gtk-icon-cache
 
 DEPENDS += " \
     qca \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
     kbookmarks \
     kcodecs \
     kcompletion \
     kconfigwidgets \
     kdbusaddons \
-    kdoctools \
+    kdoctools-native \
+    sonnet-native \
     kiconthemes \
     ki18n \
     kcmutils \
@@ -25,11 +29,12 @@ DEPENDS += " \
     kservice \
     kwidgetsaddons \
     kxmlgui \
+    shared-mime-info-native \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "e122c901b5b3348d4b9aed7f9386231c"
-SRC_URI[sha256sum] = "6c77d0602a923dcaf32054b699851f24fbfa93bdb89928d66e219e9f217efe23"
+SRC_URI[md5sum] = "780530d53715ef8d579d7262b7eb823c"
+SRC_URI[sha256sum] = "64b2d5264ac3b2e8010cbcf58fe03c567d4e44684a4fcd6e135eb14007da9a0f"
 
 FILES_${PN} += " \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/okular/okular.bb

@@ -18,11 +18,13 @@ DEPENDS += " \
     karchive \
     kbookmarks \
     kcompletion \
-    kconfig \
+    kconfig-native \
     kconfigwidgets \
-    kcoreaddons \
+    kauth-native \
+    kcoreaddons-native \
     kdbusaddons \
-    kdoctools \
+    kdoctools-native \
+    sonnet-native \
     kiconthemes \
     kjs \
     kio \
@@ -34,8 +36,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "2bb667d3e89399780b444134f1dc2c9d"
-SRC_URI[sha256sum] = "83a3f81efc42b7b979318bb8cdba5294ef711d68e8fead049630b5e199728a8c"
+SRC_URI[md5sum] = "7b8d91f781d0e46da097d853d4a0ed8c"
+SRC_URI[sha256sum] = "0a12549c2d90c13b8fa0838707924596eb12981bffc3a5b81410785a4e9e061d"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \

recipes-kde/apps/oxygen-icons/oxygen-icons.bb

@@ -1,16 +0,0 @@
-SUMMARY = "KDE oxygen icons"
-LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=6e01bfa20e899e8ad569d5488923cbd2 \
-"
-
-inherit kde-apps allarch gtk-icon-cache
-
-PV = "15.04.3"
-SRC_URI = "${KDE_MIRROR}/Attic/applications/${PV}/src/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "4f24f975fb90d8daab833fc719ce39a3"
-SRC_URI[sha256sum] = "133b66d70b51641f841799674afd993a6af0d9d9b646021a0ed609beb2ffd71e"
-
-FILES_${PN} += " \
-    ${datadir}/icons/oxygen \
-"

recipes-kde/apps/spectacle/spectacle.bb

@@ -8,17 +8,19 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps gtk-icon-cache
 
 DEPENDS += " \
-    kcoreaddons \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    kdoctools-native \
+    kpackage-native \
     kwidgetsaddons \
     kdbusaddons \
     knotifications \
-    kconfig \
     kdeclarative \
     ki18n \
     kio \
     kxmlgui \
     kwindowsystem \
-    kdoctools \
 "
 
 # REVISIT optionals
@@ -28,8 +30,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[md5sum] = "da0bf367466a4dd4a7cdf5d420ddd12d"
-SRC_URI[sha256sum] = "57e03741f52803896beaa2f0e914941fa9d4cef1dfbf2baf8aa825c8beabb7de"
+SRC_URI[md5sum] = "563558fe7fea33fdea9f8ee29c9ff4ca"
+SRC_URI[sha256sum] = "d93346f99dbbd7d36b7b140bdf37e0bd2e24a29af817a28045483da1bd39e989"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \