Merge pull request #11 from Tarnyko/jethro

kactivites: fix build
Merge pull request #12 from Tarnyko/jethro2
2016-06-11 22:00:31 +02:00 · 2016-06-11 22:00:11 +02:00 · 2016-06-07 15:15:47 +00:00 · 2016-06-07 13:29:29 +00:00 · 2016-01-30 00:23:28 +01:00 · 2016-01-19 09:23:09 +01:00
628 changed files with 7042 additions and 10477 deletions
--- a/17
+++ b/17
@@ -0,0 +1,17 @@
+OE layer to desktop environments based on qt5
+
+This layer depends on:
+
+URI: git://git.openembedded.org/openembedded-core
+branch: master
+revision: HEAD
+
+URI: git://github.com/meta-qt5/meta-qt5.git
+branch: master
+revision: HEAD
+
+URI: git://git.openembedded.org/meta-openembedded
+branch: master
+revision: HEAD
+
+Layer maintainer: Andreas Müller <schnitzeltony@googlemail.com>
--- a/README.md
+++ b/README.md
@@ -1,30 +0,0 @@
-OE layer to desktop environments based on Qt5
---------------------------------------------
-
-
-Layer dependencies:
----------------------
-see [layer.conf](conf/layer.conf) for dependencies and [Layer-index](https://layers.openembedded.org/layerindex/branch/master/layers/) where to find layers
-
-
-Contributing
------------
-* Submit any patches against the `meta-qt5-extra` layer by using the GitHub pull-request feature.
-
-
-Policies
--------
-* **Please do not send private emails to maintainer - they will not be answered anymore**. For bug-reports/questions/suggestions.. use [issues](https://github.com/schnitzeltony/meta-qt5-extra/issues).
-* Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
-  * Use 4 spaces for indentation always (shell and python code)
-  * For splitting of long list values use four-space indentation on sucessive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
-  * Pull-requests with patches fixing issues for musl, clang or gold-linker are accepeted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.
-* Be aware that **this layer changes other layer's defaults by bbappends**. Maintainer disagrees with common 'configure to death practice' and won't waste time explaining dozens of knobs that are mandatory to get working/useful builds. See
-  [extends-meta-oe](extends-meta-oe) / [extends-meta-qt5](extends-meta-qt5) / [extends-oe-core](extends-oe-core).
-  Pull requests removing appends for sake of magic 'compliant' scripts  are not accepted.
-
-
-Maintainers
-----------
-
-Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
--- a/101
+++ b/101
@@ -0,0 +1,101 @@
+kde missing:
+* plasma-sdk
+
+..........
+
+issues:
+
+plasma-desktop:
+* crashing as non priviledged user
+* kwin crashing / window decorations not repainted / compositng disabled (only for OpenGL ES > 2.0??)
+
+hawaii:
+* unable to start session
+
+antimony:
+* not finding python modules
+
+..........
+
+misc:
+* 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:
+
--- a/classes/cmake-auto-align-paths.bbclass
+++ b/classes/cmake-auto-align-paths.bbclass
@@ -0,0 +1,19 @@
+# do_configure_append_class-cross does not work so hack
+do_configure_prepend_class-native() {
+    no_cmake_auto_align_paths=true
+}
+
+do_configure_prepend_class-nativesdk() {
+    no_cmake_auto_align_paths=true
+}
+
+do_configure_append() {
+    # remove absolute paths from exported cmake files
+    for f in `find ${B}/CMakeFiles/Export -name '*.cmake'` ; do
+        sed -i 's:${STAGING_INCDIR_NATIVE}:${includedir}:g' "$f"
+        sed -i 's:${STAGING_INCDIR}:${includedir}:g' "$f"
+        sed -i 's:${STAGING_LIBDIR_NATIVE}:${libdir}:g' "$f"
+        sed -i 's:${STAGING_LIBDIR}:${libdir}:g' "$f"
+    done
+}
+
--- a/classes/cmake-extra-sanity.bbclass
+++ b/classes/cmake-extra-sanity.bbclass
@@ -1,5 +1,3 @@
-inherit cmake_sysroot
-
 # do_install_append_class-cross does not work so hack
 do_install_prepend_class-native() {
    no_staging_check=true
@@ -24,19 +22,18 @@ do_install_append() {
        error=
        # check for genarated sources
        for f in `find ${B} -name '*.h' -o -name '*.cpp'` ; do
-            if grep -q 'recipe-sysroot' $f ; then
-                bbwarn "$f contains links to build sysroot!"
+            if grep -q '${STAGING_DIR}' $f ; then
+                bbwarn "$f contains links to build host sysroot!"
                error=true
            fi
        done

        # check installed cmake files
        for f in `find ${D} -name '*.cmake'` ; do
-            if grep -q 'recipe-sysroot' "$f" ; then
+            if grep -q '${STAGING_DIR}' "$f" ; then
                bbwarn "$f contains links to build host sysroot!"
                error=true
            fi
-
        done

        if [ x != x$error ] ; then
@@ -44,32 +41,3 @@ do_install_append() {
        fi
    fi
 }
-
-do_populate_sysroot[postfuncs] += "do_sysroot_cmake_sanity "
-
-# check sysroot cmake files for links not relative and not to sysroots
-
-do_sysroot_cmake_sanity() {
-    error=
-    for f in `cat ${CMAKEINSTALLED}` ; do
-        if grep -q ';${libdir}' "$f" ; then
-            bbwarn "$f contains links to ${libdir}!"
-            error=true
-        fi
-        if grep -q '\"${libdir}/lib' "$f" ; then
-            bbwarn "$f contains links to ${libdir}!"
-            error=true
-        fi
-        if grep -q ';${includedir}' "$f" ; then
-            bbwarn "$f contains links to ${includedir}!"
-            error=true
-        fi
-        if grep -q '\"${includedir}' "$f" ; then
-            bbwarn "$f contains links to ${includedir}!"
-            error=true
-        fi
-    done
-    if [ x != x$error ] ; then
-        bbfatal "One or more files in sysroot contain links to ${prefix}"
-    fi
-}
--- a/classes/cmake-lib.bbclass
+++ b/classes/cmake-lib.bbclass
@@ -55,9 +55,9 @@
 #   CMAKE_ALIGN_SYSROOT[<unique-id>] = "ignore"
 #

-inherit cmake_sysroot

-SSTATE_SYSROOT = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}"
+# filename for the file containg full names of all cmakefiles staged
+CMAKEINSTALLED = "${WORKDIR}/staged_cmake_files"

 # global helper to get CMAKE_ALIGN_SYSROOT array
 def get_align_flags(d):
@@ -70,7 +70,7 @@ def get_align_flags(d):

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

@@ -81,7 +81,7 @@ python () {
    if get_flags_ignore(cmakehideflags):
        return

-    pn = d.getVar('PN')
+    pn = d.getVar('PN', True)
    if cmakehideflags:
        for flag, flagval in sorted(cmakehideflags.items()):
            items = flagval.split(",")
@@ -89,14 +89,29 @@ python () {
            if num != 3:
                bb.fatal('CMAKE_ALIGN_SYSROOT[%s] requires 3 parameters (dir, search, replace) in %s' % (flag, pn))
    else:
-        bb.fatal('The recipe %s inherits cmake_lib but does not set CMAKE_ALIGN_SYSROOT' % pn)
+        bb.fatal('The recipe %s inherits cmake-lib but does not set CMAKE_ALIGN_SYSROOT' % pn)
 }

-# 2. 3. in cmake_sysroot
+# 2. remove tmp file from last build
+python do_populate_sysroot_prepend() {
+    tmpfile = d.getVar('CMAKEINSTALLED', True)
+    if os.path.isfile(tmpfile):
+        os.remove(tmpfile)
+}
+
+# 3. keep cmake files staged to sysroot
+sysroot_stage_dir_append() {
+    # avoid doubles causing double replacement
+    for file in `find $dest -name '*.cmake'`; do
+        if ! grep -q "$file" ${CMAKEINSTALLED} ; then
+            echo "$file" >> ${CMAKEINSTALLED}
+        fi
+    done
+}

 # 4. Handle CMAKE_ALIGN_SYSROOT
 python do_populate_sysroot_append() {
-    pn = d.getVar('PN')
+    pn = d.getVar('PN', True)

    # parse single parameter in CMAKE_ALIGN_SYSROOT[..] and return array of line strings extracted
    def parseparam(param, flag):
@@ -107,7 +122,7 @@ python do_populate_sysroot_append() {

            # handle file in WORKDIR
            if cmd == '-f' or cmd == '-F':
-                filename = "%s/%s" % (d.getVar('WORKDIR'), cmdparam)
+                filename = "%s/%s" % (d.getVar('WORKDIR', True), cmdparam)
                if os.path.isfile(filename):
                    fd = open(filename, 'r')
                    str = fd.read()
@@ -144,7 +159,7 @@ python do_populate_sysroot_append() {
        return

    # check if cmake files were installed to sysroot
-    tmpfile = d.getVar('CMAKEINSTALLED')
+    tmpfile = d.getVar('CMAKEINSTALLED', True)
    if (not os.path.isfile(tmpfile)) or os.path.getsize(tmpfile) == 0:
        bb.warn("There were no cmake files installed by %s" % pn)
    else:
@@ -157,7 +172,7 @@ python do_populate_sysroot_append() {
            if len(cmakedir) == 0:
                bb.fatal('Directory in CMAKE_ALIGN_SYSROOT[%s] must not be empty in %s' % (flag, pn))
            # check if this directory is created by us
-            pipe = os.popen('grep %s %s' % (cmakedir, d.getVar('CMAKEINSTALLED')))
+            pipe = os.popen('grep %s %s' % (cmakedir, d.getVar('CMAKEINSTALLED', True)))
            matching_files = pipe.readlines()
            pipe.close()
            if len(matching_files) == 0:
--- a/classes/cmake-native-dummy.bbclass
+++ b/classes/cmake-native-dummy.bbclass
@@ -0,0 +1,22 @@
+#
+# 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
+}
+
--- a/classes/cmake_qt5_extra.bbclass
+++ b/classes/cmake_qt5_extra.bbclass
@@ -1,5 +0,0 @@
-inherit cmake_qt5 cmake_extra_sanity
-
-EXTRA_OECMAKE += " \
-    -DCMAKE_QT5_EX_PATH_HOST_HEADERS=${STAGING_INCDIR} \
-"
--- a/classes/cmake_sysroot.bbclass
+++ b/classes/cmake_sysroot.bbclass
@@ -1,22 +0,0 @@
-# class to keep cmake files staged to sysroot for modifications/checks
-
-# filename for the file containg full names of all cmakefiles staged
-CMAKEINSTALLED = "${WORKDIR}/staged_cmake_files"
-
-# 1. remove tmp file from last build
-python do_populate_sysroot_prepend() {
-    tmpfile = d.getVar('CMAKEINSTALLED')
-    if os.path.isfile(tmpfile):
-        os.remove(tmpfile)
-}
-
-# 2. keep cmake files staged to sysroot
-sysroot_stage_dir_append() {
-    # avoid doubles causing double replacement
-    for file in `find $dest -name '*.cmake'`; do
-        if ! grep -q "$file" ${CMAKEINSTALLED} ; then
-            echo "$file" >> ${CMAKEINSTALLED}
-        fi
-    done
-}
-
--- a/classes/hawaii.bbclass
+++ b/classes/hawaii.bbclass
@@ -0,0 +1,9 @@
+SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
+
+DEPENDS += "qtbase qtdeclarative qtquickcontrols extra-cmake-modules-native"
+
+inherit cmake_qt5 cmake-extra-sanity pkgconfig
+
+EXTRA_OECMAKE += " \
+    -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \
+"
--- a/classes/kde-apps.bbclass
+++ b/classes/kde-apps.bbclass
@@ -1,8 +1,7 @@
 inherit kde-base

-KDE_APP_VERSION = "20.08.3"
+KDE_APP_VERSION = "15.12.0"

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

 RRECOMMENDS_${PN} += "qtbase-plugins"
--- a/classes/kde-base.bbclass
+++ b/classes/kde-base.bbclass
@@ -17,20 +17,11 @@ ${KDE_MIRROR}	http://kde.c3sl.ufpr.br \n \
 SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"

 # extra-cmake-modules cause dependent to check for python
-inherit cmake_qt5_extra python3native
+inherit cmake_qt5 cmake-extra-sanity pythonnative

-DEPENDS += "libxml2-native"
-
-do_compile_prepend() {
-    export XDG_DATA_HOME=${STAGING_DATADIR}
-}
-
-FILES_${PN} += " \
-    ${datadir}/kf5 \
-    ${datadir}/qlogging-categories5 \
-    ${libdir}/plugins/kf5 \
-    ${libexecdir}/kf5 \
-"
+FILES_${PN} += "${libdir}/plugins/kf5 ${datadir}/kf5"
+FILES_${PN}-dev += "${libdir}/cmake"
+FILES_${PN}-dbg += "${libdir}/plugins/kf5/.debug"

 EXTRA_OECMAKE += " \
    -DECM_MKSPECS_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \
@@ -38,13 +29,5 @@ 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} += " \
-    ${datadir}/appdata \
-    ${datadir}/metainfo \
-"
-
 FILES_${PN}-dev += "${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs"
--- a/classes/kde-kf5-porting-aids.bbclass
+++ b/classes/kde-kf5-porting-aids.bbclass
@@ -1,3 +1,3 @@
 inherit kde-kf5

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

-KF5_VERSION = "5.73.0"
+KF5_VERSION = "5.18.0"

-def kde_verdir(v):
-    return oe.utils.trim_version(v, 2)
-
-KF5_VERSION_DIR = "${@kde_verdir("${KF5_VERSION}")}"
-
-SRC_URI = "${KDE_MIRROR}/stable/frameworks/${KF5_VERSION_DIR}/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.18/${BPN}-${PV}.tar.xz"
--- a/classes/kde-plasma.bbclass
+++ b/classes/kde-plasma.bbclass
@@ -1,9 +1,5 @@
 inherit kde-base

-PLASMA_VERSION = "5.19.5"
+PLASMA_VERSION = "5.5.3"

-SRC_URI = "${KDE_MIRROR}/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"
-
-DEPENDS += " \
-    kwayland \
-"
+SRC_URI = "${KDE_MIRROR}/stable/plasma/${PV}/${BPN}-${PV}.tar.xz"
--- a/classes/liri.bbclass
+++ b/classes/liri.bbclass
@@ -1,22 +0,0 @@
-LIRI_GIT_BRANCH ?= "develop"
-
-SRC_URI = "git://github.com/lirios/${@'${BPN}'.replace('liri-', '')}.git;protocol=git;branch=${LIRI_GIT_BRANCH}"
-
-DEPENDS += " \
-    qtwayland-native \
-    qttools-native \
-    liri-cmake-shared \
-    extra-cmake-modules \
-    qtbase \
-    qttools \
-    qtdeclarative \
-    qtwayland \
-"
-
-inherit cmake_qt5_extra pkgconfig
-
-EXTRA_OECMAKE += " \
-    -DINSTALL_LIBDIR:PATH=${baselib} \
-    -DINSTALL_QMLDIR:PATH=${OE_QMAKE_PATH_QML} \
-    -DINSTALL_PLUGINSDIR:PATH=${OE_QMAKE_PATH_PLUGINS} \
-"
--- a/classes/lxqt.bbclass
+++ b/classes/lxqt.bbclass
@@ -1,8 +1,11 @@
-inherit cmake_qt5_extra
+inherit cmake_qt5 cmake-extra-sanity qt5-translation

 HOMEPAGE = "http://lxqt.org/"

-DEPENDS += "lxqt-build-tools qtbase qttools-native"
+DEPENDS += "qtbase"

-SRC_URI = "git://github.com/lxqt/${BPN}.git;protocol=git;branch=master"
+SRC_URI = "git://github.com/lxde/${BPN}.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
+
+# REVISIT: configure to use only ${libdir}/cmake
+FILES_${PN}-dev += "${datadir}/cmake ${libdir}/cmake"
--- a/classes/qt5-translation.bbclass
+++ b/classes/qt5-translation.bbclass
@@ -1,57 +1,57 @@
 # translations -> locale packages

-DEPENDS += "qttools-native"
-
 # default location
 QT_TRANSLATION_FILES ??= "${datadir}/*/translations/*.qm ${datadir}/*/translations/*/*.qm ${datadir}/*/translations/*/*/*.qm"

 FILES_${PN}-locale = "${datadir}/*/translations"

+# remove ${datadir}/${BPN} set by bitbake.conf
+FILES_${PN}_remove = "${datadir}/${BPN}"
+
 python qt_do_split_locales() {
    import glob
-    import collections

-    if (d.getVar('PACKAGE_NO_LOCALE') == '1'):
+    if (d.getVar('PACKAGE_NO_LOCALE', True) == '1'):
        bb.debug(1, "package requested not splitting locales")
        return

-    packages = collections.deque((d.getVar('PACKAGES') or "").split())
+    packages = (d.getVar('PACKAGES', True) or "").split()

-    datadir = d.getVar('datadir')
+    datadir = d.getVar('datadir', True)
    if not datadir:
        bb.note("datadir not defined")
        return

-    dvar = d.getVar('PKGD')
-    pn = d.getVar('LOCALEBASEPN')
+    dvar = d.getVar('PKGD', True)
+    pn = d.getVar('LOCALEBASEPN', True)

    if pn + '-locale' in packages:
        packages.remove(pn + '-locale')

    # extract locales from *.qm files into list in locales
    locales = []
-    for transvar in d.getVar('QT_TRANSLATION_FILES').split():
+    for transvar in d.getVar('QT_TRANSLATION_FILES', True).split():
        translocation = '%s%s' % (dvar, transvar)
        transfiles = glob.glob(translocation)
        for l in sorted(transfiles):
-            lib, locale = os.path.basename(l.replace('.qm', '')).split("_",1)
+            lib, locale = l.replace('.qm', '').split("_",1)
            if not locale in locales:
                locales.append(locale)

    if not locales:
-        bb.warn("No locale files for recipe %s. Remove qt5-translation from inherit?" % d.getVar('PN'))
+        bb.debug(1, "No locale files in this package")
        return

-    summary = d.getVar('SUMMARY') or pn
-    description = d.getVar('DESCRIPTION') or ""
-    locale_section = d.getVar('LOCALE_SECTION')
-    mlprefix = d.getVar('MLPREFIX') or ""
+    summary = d.getVar('SUMMARY', True) or pn
+    description = d.getVar('DESCRIPTION', True) or ""
+    locale_section = d.getVar('LOCALE_SECTION', True)
+    mlprefix = d.getVar('MLPREFIX', True) or ""
    for l in sorted(locales):
        ln = legitimize_package_name(l)
        pkg = pn + '-locale-' + ln
-        packages.appendleft(pkg)
+        packages.append(pkg)
        files = ''
-        for transvar in d.getVar('QT_TRANSLATION_FILES').split():
+        for transvar in d.getVar('QT_TRANSLATION_FILES', True).split():
            files = '%s %s' % (files, transvar.replace('*.qm', '*_%s.qm' % l))
        d.setVar('FILES_' + pkg, files )
        d.setVar('RRECOMMENDS_' + pkg, '%svirtual-locale-%s' % (mlprefix, ln))
@@ -61,7 +61,7 @@ python qt_do_split_locales() {
        if locale_section:
            d.setVar('SECTION_' + pkg, locale_section)

-    d.setVar('PACKAGES', ' '.join(list(packages)))
+    d.setVar('PACKAGES', ' '.join(packages))
 }

 PACKAGESPLITFUNCS_prepend = "qt_do_split_locales "
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,20 +8,6 @@ BBFILES += "${LAYERDIR}/extends-*/*.bb ${LAYERDIR}/extends-*/*.bbappend"

 BBFILE_COLLECTIONS += "meta-qt5-extra"
 BBFILE_PATTERN_meta-qt5-extra := "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-qt5-extra = "20"
+BBFILE_PRIORITY_meta-qt5-extra = "7"

-LAYERDEPENDS_meta-qt5-extra = " \
-    core \
-    qt5-layer \
-    openembedded-layer \
-    networking-layer \
-    multimedia-layer \
-    gnome-layer \
-    meta-python \
-"
-LAYERSERIES_COMPAT_meta-qt5-extra = "dunfell gatesgarth"
-
-LICENSE_PATH += "${LAYERDIR}/files/licenses"
-
-# required for fluxbox - supplied by e.g fedora glibc-common
-HOSTTOOLS_NONFATAL += "gencat"
+LAYERDEPENDS_meta-qt5-extra = "core qt5-layer openembedded-layer networking-layer"
--- a/extends-meta-oe/libsigrok_%.bbappend
+++ b/extends-meta-oe/libsigrok_%.bbappend
@@ -1 +0,0 @@
-PACKAGECONFIG += "cxx"
--- a/extends-meta-oe/networkmanager_%.bbappend
+++ b/extends-meta-oe/networkmanager_%.bbappend
@@ -0,0 +1,6 @@
+PACKAGECONFIG ?= " \
+    ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
+    modemmanager \
+    bluez5 \
+"
+
--- a/extends-meta-oe/poppler_%.bbappend
+++ b/extends-meta-oe/poppler_%.bbappend
@@ -1,3 +0,0 @@
-PACKAGECONFIG_append = " qt5"
-
-inherit cmake_qt5
--- a/extends-meta-qt5/qt5-creator_git.bbappend
+++ b/extends-meta-qt5/qt5-creator_git.bbappend
@@ -1,5 +0,0 @@
-inherit cmake_extra_sanity
-
-# yeah I know yocto does not want us to change this
-PACKAGECONFIG_append = " ${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', ' clang', '', d)}"
-
--- a/extends-meta-qt5/qtbase/0002-qdbusxml2cpp-prepare-commandline-string-manipulation.patch
+++ b/extends-meta-qt5/qtbase/0002-qdbusxml2cpp-prepare-commandline-string-manipulation.patch
@@ -8,32 +8,28 @@ Content-Transfer-Encoding: 8bit

 Upstream-Status: Inappropriate [embedded specific]

-Date: Sat, 18 Jan 2020 16:35:24 +0100
-Adjusted to Qt 5.14
-
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
-index ce4232f3e8..d9003f4508 100644
+index 76401da..3a712d2 100644
 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
 +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
-@@ -161,9 +161,12 @@ static QString moc(const QString &name)
+@@ -289,9 +289,11 @@ 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 << "/*" << Qt::endl
-        << " * This file was generated by " PROGRAMNAME " version " PROGRAMVERSION << Qt::endl
-       << " * Command line was: " << commandLine << Qt::endl
-+       << " * Command line was: " << strCmdLine << Qt::endl
-        << " *" << Qt::endl
-        << " * " PROGRAMNAME " is " PROGRAMCOPYRIGHT << Qt::endl
-        << " *" << Qt::endl
+	QString strCmdLine = commandLine;
+	strCmdLine.replace(QStringLiteral("STRING_FULL_PATH"), QStringLiteral("STRING_PATH"));
+     ts << "/*" << endl
+        << " * This file was generated by " PROGRAMNAME " version " PROGRAMVERSION << endl
+-       << " * Command line was: " << commandLine << endl
+       << " * Command line was: " << strCmdLine << endl
+        << " *" << endl
+        << " * " PROGRAMNAME " is " PROGRAMCOPYRIGHT << endl
+        << " *" << endl
 -- 
-2.21.0
+2.1.0

--- a/extends-meta-qt5/qtbase_git.bbappend
+++ b/extends-meta-qt5/qtbase_git.bbappend
@@ -1,24 +1,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"

-PACKAGECONFIG_FONTS = "fontconfig"
-
-# Full (desktop) GL is default in meta-qt5 and qtbase. Some of our recipes
-# (AFAICR krita/mixxx) will fail with qt build for GLES.
-# Will never understand why a BSP layer changes defaults to make people happy
-# not using defaults. Yes it looks like an error but that should have been
-# fixed at meta-qt5.
-# see https://github.com/Freescale/meta-freescale/pull/379
-PACKAGECONFIG_GL_use-mainline-bsp = "${QT5_EXTRA_QTBASE_IMX_MAINLINE_GL} gbm kms"
-
-# If one does not need failing recipes mentioned above and wants gles:
-# override QT5_EXTRA_QTBASE_IMX_MAINLINE_GL with 'gles2'
-QT5_EXTRA_QTBASE_IMX_MAINLINE_GL ??= ""
-
 # session management only for x11 environment
-PACKAGECONFIG_DISTRO += " \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "sm", "", d)} \
-    accessibility \
-    sql-sqlite \
-    cups \
-    libinput \
-"
+PACKAGECONFIG_DISTRO += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "sm", "", d)}"
--- a/extends-meta-qt5/qttools_git.bbappend
+++ b/extends-meta-qt5/qttools_git.bbappend
@@ -1,20 +1,16 @@
-inherit cmake_lib
+inherit cmake-lib

 DEPENDS += "${BPN}-native"


-# It's really time for us to publish cmake_lib.bbclass
+# It's really time for us to publish cmake-lib.bbclass
 SRC_URI_remove = " \
-    file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
+    file://0004-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}${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}"
-
-# yeah I know yocto does not want us to change this
-PACKAGECONFIG_append = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', ' clang', '', d)}"
+CMAKE_ALIGN_SYSROOT[1] = "Qt5Help, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[2] = "Qt5LinguistTools, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
--- a/extends-meta-qt5/qtwayland_git.bbappend
+++ b/extends-meta-qt5/qtwayland_git.bbappend
@@ -1,16 +0,0 @@
-# Since Qt5.15 qtwaylandscanner creates a comment as:
-
-# // source file is /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/kwayland/5.70.0-r0/recipe-sysroot/usr/share/wayland-protocols/unstable/tablet/tablet-unstable-v2.xml
-
-# which triggers our make_extra_sanity.bbclass.
-# To be compatible with Qt5.14 (dunfell) and >= Qt5.15 (current master) we do
-# some sed instead of patching.
-do_patch_append_class-native() {
-    bb.build.exec_func('do_fix_qtwaylandscanner_cpp', d)
-}
-
-do_fix_qtwaylandscanner_cpp () {
-    if [ -f ${S}/src/qtwaylandscanner/qtwaylandscanner.cpp ]; then
-        sed -i 's:printf("// source file is://printf("// source file is:' ${S}/src/qtwaylandscanner/qtwaylandscanner.cpp
-    fi
-}
--- a/extends-meta-qt5/quazip.bb
+++ b/extends-meta-qt5/quazip.bb
@@ -1,15 +0,0 @@
-SUMMARY = "Qt/C++ wrapper for ZIP/UNZIP package"
-HOMEPAGE = "https://github.com/stachenov/quazip"
-LICENSE = "LGPL-2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4c01c380a79ed7138aa9049e29df9c6a"
-
-DEPENDS = "qtbase zlib"
-
-SRC_URI = "git://github.com/stachenov/quazip.git"
-SRCREV = "100578f686b7da029a19c0bc9ad3c93f80adb2bb"
-PV = "1.1"
-S = "${WORKDIR}/git"
-
-inherit cmake_qt5
-
-EXTRA_CMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
--- a/extends-oe-core/boost_%.bbappend
+++ b/extends-oe-core/boost_%.bbappend
@@ -0,0 +1,2 @@
+PACKAGECONFIG ?= "python"
+
--- a/extends-oe-core/flac%.bbappend
+++ b/extends-oe-core/flac%.bbappend
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native"
--- a/extends-oe-core/gpgme/0001-return-unknown-as-host.patch
+++ b/extends-oe-core/gpgme/0001-return-unknown-as-host.patch
@@ -0,0 +1,33 @@
+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
+
--- a/extends-oe-core/gpgme/gpgme.pc
+++ b/extends-oe-core/gpgme/gpgme.pc
@@ -0,0 +1,10 @@
+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}
--- a/extends-oe-core/gpgme_%.bbappend
+++ b/extends-oe-core/gpgme_%.bbappend
@@ -1,6 +0,0 @@
-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}/"
--- a/extends-oe-core/gpgme_1.4.3.bb
+++ b/extends-oe-core/gpgme_1.4.3.bb
@@ -0,0 +1,45 @@
+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=dccb4bb624011e36513c61ef0422d054 \
+                    file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
+           file://gpgme.pc"
+
+SRC_URI_append_class-native = " file://0001-return-unknown-as-host.patch"
+
+SRC_URI[md5sum] = "334e524cffa8af4e2f43ae8afe585672"
+SRC_URI[sha256sum] = "2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60120496"
+
+DEPENDS = "libgpg-error libassuan"
+
+EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm --with-gpgconf=no --with-g13=no"
+
+inherit autotools texinfo pkgconfig
+
+PACKAGES =+ "${PN}-pthread"
+FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"
+FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*"
+
+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"
--- a/extends-oe-core/gstreamer1.0-plugins-good_%.bbappend
+++ b/extends-oe-core/gstreamer1.0-plugins-good_%.bbappend
@@ -1 +0,0 @@
-PACKAGECONFIG_append = " qt5"
--- a/extends-oe-core/libogg%.bbappend
+++ b/extends-oe-core/libogg%.bbappend
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native"
--- a/extends-oe-core/libsndfile1_%.bbappend
+++ b/extends-oe-core/libsndfile1_%.bbappend
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native"
--- a/extends-oe-core/libvorbis%.bbappend
+++ b/extends-oe-core/libvorbis%.bbappend
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native"
--- a/files/licenses/KDAB-Commercial
+++ b/files/licenses/KDAB-Commercial
@@ -1,103 +0,0 @@
-COMMERCIAL LICENSE AGREEMENT
-FOR COMMERCIAL VERSIONS
-Version 1.0
-
-Copyright of this license text (C) 2001 Trolltech AS and (C) 2002-2016
-Klarälvdalens Datakonsult AB.  All rights reserved. License text used
-with kind permission of Trolltech AS. The software and accompanying
-material is Copyright (C) 2010-2019 Klarälvdalens Datakonsult AB.
-
-This non-exclusive non-transferable License Agreement ("Agreement") is
-between you ("Licensee") and Klarälvdalens Datakonsult AB (KDAB), and
-pertains to the Klarälvdalens Datakonsult AB software product(s)
-accompanying this Agreement, which include(s) computer software and
-may include "online" or electronic documentation, associated media,
-and printed materials, including the source code, example programs and
-the documentation ("Software").
-
-
-                        COPYRIGHT AND RESTRICTIONS
-
-1. All intellectual property rights in the Software are owned by KDAB
-and are protected by Swedish copyright laws, other applicable
-copyright laws, and international treaty provisions. KDAB retains all
-rights not expressly granted. No title, property rights or copyright
-in the Software or in any modifications to the Software shall pass to
-the Licensee under any circumstances. The Software is licensed, not
-sold.
-
-2. By installing, copying, or otherwise using the Software, you agree
-to be bound by the terms of this agreement. If you do not agree to the
-terms of this Agreement, do not install, copy, or otherwise use the
-Software.
-
-3. Upon your acceptance of the terms and conditions of this Agreement,
-KDAB grants you the right to use the Software in the manner provided
-below.
-
-4. KDAB grants to you as an individual a personal, nonexclusive,
-non-transferable license to make and use copies of the Software for
-the sole purposes of designing, developing, testing and distributing
-your software product(s) ("Applications"). You may install copies of
-the Software on an unlimited number of computers provided that you are
-the only individual using the Software. If you are an entity, KDAB
-grants you the right to designate one, and only one, individual within
-your organization who shall have the sole right to use the Software in
-the manner provided above.
-
-5. The license granted in this Agreement for you to create and
-distribute your own Applications is subject to all of the following
-conditions: (i) all copies of the Applications you create must bear a
-valid copyright notice, either your own or the copyright notice that
-appears on the Software; (ii) you may not remove or alter any
-copyright, trademark or other proprietary rights notice contained in
-any portion of the Software; (iii) you will indemnify and hold KDAB, its
-related companies and its suppliers, harmless from and against any
-claims or liabilities arising out of the use and/or reproduction of
-your Applications; (iv) your Applications must be written using a
-licensed, registered copy of the Software; (v) your Applications must
-add primary and substantial functionality to the Software; (vi) your
-Applications may not pass on functionality which in any way makes it
-possible for others to create Applications with the Software; (vii)
-your Applications may not compete with the Software; (viii) you may
-not use KDAB's or any of its suppliers' names, logos, or trademarks to
-market your programs, except to state that your program was written
-using the Software.
-
-6. LICENSEE'S BREACH OF CONTRACT
-In addition to penalties, other sanctions and the like as stated in
-the Swedish Copyright Act (1960:729), or successive legislation as it
-may appear, the Licensee agrees to pay a Contractual Fine in case of
-his/her/their breach of any of the above mentioned obligations,
-including but not limited to, the Licensee's obligation to let only
-one person per license use the Software as stated under above. The
-Contractual Fine is EUR 5000 and is payable by the Licensee to the
-Licenser immediately upon the Licenser having reasonably demonstrated
-that the Licensee is in breach of his obligations in this Agreement.
-
-7. WARRANTY DISCLAIMER
-THE SOFTWARE IS LICENSED TO YOU "AS IS".  TO THE MAXIMUM EXTENT
-PERMITTED BY APPLICABLE LAW, KDAB ON BEHALF OF ITSELF AND ITS SUPPLIERS,
-DISCLAIMS ALL WARRANTIES AND CONDITIONS, EITHER EXPRESS OR IMPLIED,
-INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT WITH
-REGARD TO THE SOFTWARE.
-
-8. LIMITATION OF LIABILITY
-IF, KDAB'S WARRANTY DISCLAIMER NOTWITHSTANDING, KDAB IS HELD LIABLE TO
-YOU BASED ON THE SOFTWARE, KDAB'S ENTIRE LIABILITY TO YOU AND YOUR
-EXCLUSIVE REMEDY SHALL BE, AT REPAIR OR REPLACEMENT OF THE SOFTWARE,
-PROVIDED YOU RETURN TO KDAB ALL COPIES OF THE SOFTWARE AS ORIGINALLY
-DELIVERED TO YOU.  KDAB SHALL NOT UNDER ANY CIRCUMSTANCES BE LIABLE TO
-YOU BASED ON FAILURE OF THE SOFTWARE IF THE FAILURE RESULTED FROM
-ACCIDENT, ABUSE OR MISAPPLICATION, NOR SHALL KDAB UNDER ANY
-CIRCUMSTANCES BE LIABLE FOR SPECIAL DAMAGES, PUNITIVE OR EXEMPLARY
-DAMAGES, DAMAGES FOR LOSS OF PROFITS OR INTERRUPTION OF BUSINESS OR
-FOR LOSS OR CORRUPTION OF DATA.
-
-9. This Agreement may only be modified in writing signed by you and an
-authorized officer of KDAB. All terms of any purchase order or other
-ordering document shall be superseded by this Agreement.
-
-10. This Agreement shall be construed, interpreted and governed by the
-laws of Sweden, the venue to be Sunne Tingsratt.
--- a/files/licenses/KDAB-Commercial-US
+++ b/files/licenses/KDAB-Commercial-US
@@ -1,147 +0,0 @@
-COMMERCIAL LICENSE AGREEMENT
-FOR COMMERCIAL VERSIONS
-December 20, 2016
-
-
-IMPORTANT-READ CAREFULLY: This Klarälvdalens Datakonsult AB End-User
-License Agreement ("EULA") is a legal agreement between you (either an
-individual or a legal entity) and Klarälvdalens Datakonsult AB
-("KDAB") for the Klarälvdalens Datakonsult AB software product(s)
-accompanying this EULA, which include(s) computer software and may
-include "online" or electronic documentation, associated media, and
-printed materials ("Licensed Product").
-
-The Licensed Product is protected by copyright laws and international
-copyright treaties, as well as other intellectual property laws and
-treaties. The Licensed Product is licensed, not sold.
-
-By installing, copying, or otherwise using the Licensed Product, you
-agree to be bound by the terms of this EULA. If you do not agree to
-the terms of this EULA, do not install, copy, or otherwise use the
-Licensed Product; you may, however, return it to your place of
-purchase for a full refund. In addition, by installing, copying, or
-otherwise using any updates or other components of the Licensed
-Product that you receive separately as part of the Licensed Product
-("Updates"), you agree to be bound by any additional license terms
-that accompany such Updates. If you do not agree to the additional
-license terms that accompany such Updates, you may not install, copy,
-or otherwise use such Updates.
-
-Upon your acceptance of the terms and conditions of this EULA, KDAB
-grants you the right to use the Licensed Product in the manner
-provided below.
-
-KDAB grants to you as an individual a personal, nonexclusive,
-nontransferable license to make and use copies of the Licensed Product
-for the sole purposes of designing, developing, and testing your
-software product(s) ("Applications"). You may install copies of the
-Licensed Product on an unlimited number of computers provided that you
-are the only individual using the Licensed Product. If you are an
-entity, KDAB grants you the right to designate one, and only one,
-individual within your organization who shall have the sole right to
-use the Licensed Product in the manner provided above.  You may at any
-time, but not more frequently that once every six (6) months,
-designate another individual to replace the current designated user by
-notifying KDAB, so long as there is no more than one designated user
-at any given time.
-
-
-GENERAL TERMS THAT APPLY TO APPLICATIONS AND REDISTRIBUTABLES
-KDAB grants you a nonexclusive, royalty-free right to reproduce and
-distribute the object code form of any portion of the Licensed Product
-("Redistributables") for execution on any operating system of a type
-listed in the License Certificate ("Platforms"). Copies of
-Redistributables may only be distributed with and for the sole purpose
-of executing Applications permitted under this License Agreement that
-you have created using the Licensed Product.  Under no circumstances
-may any copies of Redistributables be distributed separately.
-
-The license granted in this EULA for you to create your own
-Applications and distribute them and the Redistributables (if any) to
-your customers is subject to all of the following conditions: (i) all
-copies of the Applications you create must bear a valid copyright
-notice, either your own or the copyright notice that appears on the
-Licensed Product; (ii) you may not remove or alter any copyright,
-trademark or other proprietary rights notice contained in any portion
-of the Licensed Product; (iii) Redistributables, if any, shall be
-licensed to your customer "as is" (KDAB MAKES NO WARRANTIES OR
-REPRESENTATIONS VIS-A-VIS YOUR CUSTOMER WITH RESPECT TO
-REDISTRIBUTABLES, AND KDAB EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES
-VIS-A-VIS YOUR CUSTOMER, WHETHER EXPRESS OR IMPLIED, ORAL OR WRITTEN,
-INCLUDING, BUT NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY
-OR FITNESS FOR ANY PARTICULAR PURPOSE, WHETHER OR NOT KDAB KNOWS, HAS
-REASON TO KNOW, HAS BEEN ADVISED OR IS OTHERWISE AWARE OF SUCH
-PURPOSE); (iv) you will indemnify and hold KDAB, its related companies
-and its suppliers, harmless from and against any claims or liabilities
-arising out of the use, reproduction or distribution of your
-Applications; (v) your Applications must be written using a licensed,
-registered copy of the Licensed Product; (vi) your Applications must
-add primary and substantial functionality to the Licensed Product;
-(vii) your Applications may not pass on functionality which in any way
-makes it possible for others to create Applications with the Software;
-(viii) your Applications may not compete with the Licensed Product;
-(ix)) you may not use KDAB's or any of its suppliers' names, logos, or
-trademarks to market your programs, except to state that your program
-was written using the Licensed Product.
-
-LICENSEE'S BREACH OF CONTRACT
-In addition to penalties, other sanctions and the like as stated in
-the Swedish Copyright Act (1960:729), or successive legislation as it
-may appear, the Licensee agrees to pay a Contractual Fine in case of
-his/her/their breach of any of the above mentioned obligations,
-including but not limited to, the Licensee's obligation to let only
-one person per license use the Software as stated under above. The
-Contractual Fine is EUR 5000 and is payable by the Licensee to the
-Licenser immediately upon the Licenser having reasonably demonstrated
-that the Licensee is in breach of his obligations in this Agreement.
-
-WARRANTY DISCLAIMER
-THE LICENSED PRODUCT IS LICENSED TO YOU "AS IS".  TO THE MAXIMUM
-EXTENT PERMITTED BY APPLICABLE LAW, KDAB ON BEHALF OF ITSELF AND ITS
-SUPPLIERS, DISCLAIMS ALL WARRANTIES AND CONDITIONS, EITHER EXPRESS OR
-IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
-NON-INFRINGEMENT WITH REGARD TO THE LICENSED PRODUCT.  THIS WARRANTY
-DISCLAIMER NOTWITHSTANDING, YOU MAY HAVE SPECIFIC LEGAL RIGHTS WHICH
-MAY VARY FROM STATE/JURISDICTION TO STATE/JURISDICTION.
-
-
-LIMITATION OF LIABILITY
-IF, KDAB'S WARRANTY DISCLAIMER NOTWITHSTANDING, KDAB IS HELD LIABLE TO
-YOU, WHETHER IN CONTRACT, TORT OR ANY OTHER LEGAL THEORY, BASED ON THE
-LICENSED PRODUCT, KDAB'S ENTIRE LIABILITY TO YOU AND YOUR EXCLUSIVE
-REMEDY SHALL BE, AT KDAB'S OPTION, EITHER (A) RETURN OF THE PRICE YOU
-PAID FOR THE LICENSED PRODUCT, OR (B) REPAIR OR REPLACEMENT OF THE
-LICENSED PRODUCT, PROVIDED YOU RETURN TO KDAB ALL COPIES OF THE
-LICENSED PRODUCT AS ORIGINALLY DELIVERED TO YOU.  KDAB SHALL NOT UNDER
-ANY CIRCUMSTANCES BE LIABLE TO YOU BASED ON FAILURE OF THE LICENSED
-PRODUCT IF THE FAILURE RESULTED FROM ACCIDENT, ABUSE OR
-MISAPPLICATION, NOR SHALL KDAB UNDER ANY CIRCUMSTANCES BE LIABLE FOR
-SPECIAL DAMAGES, PUNITIVE OR EXEMPLARY DAMAGES, DAMAGES FOR LOSS OF
-PROFITS OR INTERRUPTION OF BUSINESS OR FOR LOSS OR CORRUPTION OF DATA.
-ANY AWARD OF DAMAGES FROM KDAB TO YOU SHALL NOT EXCEED THE TOTAL AMOUNT
-YOU HAVE PAID TO KDAB IN CONNECTION WITH THIS EULA.
-
-
-SUPPORT AND UPDATES
-You will receive email based, software developer support and access to
-Updates to the Licensed Product for one year from the date of initial
-delivery, in accordance with KDAB support policies and procedures.
-Such policies and procedures may be changed from time to time.
-
-
-GENERAL PROVISIONS
-This EULA may only be modified in writing signed by you and an
-authorized officer of KDAB. All terms of any purchase order or other
-ordering document shall be superseded by this EULA.  If any provision
-of the EULA is found void or unenforceable, the remainder will remain
-valid and enforceable according to its terms.  If any remedy provided
-is determined to have failed for its essential purpose, all
-limitations of liability and exclusions of damages set forth in this
-EULA shall remain in effect.
-
-This EULA shall be construed, interpreted and governed by the laws of
-Sweden, the venue to be Sunne Tingsratt.  The EULA gives you specific
-legal rights; you may have others, which vary from state to state and
-from country to country.  KDAB reserves all rights not specifically
-granted in this EULA.
--- a/files/licenses/LGPLv2.1-qskinny-exception
+++ b/files/licenses/LGPLv2.1-qskinny-exception
@@ -1,525 +0,0 @@
-                             QSkinny License
-                           Version 1.0, November 1, 2016
-
-QSkinny is Copyright (C) 2016 Uwe Rathmann
-
-You may use, distribute and copy QSkinny under the terms of
-GNU Lesser General Public License version 2.1, which is displayed below
-with the following exceptions:
-
-    1. The object code form of a "work that uses the Library" may incorporate
-       material from a header file that is part of the Library.  You may
-       distribute such object code under terms of your choice, provided that:
-
-        (i)   the header files of the Library have not been modified; and
-        (ii)  the incorporated material is limited to numerical parameters, data
-              structure layouts, accessors, macros, inline functions and
-              templates; and
-        (iii) you comply with the terms of Section 6 of the GNU Lesser General
-              Public License version 2.1.
-
-------------------------------------------------------------------------
-
-            GNU LESSER GENERAL PUBLIC LICENSE
-                Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-        GNU LESSER GENERAL PUBLIC LICENSE
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
--- a/files/licenses/SUNDOWN
+++ b/files/licenses/SUNDOWN
@@ -1,12 +0,0 @@
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
--- a/recipes-gottcode/connectagram/connectagram.bb
+++ b/recipes-gottcode/connectagram/connectagram.bb
@@ -1,25 +0,0 @@
-SUMMARY = "Connectagram is a word unscrambling game"
-HOMEPAGE = "https://gottcode.org/connectagram/"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-inherit qmake5 qt5-translation gtk-icon-cache
-
-DEPENDS = "qttools-native qtbase hicolor-icon-theme"
-
-SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[md5sum] = "6ec03e98a79b8404a414353a3538aec7"
-SRC_URI[sha256sum] = "a711da70bd08383dd06b5f7ccbd92dcd201165426dfd20343c64f584a23f9de1"
-PV = "1.2.11"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
-
-EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
-
-FILES_${PN} += " \
-    ${datadir}/metainfo \
-"
-
-# WIP: qt5-translation expects *.qm to work properly so pack word data in PN for now
-FILES_${PN} += " \
-    ${datadir}/connectagram/data \
-"
--- a/recipes-gottcode/focuswriter/focuswriter.bb
+++ b/recipes-gottcode/focuswriter/focuswriter.bb
@@ -1,30 +0,0 @@
-SUMMARY = "FocusWriter is a simple, distraction-free writing environment"
-HOMEPAGE = "http://gottcode.org/gottet/"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-inherit qmake5 qt5-translation gtk-icon-cache mime-xdg
-
-DEPENDS += " \
-    qttools-native \
-    qtbase \
-    qtmultimedia \
-    hicolor-icon-theme \
-    hunspell \
-"
-
-SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[md5sum] = "ba9e316b4bc0c4568d71f7dc3cd64fff"
-SRC_URI[sha256sum] = "34f576a49c9fe64aedad66e02efafc29c840b6c3ddc98a42d87dfda499710541"
-PV = "1.7.6"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
-
-EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
-
-FILES_${PN} += " \
-    ${datadir}/metainfo \
-    ${datadir}/${BPN}/icons \
-    ${datadir}/${BPN}/symbols1000.dat \
-    ${datadir}/${BPN}/themes \
-    ${datadir}/${BPN}/sounds \
-"
--- a/recipes-gottcode/kapow/kapow.bb
+++ b/recipes-gottcode/kapow/kapow.bb
@@ -1,20 +0,0 @@
-SUMMARY = "Kapow is a punch clock program to easily keep track of your hours"
-HOMEPAGE = "https://gottcode.org/kapow/"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-inherit qmake5 qt5-translation gtk-icon-cache
-
-DEPENDS = "qttools-native qtbase hicolor-icon-theme"
-
-SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[md5sum] = "51900b071ef71da4c86ee38bda161e72"
-SRC_URI[sha256sum] = "6ba62239f5717422d899573ff50f8a967aea8fbbd79ac57406d6b86a333d027c"
-PV = "1.5.10"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
-
-EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
-
-FILES_${PN} += " \
-    ${datadir}/metainfo \
-"
--- a/recipes-gottcode/packagegroups/gottcode-world.bb
+++ b/recipes-gottcode/packagegroups/gottcode-world.bb
@@ -1,16 +0,0 @@
-SUMMARY = "All gottcode recipes - just for build test"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-inherit packagegroup
-
-RDEPENDS_${PN} = " \
-    connectagram \
-    focuswriter \
-    gottet \
-    hexalate \
-    kapow \
-    peg-e \
-    simsu \
-    tetzle \
-"
--- a/recipes-gottcode/peg-e/peg-e.bb
+++ b/recipes-gottcode/peg-e/peg-e.bb
@@ -1,21 +0,0 @@
-SUMMARY = "Peg-E is a peg solitaire game"
-HOMEPAGE = "http://gottcode.org/peg-e/"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-inherit qmake5 qt5-translation gtk-icon-cache
-
-DEPENDS = "qttools-native qtbase hicolor-icon-theme"
-
-SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[md5sum] = "ea2659e5cf6e0d981189cbe2751588df"
-SRC_URI[sha256sum] = "06d6a07c056b82372cdd6ac258dbfedab397ad4f13b70117f548b8218201ff17"
-PV = "1.2.8"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
-
-EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
-
-FILES_${PN} += " \
-    ${datadir}/metainfo \
-    ${datadir}/peg-e/icons \
-"
--- a/recipes-gottcode/simsu/simsu.bb
+++ b/recipes-gottcode/simsu/simsu.bb
@@ -1,20 +0,0 @@
-SUMMARY = "Simsu is a basic Sudoku game"
-HOMEPAGE = "http://gottcode.org/simsu/"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-inherit qmake5 qt5-translation gtk-icon-cache
-
-DEPENDS = "qttools-native qtbase hicolor-icon-theme"
-
-SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[md5sum] = "dc33b6c8c0cc5c60e47e1c094f99c467"
-SRC_URI[sha256sum] = "b5df8994ff7bc35e775c466c8214e4362d1f720757383c9cd412693fcb6f143b"
-PV = "1.3.9"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
-
-EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
-
-FILES_${PN} += " \
-    ${datadir}/metainfo \
-"
--- a/recipes-gottcode/tetzle/tetzle.bb
+++ b/recipes-gottcode/tetzle/tetzle.bb
@@ -1,20 +0,0 @@
-SUMMARY = "Tetzle is a jigsaw puzzle game that uses tetrominoes for the pieces"
-HOMEPAGE = "https://gottcode.org/tetzle/"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-inherit qmake5 qt5-translation gtk-icon-cache mime-xdg
-
-DEPENDS += "qttools-native qtbase hicolor-icon-theme"
-
-SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[md5sum] = "dc3e1545aaba5d7571c84a1a30c04210"
-SRC_URI[sha256sum] = "fbc3c86b5bf64187f89379176bd0085c636605d9594c7af8d0c056760d6cf80a"
-PV = "2.1.6"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
-
-EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
-
-FILES_${PN} += " \
-    ${datadir}/metainfo \
-"
--- a/recipes-graphics/picom/picom.bb
+++ b/recipes-graphics/picom/picom.bb
@@ -1,36 +0,0 @@
-SUMMARY = "A lightweight compositor for X11"
-HOMEPAGE = "https://github.com/yshui/picom"
-LICENSE = "MPL-2.0 & MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a9a621b5a1b8f702c605093d657b550c"
-
-SRC_URI = "git://github.com/yshui/picom.git;branch=stable/8"
-SRCREV = "dac85eac10082dfc3df463aaa74b811144e22122"
-PV = "8.2"
-S = "${WORKDIR}/git"
-
-DEPENDS = " \
-    libxext \
-    libxdamage \
-    libxfixes \
-    xcb-util-renderutil \
-    libxrender \
-    libxrandr \
-    libxcomposite \
-    xcb-util-image \
-    libxpresent \
-    libxinerama \
-    libdrm \
-    libev \
-    pixman \
-    dbus \
-    libconfig \
-    libpcre \
-    uthash \
-"
-
-inherit meson features_check gtk-icon-cache
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
-PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false,virtual/libgl"
--- a/recipes-graphics/qpdfview/qpdfview/0001-Fix-build-with-Qt-5.15.patch
+++ b/recipes-graphics/qpdfview/qpdfview/0001-Fix-build-with-Qt-5.15.patch
@@ -1,33 +0,0 @@
-From 04d58fcb669c9d6ee79cdd630f04791b61f417cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 8 Jun 2020 17:10:03 +0200
-Subject: [PATCH] Fix build with Qt >= 5.15
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-| ../qpdfview-0.4.18/sources/model.h:46:22: error: field 'boundary' has incomplete type 'QPainterPath'
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- sources/model.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sources/model.h b/sources/model.h
-index 6363c32..dc10a8c 100644
--- a/sources/model.h
-+++ b/sources/model.h
-@@ -27,6 +27,7 @@ along with qpdfview.  If not, see <http://www.gnu.org/licenses/>.
- #include <QtPlugin>
- #include <QWidget>
- #include <QVector>
-+#include <QPainterPath>
- 
- class QAbstractItemModel;
- class QColor;
-- 
-2.26.2
-
--- a/recipes-graphics/qpdfview/qpdfview_0.4.18.bb
+++ b/recipes-graphics/qpdfview/qpdfview_0.4.18.bb
@@ -1,23 +0,0 @@
-SUMMARY = "Light-weight tabbed PDF, DJVU and PostScript viewer"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-DEPENDS += "cups poppler qtsvg"
-
-SRC_URI = " \
-    https://launchpad.net/qpdfview/trunk/${PV}/+download/${BPN}-${PV}.tar.gz \
-    file://0001-Fix-build-with-Qt-5.15.patch \
-"
-SRC_URI[md5sum] = "4d63ee0095e939602f9bf4759ae57953"
-SRC_URI[sha256sum] = "cc642e7fa74029373ca9b9fbc29adc4883f8b455130a78ad54746d6844a0396c"
-
-inherit qmake5 mime-xdg
-
-QMAKE_PROFILES = "${S}/qpdfview.pro"
-EXTRA_QMAKEVARS_PRE += " \
-    CONFIG+=without_ps \
-    CONFIG+=without_djvu \
-    PLUGIN_INSTALL_PATH=${libdir}/${BPN} \
-"
-
-FILES_${PN} += "${datadir}"
--- a/recipes-graphics/scribus/scribus_1.5.2.bb
+++ b/recipes-graphics/scribus/scribus_1.5.2.bb
@@ -1,16 +0,0 @@
-SUMMARY = "Scribus: Open source desktop publishing"
-HOMEPAGE = "https://www.scribus.net/"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5d1d7a95f43e1139c1c42c7414852679"
-
-inherit cmake_qt5 cmake_extra_sanity
-
-DEPENDS += " \
-    cairo \
-"
-
-SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-devel/${PV}/${BPN}-${PV}.tar.xz \
-"
-SRC_URI[md5sum] = "031661a8fe0ba0131c360d3e9edc2fc0"
-SRC_URI[sha256sum] = "ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5"
--- a/recipes-graphics/sddm/sddm/0001-fix-qml-install-dir.patch
+++ b/recipes-graphics/sddm/sddm/0001-fix-qml-install-dir.patch
@@ -1,28 +0,0 @@
-From 45038115cf962f0b5923a74ae362e3a430ec5a3b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 8 Nov 2018 10:37:24 +0100
-Subject: [PATCH] fix qml install dir
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- components/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
-index 33920a6..22d75c9 100644
--- a/components/CMakeLists.txt
-+++ b/components/CMakeLists.txt
-@@ -1,5 +1,5 @@
- configure_file("2.0/LayoutBox.qml" "2.0/LayoutBox.qml")
- 
-install(DIRECTORY "2.0/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
-install(DIRECTORY "common/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/2.0/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
-+install(DIRECTORY "2.0/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
-+install(DIRECTORY "common/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
-+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/2.0/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
-- 
-2.14.5
-
--- a/recipes-graphics/sddm/sddm/0002-Workaround-missing-sessions.patch
+++ b/recipes-graphics/sddm/sddm/0002-Workaround-missing-sessions.patch
@@ -1,57 +0,0 @@
-From 68dbaac218216d001706c1a72d2db4819e3ca8cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 25 Nov 2018 00:29:17 +0100
-Subject: [PATCH] Workaround missing sessions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The current approach is wrong in many ways:
-
-* In case a session file does not set TryExec it is kept enabled accidentlty
-* Session files with TryExec without full path are ignored. Problem here: sddm
-  tries to find executables based on PATH environment. Problem at least for my
-  environment: There is no PATH variable set by systemd. So for session files
-  without path: Do not perform further checks / just trust for now.
-  
-Upstream-Sttaus: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- src/greeter/SessionModel.cpp | 19 ++++---------------
- 1 file changed, 4 insertions(+), 15 deletions(-)
-
-diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp
-index 2a3c091..927bce2 100644
--- a/src/greeter/SessionModel.cpp
-+++ b/src/greeter/SessionModel.cpp
-@@ -124,22 +124,11 @@ namespace SDDM {
- 
-             Session *si = new Session(type, session);
-             bool execAllowed = true;
-            QFileInfo fi(si->tryExec());
-            if (fi.isAbsolute()) {
-                if (!fi.exists() || !fi.isExecutable())
-+            if(!si->tryExec().isEmpty()) {
-+                QFileInfo fi(si->tryExec());
-+                if (fi.isAbsolute()) {
-+                    if (!fi.exists() || !fi.isExecutable())
-                     execAllowed = false;
-            } else {
-                execAllowed = false;
-                QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-                QString envPath = env.value(QStringLiteral("PATH"));
-                QStringList pathList = envPath.split(QLatin1Char(':'));
-                foreach(const QString &path, pathList) {
-                    QDir pathDir(path);
-                    fi.setFile(pathDir, si->tryExec());
-                    if (fi.exists() && fi.isExecutable()) {
-                        execAllowed = true;
-                        break;
-                    }
-                 }
-             }
-             // add to sessions list
-- 
-2.14.5
-
--- a/recipes-graphics/sddm/sddm/sddm-autologin.pam
+++ b/recipes-graphics/sddm/sddm/sddm-autologin.pam
@@ -1,16 +0,0 @@
-#%PAM-1.0
-auth        required    pam_env.so
-auth        required    pam_shells.so
-auth        required    pam_nologin.so
-auth       optional    pam_gnome_keyring.so
-auth       optional    pam_kwallet5.so
-
-account     include     common-account
-
-password    include     common-password
-
-session     include     common-session
-session     required    pam_limits.so
-session    optional    pam_kwallet5.so auto_start
-session    optional    pam_gnome_keyring.so auto_start
-
--- a/recipes-graphics/sddm/sddm/sddm.conf
+++ b/recipes-graphics/sddm/sddm/sddm.conf
@@ -1,27 +0,0 @@
-###############################################################################
-# We ship a minimalistic default configuration. To get a full configuration
-# with all defaults run 'sddm --example-config > default.config'
-###############################################################################
-[Autologin]
-
-# Name of session file for autologin session (if empty try last logged in)
-Session=
-
-# Username for autologin session
-User=
-
-
-
-[General]
-
-# Comma-separated list of Linux namespaces for user session to enter.
-# Touchscreen users with Qt Virtual Keyboard installed can set this to
-# "qtvirtualkeyboard" for the on-screen keyboard.
-InputMethod=
-
-
-
-[Users]
-
-# Do not touch PATH
-DefaultPath=
--- a/recipes-graphics/sddm/sddm/sddm.pam
+++ b/recipes-graphics/sddm/sddm/sddm.pam
@@ -1,20 +0,0 @@
-#%PAM-1.0
-
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            optional        pam_kwallet5.so
-auth            optional        pam_gnome_keyring.so
-#auth            required        pam_unix.so
-# To deny passwordless login comment next line and uncomment previous line
-auth            required        pam_unix.so nullok
-
-account         required        pam_unix.so
-
-session         required        pam_limits.so
-session         required        pam_unix.so
-session        optional        pam_systemd.so
-session         optional        pam_kwallet5.so auto_start
-session         optional        pam_gnome_keyring.so auto_start
-
-password        required        pam_unix.so
-
--- a/recipes-graphics/sddm/sddm_git.bb
+++ b/recipes-graphics/sddm/sddm_git.bb
@@ -1,82 +0,0 @@
-SUMMARY = "SDDM is a modern display manager for X11"
-LICENSE = "GPLv2 & CC-BY-3.0"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b \
-    file://LICENSE.CC-BY-3.0;md5=36b7342d5619a3a0d3b581e89803ec25 \
-"
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-inherit cmake_qt5_extra qmake5_base pkgconfig systemd useradd features_check
-
-DEPENDS += "extra-cmake-modules-native qtbase qtdeclarative qttools libxcb"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
-PACKAGECONFIG[pam] = "-DENABLE_PAM=ON, -DENABLE_PAM=OFF, libpam"
-
-# Note: we should check default config changes by running sddm --example-config on target.
-# This is usually done during build but does not work for our cross environment
-SRC_URI = " \
-    git://github.com/sddm/${BPN}.git;protocol=git;branch=master \
-    file://0001-fix-qml-install-dir.patch \
-    file://0002-Workaround-missing-sessions.patch \
-    file://sddm.pam \
-    file://sddm-autologin.pam \
-    file://sddm.conf \
-"
-SRCREV = "de41b8ea555f2e42ba47d83530ad654ca708cf85"
-PV = "0.18.1"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECMAKE += " \
-    -DLOGIN_DEFS_PATH=${STAGING_DIR_HOST}${sysconfdir}/login.defs \
-    -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \
-"
-
-do_configure_append() {
-    # fix sysroot path
-    sed -i 's:${STAGING_DIR_HOST}.*${libdir}:${libdir}:g' ${B}/src/common/Constants.h
-}
-
-install_pam() {
-    install -d ${D}${sysconfdir}/pam.d
-    install -m 644 ${WORKDIR}/sddm.pam ${D}${sysconfdir}/pam.d/sddm
-    install -m 644 ${WORKDIR}/sddm-autologin.pam ${D}${sysconfdir}/pam.d/sddm-autologin
-}
-
-do_install_append() {
-    install -d ${D}/${sysconfdir}/sddm.conf.d
-    install -m 644 ${WORKDIR}/sddm.conf ${D}/${sysconfdir}/sddm.conf.d/00-default.conf
-
-    install -d ${D}${localstatedir}/lib/sddm
-    chown -R sddm:sddm ${D}${localstatedir}/lib/sddm
-    chmod 0750 ${D}${localstatedir}/lib/sddm
-
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'install_pam', '', d)}
-}
-
-FILES_${PN} += "${OE_QMAKE_PATH_QML}"
-
-SYSTEMD_SERVICE_${PN} = "${BPN}.service"
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/sddm --shell /bin/false --user-group --groups video sddm"
-
-RDEPENDS_${PN} += " \
-    bash \
-    packagegroup-core-x11-xserver \
-    xinit \
-    xauth \
-    xmessage \
-    xrdb \
-    \
-    qtbase-plugins \
-    qtdeclarative-plugins \
-    qtdeclarative-qmlplugins \
-"
-
-RRECOMMENDS_${PN += " \
-    qtvirtualkeyboard-plugins \
-    qtvirtualkeyboard-qmlplugins \
-"
--- a/recipes-graphics/touchegg-qt5/files/0001-fix-qt5-build.patch
+++ b/recipes-graphics/touchegg-qt5/files/0001-fix-qt5-build.patch
@@ -1,47 +0,0 @@
-From dee672a83f65a861adf3347d646a6f918f21c107 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Mon, 25 Jan 2016 15:07:48 +0100
-Subject: [PATCH] fix qt5 build
-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/touchegg/util/Include.h | 4 +++-
- touchegg.pro                | 2 +-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/touchegg/util/Include.h b/src/touchegg/util/Include.h
-index 4fb27d5..27bccf6 100644
--- a/src/touchegg/util/Include.h
-+++ b/src/touchegg/util/Include.h
-@@ -23,8 +23,10 @@
-     // Qt
-     #include <QtCore>
-     #include <QtGui>
-    #include <QtGui/QX11Info>
-+    #include <QX11Info>
-     #include <QtXml>
-+    #include <QApplication>
-+    #include <QDesktopWidget>
- 
-     // Xlib
-     #include <X11/Xlib.h>
-diff --git a/touchegg.pro b/touchegg.pro
-index 696ea1a..4565083 100644
--- a/touchegg.pro
-+++ b/touchegg.pro
-@@ -1,6 +1,6 @@
- TEMPLATE     = app
- TARGET       = touchegg
-QT          += gui core xml
-+QT          += gui core xml widgets x11extras
- LIBS        += -lgeis -lX11 -lXtst -lXext
- //DEFINES      = QT_NO_DEBUG_OUTPUT
- 
-- 
-2.5.0
-
--- a/recipes-graphics/touchegg-qt5/touchegg-qt5_git.bb
+++ b/recipes-graphics/touchegg-qt5/touchegg-qt5_git.bb
@@ -1,18 +0,0 @@
-SUMMARY = "Linux multitouch gesture recognizer"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"
-
-inherit qmake5
-
-DEPENDS += "qtbase qtx11extras geis libxtst"
-
-SRC_URI = " \
-    git://github.com/JoseExposito/touchegg.git \
-    file://0001-fix-qt5-build.patch \
-"
-PV = "1.1.1+git${SRCPV}"
-SRCREV = "3a768ebfdc5f89a603504428705f80795d2ccc26"
-S="${WORKDIR}/git"
-
-FILES_${PN} += "${datadir}/touchegg"
--- a/recipes-hawaii/cinema/cinema_git.bb
+++ b/recipes-hawaii/cinema/cinema_git.bb
@@ -0,0 +1,15 @@
+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"
--- a/recipes-hawaii/cinema/files/0001-Make-install-work.patch
+++ b/recipes-hawaii/cinema/files/0001-Make-install-work.patch
@@ -0,0 +1,27 @@
+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
+
--- a/recipes-hawaii/eyesight/eyesight_git.bb
+++ b/recipes-hawaii/eyesight/eyesight_git.bb
@@ -0,0 +1,14 @@
+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"
--- a/recipes-hawaii/greenisland/greenisland_git.bb
+++ b/recipes-hawaii/greenisland/greenisland_git.bb
@@ -0,0 +1,45 @@
+SUMMARY = "Support library to make Qt-based Wayland compositors development easier"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
+
+inherit hawaii cmake-lib pythonnative pkgconfig
+
+DEPENDS += " \
+    ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+    wayland \
+    qtwayland \
+    libkscreen \
+    virtual/egl \
+"
+SRC_URI = " \
+    git://github.com/greenisland/${BPN}.git;protocol=git;branch=master \
+"
+
+SRCREV = "9c3ce026da4249346c4e85ff9215eab66522444d"
+PV = "0.6.0"
+
+S = "${WORKDIR}/git"
+
+# make it find qtwaylandscanner
+EXTRA_OECMAKE += " \
+    -DCMAKE_PROGRAM_PATH=${STAGING_DIR_NATIVE}/$bindir/qt5 \
+"
+
+PACKAGECONFIG ??= " \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xwayland", "",d)} \
+"
+PACKAGECONFIG[xawayland] = "-DENABLE_XWAYLAND=ON,-DENABLE_XWAYLAND=OFF,libxcb"
+
+# cross libs / headers
+CMAKE_ALIGN_SYSROOT[1] = "GreenIsland, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "GreenIsland, -S${includedir}, -S${STAGING_INCDIR}"
+
+FILES_${PN} += " \
+    ${OE_QMAKE_PATH_QML}/GreenIsland \
+    ${libdir}/plugins/greenisland \
+"
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_QML}/GreenIsland/.debug \
+    ${libdir}/plugins/greenisland/.debug \
+"
+FILES_${PN}-dev += "${libdir}/cmake"
--- a/recipes-hawaii/hawaii-baseapps/hawaii-baseapps_git.bb
+++ b/recipes-hawaii/hawaii-baseapps/hawaii-baseapps_git.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Base applications for the Hawaii desktop environment"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+	file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit hawaii pkgconfig
+
+DEPENDS += "polkit-qt-1"
+
+SRCREV = "b913c123f87d59e584a96d3d4c31dffaeb8dca24"
+PV = "0.4.90+git${SRCPV}"
+S = "${WORKDIR}/git"
--- a/recipes-hawaii/hawaii-icon-themes/hawaii-icon-themes_git.bb
+++ b/recipes-hawaii/hawaii-icon-themes/hawaii-icon-themes_git.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Icon themes for the Hawaii desktop environment"
+LICENSE = "LGPLv3 | CC-BY-SA-3.0"
+LIC_FILES_CHKSUM = " \
+    file://src/cursors/COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
+    file://src/cursors/COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \
+    file://src/cursors/COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://src/symbolic/COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
+    file://src/symbolic/COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \
+    file://src/symbolic/COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+"
+
+inherit hawaii
+
+SRCREV = "1ff24655d3881762294e9dde4a83770e6ff80c3b"
+PV = "0.4.0+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+PACKAGE_ARCH = "all"
+
+FILES_${PN} += "${datadir}/icons"
--- a/recipes-hawaii/hawaii-shell/files/0001-find-host-s-git.patch
+++ b/recipes-hawaii/hawaii-shell/files/0001-find-host-s-git.patch
@@ -0,0 +1,36 @@
+From 396f499db585e0be7029224ec6855b7f554d786f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 24 Apr 2015 13:29:02 +0200
+Subject: [PATCH] find host's git
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+we don't build git-native
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ cmake/GetGitRevision.cmake | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/GetGitRevision.cmake b/cmake/GetGitRevision.cmake
+index 692b6c4..c2ff81e 100644
+--- a/cmake/GetGitRevision.cmake
+++ b/cmake/GetGitRevision.cmake
+@@ -33,7 +33,10 @@
+ function(create_git_head_revision_file _file _target)
+     if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.git)
+         if(NOT GIT_FOUND)
+-            find_package(Git QUIET)
+            execute_process(COMMAND which git
+                  OUTPUT_VARIABLE GIT_EXECUTABLE
+                  ERROR_QUIET
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+         endif()
+ 
+         add_custom_target(gitsha1-${_target}
+-- 
+1.9.3
+
--- a/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb
+++ b/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb
@@ -0,0 +1,74 @@
+SUMMARY = "Hawaii desktop environment shell"
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = " \
+	file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit hawaii pythonnative cmake-lib distro_features_check
+#inherit systemd
+
+# weston fails for missing wayland-egl
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+SRC_URI += " \
+    file://0001-find-host-s-git.patch \
+"
+SRCREV = "8a33b1b5a292db4bac87943515586d32259d5ada"
+PV = "0.5.91+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+DEPENDS += " \
+    qtwayland-native \
+    wayland \
+    libqtxdg \
+    solid \
+    greenisland \
+    networkmanager-qt \
+    modemmanager-qt \
+"
+
+# REVISIT optionals
+DEPENDS += " \
+    alsa-lib \
+    pulseaudio \
+"
+
+PACKAGECONFIG[nm_qt] = "-DENABLE_NETWORK_MANAGER=ON,-DENABLE_NETWORK_MANAGER=OFF,networkmanager-qt"
+PACKAGECONFIG ??= "nm_qt"
+
+# REVISIT/HACK: for unkown reasons libqtxdg libs are not found
+LDFLAGS += "-lQt5Xdg"
+
+# starter scripts rely on bash qdbus catchsegv
+RDEPENDS_${PN} = "bash qttools-tools qtwayland-plugins catchsegv"
+
+# REVISIT optionals
+RRECOMMENDS_${PN} += " \
+    hawaii-wallpapers \
+    hawaii-icon-themes \
+    weston \
+"
+
+FILES_${PN} += " \
+    ${datadir} \
+    ${OE_QMAKE_PATH_QML} \
+    ${libdir}/plugins \
+    ${libdir}/systemd \
+"
+
+FILES_${PN}-dbg += " \
+    ${libdir}/plugins/*/.debug \
+    ${OE_QMAKE_PATH_QML}/*/*/.debug \
+    ${OE_QMAKE_PATH_QML}/*/*/*/.debug \
+"
+
+FILES_${PN}-dev += " \
+    ${libdir}/cmake \
+"
+
+# cross libs / headers
+CMAKE_ALIGN_SYSROOT[1] = "Hawaii, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "Hawaii, -S${includedir}, -S${STAGING_INCDIR}"
+
--- a/recipes-hawaii/hawaii-system-preferences/hawaii-system-preferences_git.bb
+++ b/recipes-hawaii/hawaii-system-preferences/hawaii-system-preferences_git.bb
@@ -0,0 +1,24 @@
+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 += "polkit-qt-1 kscreen"
+
+SRCREV = "5d9d32762151f7306fcb0c6798d2e4a940f57f2f"
+PV = "0.4.0+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += "-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools"
+
+FILES_${PN} += " \
+    ${OE_QMAKE_PATH_QML} \
+"
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_QML}/org/hawaii/systempreferences/*/.debug \
+"
--- a/recipes-hawaii/hawaii-terminal/hawaii-terminal_git.bb
+++ b/recipes-hawaii/hawaii-terminal/hawaii-terminal_git.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Terminal emulator for the Hawaii desktop environment"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+inherit hawaii
+
+SRCREV = "fc35b8a44e55334dcecdec8cf6e80047fe056727"
+PV = "0.5.91+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+FILES_${PN} += " \
+    ${datadir}/appdata \
+    ${OE_QMAKE_PATH_QML}/Hawaii/Terminal \
+"
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_QML}/Hawaii/Terminal/*/.debug \
+"
--- a/recipes-hawaii/hawaii-wallpapers/hawaii-wallpapers_git.bb
+++ b/recipes-hawaii/hawaii-wallpapers/hawaii-wallpapers_git.bb
@@ -0,0 +1,12 @@
+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}"
--- a/recipes-hawaii/hawaii-widget-styles/hawaii-widget-styles_git.bb
+++ b/recipes-hawaii/hawaii-widget-styles/hawaii-widget-styles_git.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Styles for applications using QtQuick Controls"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
+
+inherit hawaii
+
+SRCREV = "bc6678a242a8439488e0f57ddefdbb1eed5eabf2"
+PV = "0.5.0+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+FILES_${PN} += " \
+    ${datadir}/color-schemes \
+    ${OE_QMAKE_PATH_QML} \
+"
--- a/recipes-hawaii/packagegroups/hawaii-world.bb
+++ b/recipes-hawaii/packagegroups/hawaii-world.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Hawaii desktop package collection"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+
+inherit packagegroup
+
+RDEPENDS_${PN} = " \
+    cinema \
+    eyesight \
+    greenisland \
+    hawaii-baseapps \
+    hawaii-icon-themes \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "hawaii-shell", "",d)} \
+    hawaii-system-preferences \
+    hawaii-terminal \
+    hawaii-wallpapers \
+    hawaii-widget-styles \
+    qtaccountsservice \
+    qtconfiguration \
+    swordfish \
+"
+
+# wind was a X11 mauios approach. For dependencies (kdeclarative does not build 
+# for raspi) keep out
+# wind
--- a/recipes-hawaii/qtaccountsservice/qtaccountsservice_git.bb
+++ b/recipes-hawaii/qtaccountsservice/qtaccountsservice_git.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Qt-style API to use freedesktop.org's AccountsService DBus service"
+LICENSE = "GPLv2 & LGPLv2.1 & GFDL-1.3"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit hawaii
+
+SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git"
+SRCREV = "2624cc812ae14bf9abee9634de0f4cc0ee0a5926"
+
+S = "${WORKDIR}/git"
+PV = "0.6.0"
+
+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"
--- a/recipes-hawaii/qtconfiguration/files/0001-fix-build-with-qt-5.5.patch
+++ b/recipes-hawaii/qtconfiguration/files/0001-fix-build-with-qt-5.5.patch
@@ -0,0 +1,36 @@
+From 9d6d7a17b26935658c8fc546712e423fbd2cfad3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 13 Sep 2015 23:36:56 +0200
+Subject: [PATCH] fix build with qt 5.5
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+src/configuration/qgvariantutils.cpp:99:26: error: variable 'QDataStream s' has initializer but incomplete type
+             QDataStream s(&a, QIODevice::ReadOnly);
+                          ^
+
+Upstream-Status: Submitted [1]
+
+[1] https://github.com/hawaii-desktop/qtconfiguration/pull/1
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/configuration/qgvariantutils.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/configuration/qgvariantutils.cpp b/src/configuration/qgvariantutils.cpp
+index 757f56d..b5add00 100644
+--- a/src/configuration/qgvariantutils.cpp
+++ b/src/configuration/qgvariantutils.cpp
+@@ -39,6 +39,7 @@
+ #include <QtCore/QDebug>
+ #include <QtCore/QUrl>
+ #include <QtCore/QStringList>
+#include <QDataStream>
+ 
+ #include "qgvariantutils.h"
+ 
+-- 
+2.1.0
+
--- a/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb
+++ b/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb
@@ -0,0 +1,28 @@
+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 cmake-lib
+
+DEPENDS += "dconf"
+
+SRC_URI = " \
+    git://github.com/hawaii-desktop/${BPN}.git \
+    file://0001-fix-build-with-qt-5.5.patch \
+"
+SRCREV = "804739d73de982fc144ff45653c243cefcfa79cb"
+
+S = "${WORKDIR}/git"
+
+CMAKE_ALIGN_SYSROOT[1] = "QtConfiguration, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+
+FILES_${PN} += "${libdir}/hawaii/qml/Hawaii/Configuration"
+FILES_${PN}-dbg += "${libdir}/hawaii/qml/Hawaii/Configuration/.debug"
+FILES_${PN}-dev += "${libdir}/cmake"
+
+
--- a/recipes-hawaii/swordfish/swordfish_git.bb
+++ b/recipes-hawaii/swordfish/swordfish_git.bb
@@ -0,0 +1,19 @@
+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"
--- a/recipes-hawaii/wind/wind_0.4.0.bb
+++ b/recipes-hawaii/wind/wind_0.4.0.bb
@@ -0,0 +1,28 @@
+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} \
+"
--- a/recipes-kdab/hotspot/hotspot_git.bb
+++ b/recipes-kdab/hotspot/hotspot_git.bb
@@ -1,31 +0,0 @@
-SUMMARY = "The Linux perf GUI for performance analysis"
-LICENSE = "GPLv2+ | KDAB-Commercial | KDAB-Commercial-US"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.txt;md5=50a9af6464b390664488e7af1cc5c148 \
-    file://LICENSE.GPL.txt;md5=8b7a65584aeb92995bcb6066ed0f58f7 \
-    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 = "35d1865babf40b9df454810ca8cc09e77b0c349a"
-S = "${WORKDIR}/git"
-PV = "1.2.0+git${SRCPV}"
-
-FILES_${PN} += "${datadir}/icons"
-
-RDEPENDS_${PN} += "perf"
--- a/recipes-kdab/kdcharts/kdcharts_git.bb
+++ b/recipes-kdab/kdcharts/kdcharts_git.bb
@@ -1,25 +0,0 @@
-SUMMARY = "A Qt tool for creating business and scientific charts"
-LICENSE = "GPLv2+ | KDAB-Commercial"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.txt;md5=d5e1956ab398a4ae39e2470a9abd4889 \
-    file://LICENSE.GPL.txt;md5=6af452a21ffa624c438c2cde4423a893 \
-"
-
-inherit cmake_qt5_extra
-
-DEPENDS += " \
-    qtbase \
-    qtsvg \
-"
-
-do_install_append() {
-    # these have gone wild / qmake was always pain
-    rm -r ${D}/usr/mkspecs
-}
-
-SRC_URI = "git://github.com/KDAB/KDChart.git"
-SRCREV = "95547e8a2f6c362db1dd071a2df00b0e75e05da0"
-S = "${WORKDIR}/git"
-PV = "2.7.2"
-
-FILES_${PN}-dev += "${datadir}/mkspecs"
--- a/recipes-kdab/kdreports/kdreports_git.bb
+++ b/recipes-kdab/kdreports/kdreports_git.bb
@@ -1,24 +0,0 @@
-SUMMARY = "Qt library for generating printable and exportable reports"
-DESCRIPTION = "Qt library for generating printable and exportable reports from code and from XML descriptions"
-LICENSE = "(LGPL-2.1 | LGPL-3.0) & (GPL-2.0 | GPL-3.0 ) | KDAB-Commercial"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.txt;md5=d988404a6396edf41e7f8cbb2db3c185 \
-"
-
-inherit cmake_qt5_extra
-
-DEPENDS += " \
-    qtbase \
-    kdcharts \
-"
-
-SRC_URI = "git://github.com/KDAB/KDReports.git"
-SRCREV = "47728293e7842140d36a7861cf4316f2c1cbd795"
-S = "${WORKDIR}/git"
-PV = "1.9.0"
-
-do_install_append() {
-    # these have gone wild / qmake was always pain
-    rm -r ${D}/usr/mkspecs
-}
-
--- a/recipes-kdab/kdsoap/kdsoap-native.bb
+++ b/recipes-kdab/kdsoap/kdsoap-native.bb
@@ -1,5 +0,0 @@
-require ${BPN}.inc
-
-inherit native
-
-SRC_URI += "file://0001-Just-build-bare-kdwsdl2cpp-for-native.patch"
--- a/recipes-kdab/kdsoap/kdsoap.bb
+++ b/recipes-kdab/kdsoap/kdsoap.bb
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-DEPENDS += " \
-    ${BPN}-native \
-    qtbase \
-"
-
-SRC_URI += "file://0002-Do-not-export-kdwsdl2cpp-as-target-it-will-fin-it-s-.patch"
-
-FILES_${PN}-dev += "${datadir}/mkspecs"
--- a/recipes-kdab/kdsoap/kdsoap.inc
+++ b/recipes-kdab/kdsoap/kdsoap.inc
@@ -1,15 +0,0 @@
-SUMMARY = "A Qt-based client-side and server-side SOAP component"
-LICENSE = "(GPLv2 & LGPLv2.1 & AGPL-3.0) | KDAB-Commercial"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.GPL.txt;md5=63e3028b49eac8f84ab29661f079f159 \
-    file://LICENSE.LGPL.txt;md5=ce198ec102c2f0b1d13f26967a934670 \
-    file://LICENSE.AGPL3-modified.txt;md5=6b6dcd83ea786a77851d959c2797f78c \
-    file://LICENSE.txt;md5=a0def7eadd11e7a9916a16e5d8bc1a82 \
-"
-
-inherit cmake_qt5
-
-SRC_URI = "git://github.com/KDAB/KDSoap.git;protocol=https"
-SRCREV = "fb0e905e242c2044fd25683a406eb6d369db052f"
-S = "${WORKDIR}/git"
-PV = "1.9.0"
--- a/recipes-kdab/kdsoap/kdsoap/0001-Just-build-bare-kdwsdl2cpp-for-native.patch
+++ b/recipes-kdab/kdsoap/kdsoap/0001-Just-build-bare-kdwsdl2cpp-for-native.patch
@@ -1,117 +0,0 @@
-From 4c0ea920ab34615d3cf83ef018c8485e3c07fa4f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 22 May 2020 09:56:41 +0200
-Subject: [PATCH] Just build bare kdwsdl2cpp for native
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- CMakeLists.txt                     | 4 ++--
- kdwsdl2cpp/common/fileprovider.cpp | 2 +-
- kdwsdl2cpp/src/main.cpp            | 6 +++---
- kdwsdl2cpp/src/settings.cpp        | 2 +-
- kdwsdl2cpp/src/settings.h          | 4 ++--
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index addbafe2..596425e4 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -190,9 +190,9 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
-   )
- endif()
- 
-add_subdirectory(src)
-+#add_subdirectory(src)
- add_subdirectory(kdwsdl2cpp)
-if(${PROJECT_NAME}_IS_ROOT_PROJECT)
-+if(false)
- 
-   export(TARGETS kdsoap kdsoap-server kdwsdl2cpp NAMESPACE KDSoap::
-     FILE "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapTargets.cmake"
-diff --git a/kdwsdl2cpp/common/fileprovider.cpp b/kdwsdl2cpp/common/fileprovider.cpp
-index 1f23554d..45124850 100644
--- a/kdwsdl2cpp/common/fileprovider.cpp
-+++ b/kdwsdl2cpp/common/fileprovider.cpp
-@@ -106,7 +106,7 @@ bool FileProvider::get( const QUrl &url, QString &target )
- 
-     QNetworkAccessManager manager;
-     QNetworkRequest request(url);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
-     if (Settings::self()->certificateLoaded()) {
-         QSslConfiguration sslConfig = request.sslConfiguration();
-         sslConfig.setPrivateKey(Settings::self()->sslKey());
-diff --git a/kdwsdl2cpp/src/main.cpp b/kdwsdl2cpp/src/main.cpp
-index 8905b6dc..8ac65f9e 100644
--- a/kdwsdl2cpp/src/main.cpp
-+++ b/kdwsdl2cpp/src/main.cpp
-@@ -67,7 +67,7 @@ static void showHelp(const char *appName)
-             "                            use of the import-path option\n"
-             "  -help-on-missing          When groups or basic types could not be found, display\n"
-             "                            available types (helps with wrong namespaces)\n"
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
-             "  -pkcs12file               Load a certificate from a PKCS12 file. You can use this option\n"
-             "                            if the WSDL file (or files refering to it) is served from a \n"
-             "                            location which require certificate based authentication\n"
-@@ -217,7 +217,7 @@ int main(int argc, char **argv)
-             useLocalFilesOnly = true;
-         } else if (opt == QLatin1String("-help-on-missing")) {
-             helpOnMissing = true;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
-         } else if (opt == QLatin1String("-pkcs12file")) {
-             ++arg;
-             if (!argv[arg]) {
-@@ -288,7 +288,7 @@ int main(int argc, char **argv)
-     Settings::self()->setHelpOnMissing(helpOnMissing);
- 
-     KWSDL::Compiler compiler;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
-     if (!pkcs12File.isEmpty()) {
-         if (!Settings::self()->loadCertificate(pkcs12File, pkcs12Password))
-             return -1;
-diff --git a/kdwsdl2cpp/src/settings.cpp b/kdwsdl2cpp/src/settings.cpp
-index 2e25e01a..db7b8aab 100644
--- a/kdwsdl2cpp/src/settings.cpp
-+++ b/kdwsdl2cpp/src/settings.cpp
-@@ -252,7 +252,7 @@ bool Settings::helpOnMissing() const
-     return mHelpOnMissing;
- }
- 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
- bool Settings::loadCertificate(const QString &certPath, const QString & password)
- {
-     QFile certFile(certPath);
-diff --git a/kdwsdl2cpp/src/settings.h b/kdwsdl2cpp/src/settings.h
-index c5ca846f..f177ea77 100644
--- a/kdwsdl2cpp/src/settings.h
-+++ b/kdwsdl2cpp/src/settings.h
-@@ -87,7 +87,7 @@ public:
-     bool helpOnMissing() const;
-     void setHelpOnMissing(bool b);
- 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
-     bool loadCertificate(const QString & certPath, const QString &password = QString());
-     bool certificateLoaded() const;
-     QSslKey sslKey() const;
-@@ -115,7 +115,7 @@ private:
-     bool mKeepUnusedTypes;
-     bool mUseLocalFilesOnly;
-     bool mHelpOnMissing;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
-     QSslKey mSslKey;
-     QSslCertificate mCertificate;
-     QList<QSslCertificate> mCaCertificates;
-- 
-2.21.1
-
--- a/recipes-kdab/kdsoap/kdsoap/0002-Do-not-export-kdwsdl2cpp-as-target-it-will-fin-it-s-.patch
+++ b/recipes-kdab/kdsoap/kdsoap/0002-Do-not-export-kdwsdl2cpp-as-target-it-will-fin-it-s-.patch
@@ -1,46 +0,0 @@
-From 1d666d5c6ea5e3b1633c6692572f480e86531a37 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 24 May 2020 00:27:46 +0200
-Subject: [PATCH] Do not export kdwsdl2cpp as target - it will fin it's way
- into cross sysroot
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- CMakeLists.txt            | 2 +-
- kdwsdl2cpp/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index addbafe2..3558dd48 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -194,7 +194,7 @@ add_subdirectory(src)
- add_subdirectory(kdwsdl2cpp)
- if(${PROJECT_NAME}_IS_ROOT_PROJECT)
- 
-  export(TARGETS kdsoap kdsoap-server kdwsdl2cpp NAMESPACE KDSoap::
-+  export(TARGETS kdsoap kdsoap-server NAMESPACE KDSoap::
-     FILE "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapTargets.cmake"
-   )
- 
-diff --git a/kdwsdl2cpp/CMakeLists.txt b/kdwsdl2cpp/CMakeLists.txt
-index 82418be3..61c46688 100644
--- a/kdwsdl2cpp/CMakeLists.txt
-+++ b/kdwsdl2cpp/CMakeLists.txt
-@@ -72,7 +72,7 @@ target_link_libraries(kdwsdl2cpp_lib ${QT_LIBRARIES})
- add_executable(kdwsdl2cpp ${SOURCES_EXE})
- target_link_libraries(kdwsdl2cpp kdwsdl2cpp_lib ${QT_LIBRARIES})
- 
-install(TARGETS kdwsdl2cpp EXPORT "KDSoapTargets"
-+install(TARGETS kdwsdl2cpp
-   RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
-   BUNDLE DESTINATION .
- )
-- 
-2.21.1
-
--- a/recipes-kde/apps/analitza/analitza.bb
+++ b/recipes-kde/apps/analitza/analitza.bb
@@ -1,23 +0,0 @@
-SUMMARY = "Add mathematical features to your program"
-LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-    file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
-"
-
-inherit kde-apps
-
-DEPENDS += " \
-    libeigen \
-    qtsvg \
-    qtdeclarative \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "2045657dd16e3f73e3e5e67a7db6cd36c072a85e7957f411a6e348cabc9c469b"
-
-FILES_${PN} += " \
-    ${datadir}/libanalitza \
-    ${OE_QMAKE_PATH_QML} \
-"
--- a/recipes-kde/apps/ark/ark.bb
+++ b/recipes-kde/apps/ark/ark.bb
@@ -2,20 +2,18 @@ SUMMARY = "Ark is KDE's file archiver"
 LICENSE = "GPLv2 & LGPLv3"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-    file://COPYING.icons;md5=78d89b1a70de936b57b7231c94b75ca6 \
+    file://COPYING.icons;md5=6e01bfa20e899e8ad569d5488923cbd2 \
 "

-inherit kde-apps gtk-icon-cache mime mime-xdg
+inherit kde-apps gtk-icon-cache

 DEPENDS += "\
    libarchive \
    karchive \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
+    kconfig \
    kcrash \
    kdbusaddons \
-    kdoctools-native \
+    kdoctools \
    ki18n \
    kiconthemes \
    khtml \
@@ -23,18 +21,22 @@ DEPENDS += "\
    kservice \
    kpty \
    kwidgetsaddons \
-    kitemmodels \
-    sonnet-native \
-"
+" 

 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "fedfb2fb9b9d5d7741e7166d2e13049d48a90501f22d046f9ae01469c5957c0e"
+SRC_URI[md5sum] = "2fe131a931d51603eff33b80d45a73b7"
+SRC_URI[sha256sum] = "c3a67c3a1c377989d567dc9c0228b684dc475612405d3c4638f40d0dbd87bd7c"
 SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"

 FILES_${PN} += " \
+    ${datadir}/appdata \
    ${datadir}/config.kcfg \
    ${datadir}/icons \
-    ${datadir}/mime \
    ${datadir}/k*5 \
    ${OE_QMAKE_PATH_PLUGINS} \
 "
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/kio_dnd/.debug \
+"
--- a/recipes-kde/apps/ark/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
+++ b/recipes-kde/apps/ark/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
@@ -6,43 +6,36 @@ 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(-)
+ app/main.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)

 diff --git a/app/main.cpp b/app/main.cpp
-index 0396400..5924683 100644
+index 4a95063..c3d3a61 100644
 --- a/app/main.cpp
 +++ b/app/main.cpp
-@@ -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::NoExitOnFailure);
+@@ -175,6 +175,7 @@ int main(int argc, char **argv)
+     KDBusService dbusService(KDBusService::Multiple);
 
+     //session restoring
 +#ifndef QT_NO_SESSIONMANAGER
-     // Session restoring.
     if (application.isSessionRestored()) {
         if (!KMainWindow::canBeRestored(1)) {
-@@ -218,8 +219,9 @@ int main(int argc, char **argv)
+             return -1;
+@@ -186,7 +187,9 @@ int main(int argc, char **argv)
             delete window;
             return -1;
         }
-    } else { // New ark window (no restored session).
-
-+    } else // New ark window (no restored session).
+-    } else { //new ark window (no restored session)
+    } else
 +#endif
-+    {
-         // Open any given URLs.
-         const QStringList urls = parser.positionalArguments();
+    { //new ark window (no restored session)
 
+         // open any given URLs
+         const QStringList urls = parser.positionalArguments();
 -- 
-2.5.5
+2.1.0

--- a/recipes-kde/apps/baloo-widgets/baloo-widgets.bb
+++ b/recipes-kde/apps/baloo-widgets/baloo-widgets.bb
@@ -5,23 +5,23 @@ LIC_FILES_CHKSUM = " \
    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "

-inherit kde-apps gettext
+inherit kde-apps cmake-lib

 DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
+    kconfig \
    kio \
    ki18n \
    kservice \
    kfilemetadata \
    baloo \
-"
+    kdelibs4support \
+" 

 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "2fcfb885a5b25e9144fd7e6b9964dc7a394ab009a1f0c361bf7730be756e3132"
+SRC_URI[md5sum] = "2ffa70cbc5259a2f502c6853fb45e240"
+SRC_URI[sha256sum] = "e17e97a5989b0ccfc68a65b093db340bc4962a23ebbcc825f93c975916b77251"
+
+# cross libs / headers
+CMAKE_ALIGN_SYSROOT[1] = "KF5BalooWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5BalooWidgets, -S${includedir}, -S${STAGING_INCDIR}"

-FILES_${PN} += " \
-    ${datadir}/kservices5 \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"
--- a/recipes-kde/apps/bovo/bovo.bb
+++ b/recipes-kde/apps/bovo/bovo.bb
@@ -9,19 +9,19 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps gtk-icon-cache

 DEPENDS += "\
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
+    kcoreaddons \
    kdbusaddons \
-    kdoctools-native \
+    kdoctools \
    kxmlgui \
    libkdegames \
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "2f646d82ae825a2631394a4c515c265eeef4b2e58eefa6e6375d3eb7fd8eeb1a"
+SRC_URI[md5sum] = "6e6bdcf59c591c4499b2c26c05e0702b"
+SRC_URI[sha256sum] = "f346055908a9c3c3670a7cc493e1d5903225d901e1171eeb01b8ddbd1aebda08"

 FILES_${PN} += " \
    ${datadir}/kxmlgui5 \
    ${datadir}/icons \
+    ${datadir}/appdata \
 "
--- a/recipes-kde/apps/calligra/files/0001-Do-not-rely-on-python2.patch
+++ b/recipes-kde/apps/calligra/files/0001-Do-not-rely-on-python2.patch
@@ -1,31 +0,0 @@
-From ac4229126c5e11c21db757565597b5c4ccde062a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 5 Dec 2019 17:23:36 +0100
-Subject: [PATCH] Do not rely on python2
-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>
---
- cmake/modules/KDbCreateSharedDataClasses.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/KDbCreateSharedDataClasses.cmake b/cmake/modules/KDbCreateSharedDataClasses.cmake
-index dc5101d..b764cb3 100644
--- a/cmake/modules/KDbCreateSharedDataClasses.cmake
-+++ b/cmake/modules/KDbCreateSharedDataClasses.cmake
-@@ -23,7 +23,7 @@ macro(KDB_CREATE_SHARED_DATA_CLASSES)
-     list(GET _args 1 PREFIX)
-     list(REMOVE_AT _args 0 1)
-     # message(STATUS "OUTPUT_VAR: ${OUTPUT_VAR} ${_args}")
-    find_package(PythonInterp 2.6)
-+    find_package(PythonInterp)
-     set_package_properties(PythonInterp PROPERTIES DESCRIPTION "Python language interpreter"
-                            URL "https://www.python.org" TYPE REQUIRED
-                            PURPOSE "Required by the Shared Data Classes (SDC) tool")
-- 
-2.21.0
-
--- a/recipes-kde/apps/calligra/kdb_3.2.0.bb
+++ b/recipes-kde/apps/calligra/kdb_3.2.0.bb
@@ -1,24 +0,0 @@
-SUMMARY = "Database Connectivity and Creation Framework"
-HOMEPAGE = "https://community.kde.org/KDb"
-LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
-LIC_FILES_CHKSUM = " \
-    file://COPYING.LIB;md5=a9cc0417b6424a8311f616fa527d0755 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-    file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
-"
-
-inherit kde-apps
-
-DEPENDS += " \
-    icu \
-    kcoreaddons-native \
-    kcoreaddons \
-"
-
-SRC_URI = " \
-    ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
-    file://0001-Do-not-rely-on-python2.patch \
-"
-SRC_URI[sha256sum] = "8f8983bc8d143832dc14bc2003ba6af1af27688e477c0c791fd61445464f2069"
-
-FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
--- a/recipes-kde/apps/calligra/kexi/0001-remove-try_run-by-try_compile-in-breeze-icon-check.patch
+++ b/recipes-kde/apps/calligra/kexi/0001-remove-try_run-by-try_compile-in-breeze-icon-check.patch
@@ -1,46 +0,0 @@
-From 8ed7b093ea4d7ed8e435cb7704e5a30418356796 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 29 Oct 2018 22:40:32 +0100
-Subject: [PATCH] remove try_run by try_compile in breeze-icon-check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-try_run does not work in cross environments
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- cmake/modules/CheckGlobalBreezeIcons.cmake | 18 ------------------
- 1 file changed, 18 deletions(-)
-
-diff --git a/cmake/modules/CheckGlobalBreezeIcons.cmake b/cmake/modules/CheckGlobalBreezeIcons.cmake
-index 9763213..dfff662 100644
--- a/cmake/modules/CheckGlobalBreezeIcons.cmake
-+++ b/cmake/modules/CheckGlobalBreezeIcons.cmake
-@@ -24,21 +24,3 @@ else()
-     set(CheckGlobalBreezeIcons_libs Qt5::Xml)
- endif()
- 
-try_run(RUN_RESULT COMPILE_OK
-    ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp
-    ${CMAKE_SOURCE_DIR}/cmake/modules/CheckGlobalBreezeIcons.cpp
-    COMPILE_DEFINITIONS ${CheckGlobalBreezeIcons_defs}
-    LINK_LIBRARIES ${CheckGlobalBreezeIcons_libs}
-    CMAKE_FLAGS ${CheckGlobalBreezeIcons_flags}
-    COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT
-    RUN_OUTPUT_VARIABLE RUN_OUTPUT)
-
-if(NOT COMPILE_OK)
-    message(FATAL_ERROR "${COMPILE_OUTPUT}")
-endif()
-
-if(NOT ${RUN_RESULT} EQUAL 0)
-    message(FATAL_ERROR "No valid breeze-icons.rcc resource file found. \
-The CheckGlobalBreezeIcons.cmake script returned ${RUN_RESULT}.\n \
-Result: ${RUN_OUTPUT}")
-endif()
-- 
-2.14.4
-
--- a/recipes-kde/apps/calligra/kexi/0002-Add-missing-include-to-fix-build-with-Qt-5.11.patch
+++ b/recipes-kde/apps/calligra/kexi/0002-Add-missing-include-to-fix-build-with-Qt-5.11.patch
@@ -1,30 +0,0 @@
-From e915c66f94921aaf07232a454404e157b65bbb5f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 22 Jun 2018 22:49:17 +0200
-Subject: [PATCH] Add missing include to fix build with Qt 5.11
-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>
---
- src/main/startup/KexiNewProjectAssistant.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/main/startup/KexiNewProjectAssistant.cpp b/src/main/startup/KexiNewProjectAssistant.cpp
-index 59e819a..afacc17 100644
--- a/src/main/startup/KexiNewProjectAssistant.cpp
-+++ b/src/main/startup/KexiNewProjectAssistant.cpp
-@@ -54,6 +54,7 @@
- #include <QProgressBar>
- #include <QFileInfo>
- #include <QFileDialog>
-+#include <QAction>
- 
- class KexiServerDBNamePage : public QWidget, public Ui::KexiServerDBNamePage
- {
-- 
-2.14.3
-
--- a/recipes-kde/apps/calligra/kexi/0003-Fix-build-with-Qt-5.13.patch
+++ b/recipes-kde/apps/calligra/kexi/0003-Fix-build-with-Qt-5.13.patch
@@ -1,30 +0,0 @@
-From b4e62f10ad907cc3db7adac75e0171e88bb9172d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 18 Aug 2019 15:10:02 +0200
-Subject: [PATCH] Fix build with Qt 5.13
-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>
---
- src/plugins/forms/widgets/kexidbdatepicker.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/plugins/forms/widgets/kexidbdatepicker.cpp b/src/plugins/forms/widgets/kexidbdatepicker.cpp
-index 1e0692d..c719964 100644
--- a/src/plugins/forms/widgets/kexidbdatepicker.cpp
-+++ b/src/plugins/forms/widgets/kexidbdatepicker.cpp
-@@ -24,6 +24,7 @@
- 
- #include <QLineEdit>
- #include <QInputMethodEvent>
-+#include <QDate>
- 
- KexiDBDatePicker::KexiDBDatePicker(QWidget *parent)
-         : KDatePicker(parent)
-- 
-2.21.0
-
--- a/recipes-kde/apps/calligra/kexi_3.2.0.bb
+++ b/recipes-kde/apps/calligra/kexi_3.2.0.bb
@@ -1,67 +0,0 @@
-SUMMARY = "Kexi is a visual database applications creator"
-HOMEPAGE = "https://www.calligra.org/kexi/"
-LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2 & BSD"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=8608b1f74c58ebcb11718f46e8619749 \
-    file://COPYING.LIB;md5=7537f2f34ef162007ae9f34b9f256dcb \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
-    file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
-"
-
-inherit kde-apps gtk-icon-cache mime-xdg
-
-DEPENDS += " \
-    qtwebkit \
-    \
-    kdb \
-    kreport \
-    \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    karchive \
-    kcodecs \
-    kconfigwidgets \
-    kguiaddons \
-    ki18n \
-    kiconthemes \
-    kitemviews \
-    kwidgetsaddons \
-    ktextwidgets \
-    kxmlgui \
-    kcompletion \
-    kio \
-    ktexteditor \
-    marble \
-"
-
-SRC_URI = " \
-    ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
-    file://0001-remove-try_run-by-try_compile-in-breeze-icon-check.patch \
-    file://0002-Add-missing-include-to-fix-build-with-Qt-5.11.patch \
-    file://0003-Fix-build-with-Qt-5.13.patch \
-"
-SRC_URI[sha256sum] = "7a813f9ea815a09c1e733d0e7dc879c64eee85f075389e87e6aab99cf0c1c1ff"
-
-do_install_append() {
-    install -d "${D}/${datadir}/pixmaps"
-    install ${S}/src/pics/icons/breeze/apps/48/kexi.svg ${D}/${datadir}/pixmaps/
-}
-
-FILES_${PN} += " \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"
-
-RDEPENDS_${PN} += "breeze-icons-binres"
-
-# REVISIT
-#-- The following RECOMMENDED packages have not been found:
-#
-# * KexiMarble (required version >= 0.19.2), KDE World Globe Widget library, <https://marble.kde.org>
-#   Required by Kexi form map widget
-# * MySQL, MySQL Client Library (libmysqlclient), <http://www.mysql.com>
-#   Required by Kexi MySQL migration driver
-# * PostgreSQL, C API to PostgreSQL (libpq), <http://www.postgresql.org>
-#   Required by Kexi PostgreSQL migration driver
-
--- a/recipes-kde/apps/calligra/kproperty_3.2.0.bb
+++ b/recipes-kde/apps/calligra/kproperty_3.2.0.bb
@@ -1,26 +0,0 @@
-SUMMARY = "Property editing framework with editor widget"
-HOMEPAGE = "https://community.kde.org/KProperty"
-LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
-LIC_FILES_CHKSUM = " \
-    file://COPYING.LIB;md5=3dcc9b0b0118292a0c5d1c18927ef176 \
-    file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
-"
-
-inherit kde-apps
-
-DEPENDS += " \
-    kcoreaddons-native \
-    kcoreaddons \
-    kconfig-native \
-    kconfig \
-    kwidgetsaddons \
-    kguiaddons \
-"
-
-SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "67af0c2d74715957bd5373a6a30589ff0a996cb1d267dfd0538dccaa9a768dfa"
-
-FILES_${PN} += " \
-    ${datadir}/kproperty3 \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"
--- a/recipes-kde/apps/calligra/kreport/0001-Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch
+++ b/recipes-kde/apps/calligra/kreport/0001-Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch
@@ -1,122 +0,0 @@
-From 5d3053ea78b349b81b7a562974ad78f93d169791 Mon Sep 17 00:00:00 2001
-From: Jaroslaw Staniek <staniek@kde.org>
-Date: Tue, 16 Jun 2020 21:59:12 +0200
-Subject: [PATCH] Fix build with GCC 10 (make KReportGroupTracker use C++ file)
-
-BUG:422886
-CCMAIL:adam@piggz.co.uk
-
-FIXED-IN:3.2.1
-
-Upstream-Status: Applied[https://github.com/KDE/kreport/commit/5d3053ea78b349b81b7a562974ad78f93d169791]
---
- src/CMakeLists.txt                            |  5 +---
- .../scripting/KReportGroupTracker.cpp         | 26 +++++++++++++++++++
- src/renderer/scripting/KReportGroupTracker.h  | 25 +++++++++++++++---
- 3 files changed, 48 insertions(+), 8 deletions(-)
- create mode 100644 src/renderer/scripting/KReportGroupTracker.cpp
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1cf0b389..65bcf6e5 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -106,6 +106,7 @@ set(kreport_TARGET_INCLUDE_DIRS
- 
- if(KREPORT_SCRIPTING)
-     list(APPEND kreport_LIB_SRCS
-+        renderer/scripting/KReportGroupTracker.cpp
-         renderer/scripting/KReportScriptHandler.cpp
-         renderer/scripting/KReportScriptConstants.cpp
-         renderer/scripting/KReportScriptDebug.cpp
-@@ -133,10 +134,6 @@ if(KREPORT_SCRIPTING)
-         items/text/KReportScriptText.cpp
-     )
- 
-    qt_wrap_cpp(KReport kreport_LIB_SRCS
-        renderer/scripting/KReportGroupTracker.h
-    )
-
-     list(APPEND kreport_INCLUDE_DIRS
-         ${CMAKE_CURRENT_SOURCE_DIR}/renderer/scripting
-     )
-diff --git a/src/renderer/scripting/KReportGroupTracker.cpp b/src/renderer/scripting/KReportGroupTracker.cpp
-new file mode 100644
-index 00000000..9274d4a5
--- /dev/null
-+++ b/src/renderer/scripting/KReportGroupTracker.cpp
-@@ -0,0 +1,26 @@
-+/* This file is part of the KDE project
-+ * Copyright (C) 2015 by Adam Pigg (adam@piggz.co.uk)
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include "KReportGroupTracker.h"
-+
-+KReportGroupTracker::KReportGroupTracker()
-+{
-+}
-+
-+KReportGroupTracker::~KReportGroupTracker()
-+{
-+}
-diff --git a/src/renderer/scripting/KReportGroupTracker.h b/src/renderer/scripting/KReportGroupTracker.h
-index e434e05a..4c0852ea 100644
--- a/src/renderer/scripting/KReportGroupTracker.h
-+++ b/src/renderer/scripting/KReportGroupTracker.h
-@@ -1,3 +1,20 @@
-+/* This file is part of the KDE project
-+ * Copyright (C) 2015 by Adam Pigg (adam@piggz.co.uk)
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
- #ifndef KREPORTGROUPTRACKER_H
- #define KREPORTGROUPTRACKER_H
- 
-@@ -7,16 +24,16 @@
- /*!
-  * @brief Keeps track of groups as the data for the group changes
-  */
-class KREPORT_EXPORT KReportGroupTracker : public QObject {
-+class KREPORT_EXPORT KReportGroupTracker : public QObject
-+{
-     Q_OBJECT
- 
- protected:
-    KReportGroupTracker() {}
-    ~KReportGroupTracker() override{}
-+    KReportGroupTracker();
-+    ~KReportGroupTracker() override;
- 
- public:
-     Q_SLOT virtual void setGroupData(const QMap<QString, QVariant> &groupData) = 0;
- };
- 
- #endif // KREPORTGROUPTRACKER_H
-
-- 
-2.26.2
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andreas Müller	b6b5e326f8	Merge pull request #11 from Tarnyko/jethro kactivites: fix build	2016-06-11 22:00:31 +02:00
Andreas Müller	a7f73b678f	Merge pull request #12 from Tarnyko/jethro2 kmix: initial add 15.12.0	2016-06-11 22:00:11 +02:00
Manuel Bachmann	f9a61af624	kmix: initial add 15.12.0 KMix is KDE's audio mixer, and has recently been ported to KDE Frameworks 5. Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>	2016-06-07 15:15:47 +00:00
Manuel Bachmann	392a9911c4	kactivites: fix build kactivities was not compiling, due to "desktopfileparser" trying to locate "kfileitemactionplugin.desktop" in the target's default /usr/*/share directories. Add the host datadir to fix this. Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>	2016-06-07 13:29:29 +00:00
Andreas Müller	e6d01af499	sonnet: add PACKAGECONFIG for hunspell disabled by default Came up when building with meta-office in layers. A patch moving hunspell to meta-oe is pending. Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>	2016-01-30 00:23:28 +01:00
Andreas Müller	846605a482	libqtxdg: handle application's PATH in desktop files Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>	2016-01-19 09:23:09 +01:00