sddm-autologin.pam: remove pam_permit.so

Not the best idea to just trust what people send... Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
qtiohelper: upgrade 0.3.994+ -> 0.4.0+
2020-03-05 22:34:57 +01:00 · 2019-10-24 11:46:09 +02:00 · 2019-01-04 21:04:53 +01:00 · 2019-01-04 21:04:43 +01:00 · 2019-01-04 21:04:32 +01:00 · 2019-01-01 20:53:57 +01:00
874 changed files with 26653 additions and 9295 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@gmail.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 successive 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 accepted 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/classes/cmake_auto_align_paths.bbclass
+++ b/classes/cmake_auto_align_paths.bbclass
@@ -0,0 +1,14 @@
+CMAKE_ALIGN_FILES_FIND ??= "*Targets.cmake"
+
+do_configure_append() {
+    # remove absolute paths from exported cmake files
+    for f in `find ${B} -name '${CMAKE_ALIGN_FILES_FIND}'` ${CMAKE_ADD_ALIGN_FILES} ; do
+        sed -i 's:${STAGING_INCDIR_NATIVE}:${includedir}:g' "$f"
+        sed -i 's:${STAGING_INCDIR}:${includedir}:g' "$f"
+        sed -i 's:${STAGING_LIBDIR_NATIVE}:${libdir}:g' "$f"
+        sed -i 's:${STAGING_LIBDIR}:${libdir}:g' "$f"
+        sed -i 's:${STAGING_BASELIBDIR_NATIVE}:${base_libdir}:g' "$f"
+        sed -i 's:${STAGING_BASELIBDIR}:${base_libdir}:g' "$f"
+    done
+}
+
--- a/classes/cmake_extra_sanity.bbclass
+++ b/classes/cmake_extra_sanity.bbclass
@@ -1,15 +1,15 @@
 inherit cmake_sysroot

-# do_install:append:class-cross does not work so hack
-do_install:prepend:class-native() {
+# do_install_append_class-cross does not work so hack
+do_install_prepend_class-native() {
    no_staging_check=true
 }

-do_install:prepend:class-nativesdk() {
+do_install_prepend_class-nativesdk() {
    no_staging_check=true
 }

-do_install:append() {
+do_install_append() {
    # avoid strange prefixing seen often
    old_dir=`pwd`
    cd ${D}
@@ -22,7 +22,7 @@ do_install:append() {
    # TBD: -> oe-core (1st part - genarated sources - should work with autotools too)
    if [ x = x$no_staging_check ] ; then
        error=
-        # check for generated sources
+        # 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!"
@@ -40,7 +40,7 @@ do_install:append() {
        done

        if [ x != x$error ] ; then
-            bbfatal "One or more files contain links to build host sysroot ${STAGING_DIR_HOST}(-native)"
+            bbfatal "One or more files contain links to build host sysroot ${STAGING_DIR}"
        fi
    fi
 }
--- a/classes/cmake_lib.bbclass
+++ b/classes/cmake_lib.bbclass
@@ -42,16 +42,16 @@
 #
 # Native overriding:
 #
-#   CMAKE_ALIGN_SYSROOT:class-native[<unique-id>] = "<dir>, <search>, <replace>"
+#   CMAKE_ALIGN_SYSROOT_class-native[<unique-id>] = "<dir>, <search>, <replace>"
 #
 # Native extended recipe -> no native alignement:
 #
-#   CMAKE_ALIGN_SYSROOT:class-native[<unique-id>] = "ignore"
+#   CMAKE_ALIGN_SYSROOT_class-native[<unique-id>] = "ignore"
 #   CMAKE_ALIGN_SYSROOT[<unique-id>] = "<dir>, <search>, <replace>"
 #
 # Native extended recipe -> no cross alignement:
 #
-#   CMAKE_ALIGN_SYSROOT:class-native[<unique-id>] = "<dir>, <search>, <replace>"
+#   CMAKE_ALIGN_SYSROOT_class-native[<unique-id>] = "<dir>, <search>, <replace>"
 #   CMAKE_ALIGN_SYSROOT[<unique-id>] = "ignore"
 #

@@ -63,7 +63,7 @@ SSTATE_SYSROOT = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}"
 def get_align_flags(d):
    ret = {}
    if bb.data.inherits_class('native', d):
-        ret = d.getVarFlags("CMAKE_ALIGN_SYSROOT:class-native") or {}
+        ret = d.getVarFlags("CMAKE_ALIGN_SYSROOT_class-native") or {}
    if ret == {}:
        ret = d.getVarFlags("CMAKE_ALIGN_SYSROOT") or {}
    return ret
@@ -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(",")
@@ -95,8 +95,8 @@ python () {
 # 2. 3. in cmake_sysroot

 # 4. Handle CMAKE_ALIGN_SYSROOT
-python do_populate_sysroot:append() {
-    pn = d.getVar('PN')
+python do_populate_sysroot_append() {
+    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 +107,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 +144,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 +157,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:
@@ -201,10 +201,10 @@ python do_populate_sysroot:append() {
                    bb.warn("No cmake replacements performed in %s for CMAKE_ALIGN_SYSROOT[%s]" % (pn, flag))
 }

-do_populate_sysroot[vardeps] += "CMAKE_ALIGN_SYSROOT CMAKE_ALIGN_SYSROOT:class-native"
+do_populate_sysroot[vardeps] += "CMAKE_ALIGN_SYSROOT CMAKE_ALIGN_SYSROOT_class-native"

 # change of CMAKE_ALIGN_SYSROOT causes configure rerun which currently seems
 # the only way to force a rebuild at change of CMAKE_ALIGN_SYSROOT for recipes
 # depending on this recipe

-sysroot_cleansstate[vardeps] += "CMAKE_ALIGN_SYSROOT CMAKE_ALIGN_SYSROOT:class-native"
+sysroot_cleansstate[vardeps] += "CMAKE_ALIGN_SYSROOT CMAKE_ALIGN_SYSROOT_class-native"
--- a/classes/cmake_qt5_extra.bbclass
+++ b/classes/cmake_qt5_extra.bbclass
@@ -3,3 +3,5 @@ inherit cmake_qt5 cmake_extra_sanity
 EXTRA_OECMAKE += " \
    -DCMAKE_QT5_EX_PATH_HOST_HEADERS=${STAGING_INCDIR} \
 "
+
+FILES_${PN}-dev += "${datadir}/cmake ${libdir}/cmake"
--- a/classes/cmake_sysroot.bbclass
+++ b/classes/cmake_sysroot.bbclass
@@ -4,14 +4,14 @@
 CMAKEINSTALLED = "${WORKDIR}/staged_cmake_files"

 # 1. remove tmp file from last build
-python do_populate_sysroot:prepend() {
-    tmpfile = d.getVar('CMAKEINSTALLED')
+python do_populate_sysroot_prepend() {
+    tmpfile = d.getVar('CMAKEINSTALLED', True)
    if os.path.isfile(tmpfile):
        os.remove(tmpfile)
 }

 # 2. keep cmake files staged to sysroot
-sysroot_stage_dir:append() {
+sysroot_stage_dir_append() {
    # avoid doubles causing double replacement
    for file in `find $dest -name '*.cmake'`; do
        if ! grep -q "$file" ${CMAKEINSTALLED} ; then
--- a/classes/kde-apps.bbclass
+++ b/classes/kde-apps.bbclass
@@ -1,7 +1,7 @@
 inherit kde-base

-KDE_APP_VERSION = "22.08.3"
+KDE_APP_VERSION = "18.08.0"

-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"
+RRECOMMENDS_${PN} += "qtbase-plugins"
--- a/classes/kde-base.bbclass
+++ b/classes/kde-base.bbclass
@@ -1,27 +1,31 @@
-DEPENDS:prepend:class-nativesdk = "nativesdk-qtbase "
-DEPENDS:prepend:class-target = "qtbase "
-# Do not pin hard for extra-cmake-modules itself
-DEPENDS += "extra-cmake-modules-native "
+DEPENDS += "qtbase extra-cmake-modules-native"

 KDE_MIRROR = "http://download.kde.org"

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

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

-DEPENDS += "libxml2-native"
-
-do_compile:prepend() {
+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 ${libexecdir}/kf5"
+FILES_${PN}-dev += "${libdir}/cmake"
+FILES_${PN}-dbg += "${libdir}/plugins/kf5/.debug ${libexecdir}/kf5/.debug"

 EXTRA_OECMAKE += " \
    -DECM_MKSPECS_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \
@@ -33,9 +37,9 @@ EXTRA_OECMAKE += " \
    -DKDE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} \
 "

-FILES:${PN} += " \
+FILES_${PN} += " \
    ${datadir}/appdata \
    ${datadir}/metainfo \
 "

-FILES:${PN}-dev += "${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs"
+FILES_${PN}-dev += "${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs"
--- a/classes/kde-kf5-porting-aids.bbclass
+++ b/classes/kde-kf5-porting-aids.bbclass
@@ -1,3 +1,3 @@
 inherit kde-kf5

-SRC_URI = "${KDE_MIRROR}/stable/frameworks/${KF5_VERSION_DIR}/portingAids/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.49/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.101.0"
+KF5_VERSION = "5.49.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.49/${BPN}-${PV}.tar.xz"
--- a/classes/kde-plasma.bbclass
+++ b/classes/kde-plasma.bbclass
@@ -1,8 +1,8 @@
 inherit kde-base

-PLASMA_VERSION = "5.26.2"
+PLASMA_VERSION = "5.13.5"

-SRC_URI = "${KDE_MIRROR}/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/stable/plasma/${PV}/${BPN}-${PV}.tar.xz"

 DEPENDS += " \
    kwayland \
--- a/classes/liri.bbclass
+++ b/classes/liri.bbclass
@@ -1,23 +1,14 @@
 LIRI_GIT_BRANCH ?= "develop"

-SRC_URI = "git://github.com/lirios/${@'${BPN}'.replace('liri-', '')}.git;branch=${LIRI_GIT_BRANCH};protocol=https"
+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 \
-    qtquickcontrols2 \
-"
+DEPENDS += "qtbase qtdeclarative extra-cmake-modules-native"

 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} \
+    -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \
+    -DECM_MKSPECS_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \
+    -DPLUGIN_INSTALL_DIR=${OE_QMAKE_PATH_PLUGINS} \
+    -DQT_PLUGIN_INSTALL_DIR=${OE_QMAKE_PATH_PLUGINS} \
 "
--- a/classes/lv2-postinst-helper.bbclass
+++ b/classes/lv2-postinst-helper.bbclass
@@ -0,0 +1,53 @@
+# Helper class to handle ontarget-postinst creation of lv2 turtle files
+
+# File created during compile usually. To create this file makefiles have to be
+# aligned - see do_configure_prepend at zynaddsubfx or distrho-ports. The file
+# is expected with the following format
+# lv2-ttl-generator <path>/plugin.so
+LV2-TURTLE-BUILD-DATA = "${WORKDIR}/lv2-ttl-generator-data"
+
+# E.g zynaddsubfx needs to create dummy lv2 turtle files to keep install sane.
+# To delete them automatically (see below) the contain a dummy string:
+LV2-DUMMY-TURTLE-STR = "lv2-dummy-turtle-string"
+
+# To make ontarget postinst/prerm happen, the names of all plugins with their
+# paths as installed on target a stored in a file called lv2-postinst-manifest
+LV2-POSTINST-MANIFEST = "${datadir}/${BPN}/lv2-postinst-manifest"
+
+do_install_append() {
+    # remove dummy lv2-turtles again
+    cd ${D}/${libdir}/lv2
+    for tfile in `grep -rl ${LV2-DUMMY-TURTLE-STR}`; do
+        rm $tfile
+    done
+
+    # create postinst manifest
+    install -d ${D}`dirname ${LV2-POSTINST-MANIFEST}`
+    for sofile in `cat ${LV2-TURTLE-BUILD-DATA} | awk '{ print $2 }'`; do
+        sofile=`basename $sofile`
+        installed=`find ${D}${libdir}/lv2 -name $sofile | sed 's|${D}||g'`
+        echo $installed >> ${D}${LV2-POSTINST-MANIFEST}
+    done
+}
+
+
+pkg_postinst_ontarget_${PN}() {
+    oldpath=`pwd`
+    for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
+        cd `dirname "$sofile"`
+        lv2-ttl-generator "$sofile"
+    done
+    cd $oldpath
+}
+
+pkg_prerm_${PN}() {
+    for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
+        path=`dirname "$sofile"`
+        for turtle in `find $path -name '*.ttl'`; do
+            rm $turtle
+        done
+    done
+}
+
+RDEPENDS_${PN} += "lv2-ttl-generator"
+
--- a/classes/lxqt.bbclass
+++ b/classes/lxqt.bbclass
@@ -1,8 +1,15 @@
-inherit cmake_qt5_extra pkgconfig
+inherit cmake_qt5_extra

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

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

-SRC_URI = "git://github.com/lxqt/${BPN}.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/lxde/${BPN}.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += " \
+    -DPULL_TRANSLATIONS=Off \
+    -DCLEAN_TRANSLATIONS=Off \
+"
+
+FILES_${PN}-dev += "${datadir}/cmake ${libdir}/cmake"
--- a/classes/qemu-ext.bbclass
+++ b/classes/qemu-ext.bbclass
@@ -0,0 +1,22 @@
+inherit qemu
+
+DEPENDS += "qemu-native"
+
+# This is an extended/modified qemu.bbclass tailored four our needs:
+#
+# * add qemu-native to DEPENDS: we can do that because there is no
+#   introspection/interception delayed qemu usage here
+# * The executable binary is set by absolute path: oe-core's qemu.bbclass
+#   expects it in sysroot. Here we usually run binaries in builddir which are
+#   not yet installed.
+# * A recipe can set an extra library path in 'QEMU_EXTRA_LIBDIR'. This path is
+#   an absolute path.
+
+def qemu_run_binary_local(data, rootfs_path, binary):
+    libdir = rootfs_path + data.getVar("libdir", False)
+    base_libdir = rootfs_path + data.getVar("base_libdir", False)
+    extra_libdir = data.getVar("QEMU_EXTRA_LIBDIR", False)
+    if extra_libdir:
+        return qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir, extra_libdir]) + binary
+    else:
+        return qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir]) + binary
--- a/classes/qt5-translation.bbclass
+++ b/classes/qt5-translation.bbclass
@@ -5,32 +5,34 @@ DEPENDS += "qttools-native"
 # default location
 QT_TRANSLATION_FILES ??= "${datadir}/*/translations/*.qm ${datadir}/*/translations/*/*.qm ${datadir}/*/translations/*/*/*.qm"

-FILES:${PN}-locale = "${datadir}/*/translations"
+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):
@@ -39,30 +41,30 @@ python qt_do_split_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))
-        d.setVar('RPROVIDES:' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
-        d.setVar('SUMMARY:' + pkg, '%s - %s translations' % (summary, l))
-        d.setVar('DESCRIPTION:' + pkg, '%s  This package contains language translation files for the %s locale.' % (description, l))
+        d.setVar('FILES_' + pkg, files )
+        d.setVar('RRECOMMENDS_' + pkg, '%svirtual-locale-%s' % (mlprefix, ln))
+        d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
+        d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l))
+        d.setVar('DESCRIPTION_' + pkg, '%s  This package contains language translation files for the %s locale.' % (description, l))
        if locale_section:
-            d.setVar('SECTION:' + pkg, 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 "
+PACKAGESPLITFUNCS_prepend = "qt_do_split_locales "

--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -6,26 +6,17 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*.bb ${LAYERD
 # appends
 BBFILES += "${LAYERDIR}/extends-*/*.bb ${LAYERDIR}/extends-*/*.bbappend"

-BBFILES_DYNAMIC += " \
-    clang-layer:${LAYERDIR}/extends-meta-clang/*/*.bb \
-"
-
 BBFILE_COLLECTIONS += "meta-qt5-extra"
 BBFILE_PATTERN_meta-qt5-extra := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-qt5-extra = "20"

-LAYERDEPENDS_meta-qt5-extra = " \
-    core \
-    qt5-layer \
-    openembedded-layer \
-    networking-layer \
-    multimedia-layer \
-    gnome-layer \
-    meta-python \
-"
-LAYERSERIES_COMPAT_meta-qt5-extra = "honister kirkstone langdale nanbield scarthgap styhead walnascar"
+LAYERDEPENDS_meta-qt5-extra = "core qt5-layer openembedded-layer networking-layer multimedia-layer"
+LAYERSERIES_COMPAT_meta-qt5-extra = "sumo"

 LICENSE_PATH += "${LAYERDIR}/files/licenses"

 # required for fluxbox - supplied by e.g fedora glibc-common
 HOSTTOOLS_NONFATAL += "gencat"
+
+
+PREFERRED_PROVIDER_zyn = "${@bb.utils.contains("DISTRO_FEATURES", "opengl", "zyn-fusion", "zynaddsubfx",d)}"
--- a/extends-meta-clang/recipes-kde/clazy.bb
+++ b/extends-meta-clang/recipes-kde/clazy.bb
@@ -1,24 +0,0 @@
-SUMMARY = "Qt oriented code checker based on clang framework"
-LICENSE = "LGPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING-LGPL2.txt;md5=d31701979430eba03ad0eac6e517dec3"
-
-DEPENDS = "clang"
-
-inherit kde-base
-
-PV = "1.11"
-SRC_URI += " \
-    file://0001-clazy-no-rpath.patch \
-    file://0002-Build-fixes-for-LLVM_Clang_15.0.0.patch \
-"
-SRC_URI[sha256sum] = "66165df33be8785218720c8947aa9099bae6d06c90b1501953d9f95fdfa0120a"
-
-EXTRA_OECMAKE += " \
-    -DREGEX_RUN_RESULT=0 \
-    -DFILESYSTEM_RUN_RESULT=0 \
-    -DFILESYSTEM_RUN_RESULT__TRYRUN_OUTPUT=0 \
-"
-
-FILES:${PN} += "${libdir}/ClazyPlugin.so"
-
-BBCLASSEXTEND += "native nativesdk"
--- a/extends-meta-clang/recipes-kde/clazy/0001-clazy-no-rpath.patch
+++ b/extends-meta-clang/recipes-kde/clazy/0001-clazy-no-rpath.patch
@@ -1,33 +0,0 @@
-From ab4ef9168d79e5196f4b010bbab9368716509354 Mon Sep 17 00:00:00 2001
-From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
-Date: Sat, 1 May 2021 20:31:45 -0400
-Subject: [PATCH] clazy no rpath
-
---
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 46173fa..c893590 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -237,6 +237,7 @@ if (NOT CLAZY_BUILD_WITH_CLANG)
-   endif()
- 
-   # rpath
-+if(FALSE)  # Disable rpath
-   set(CMAKE_SKIP_BUILD_RPATH FALSE)
-   set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-   set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-@@ -245,6 +246,7 @@ if (NOT CLAZY_BUILD_WITH_CLANG)
-   if("${isSystemDir}" STREQUAL "-1")
-     set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-   endif("${isSystemDir}" STREQUAL "-1")
-+endif()
- 
-   # Build clazy-standalone
-   add_executable(clazy-standalone ${CLAZY_STANDALONE_SRCS})
-- 
-2.30.2
-
-
--- a/extends-meta-clang/recipes-kde/clazy/0002-Build-fixes-for-LLVM_Clang_15.0.0.patch
+++ b/extends-meta-clang/recipes-kde/clazy/0002-Build-fixes-for-LLVM_Clang_15.0.0.patch
@@ -1,220 +0,0 @@
-From 20fca52da739ebefa47e35f6b338bb99a0da3cfe Mon Sep 17 00:00:00 2001
-From: Cristian Adam <cristian.adam@qt.io>
-Date: Tue, 6 Sep 2022 16:30:02 +0200
-Subject: [PATCH] Build fixes for LLVM/Clang 15.0.0
-
-Change-Id: Icc39a0b1acffb5a6a4798b1259d8ad4e7dd47bc5
---
- CMakeLists.txt                              |  6 ++++++
- src/PreProcessorVisitor.cpp                 |  2 +-
- src/PreProcessorVisitor.h                   |  2 +-
- src/SourceCompatibilityHelpers.h            | 15 +++++++++++++++
- src/Utils.cpp                               |  3 ++-
- src/checkbase.cpp                           |  4 ++--
- src/checkbase.h                             |  4 ++--
- src/checks/manuallevel/qt6-fwd-fixes.cpp    |  2 +-
- src/checks/manuallevel/qt6-fwd-fixes.h      |  2 +-
- src/checks/manuallevel/qt6-header-fixes.cpp |  2 +-
- src/checks/manuallevel/qt6-header-fixes.h   |  2 +-
- 11 files changed, 33 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c780b0d..100135af 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -114,6 +114,10 @@ else()
-     set(clang_tooling_refactoring_lib clangToolingRefactor)
- endif()
- 
-+if (${LLVM_VERSION} VERSION_GREATER_EQUAL "15.0.0")
-+  set(clang_support_lib clangSupport)
-+endif()
-+
- macro(link_to_llvm name is_standalone)
-   if (CLAZY_LINK_CLANG_DYLIB)
-     target_link_libraries(${name} clang-cpp)
-@@ -131,6 +135,7 @@ macro(link_to_llvm name is_standalone)
- 
-       target_link_libraries(${name} ${clang_lib})
-     endforeach()
-+    target_link_libraries(${name} ${clang_support_lib})
-     target_link_libraries(${name} clangTooling)
-     target_link_libraries(${name} clangToolingCore)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-@@ -302,6 +307,7 @@ else()
-     clangFrontendTool
-     clangRewrite
-     clangSerialization
-+    ${clang_support_lib}
-     clangTooling
-     clangStaticAnalyzerCheckers
-     clangStaticAnalyzerCore
-diff --git a/src/PreProcessorVisitor.cpp b/src/PreProcessorVisitor.cpp
-index 5e63a131..5fdfe5f3 100644
--- a/src/PreProcessorVisitor.cpp
-+++ b/src/PreProcessorVisitor.cpp
-@@ -185,7 +185,7 @@ void PreProcessorVisitor::MacroExpands(const Token &MacroNameTok, const MacroDef
- 
- void PreProcessorVisitor::InclusionDirective (clang::SourceLocation, const clang::Token &,
-                                               clang::StringRef FileName, bool IsAngled, clang::CharSourceRange FilenameRange,
-                                              const clang::FileEntry *, clang::StringRef, clang::StringRef,
-+                                              clazy::OptionalFileEntryRef, clang::StringRef, clang::StringRef,
-                                               const clang::Module *, clang::SrcMgr::CharacteristicKind)
- {
-    if (m_ci.getPreprocessor().isInPrimaryFile() && !clazy::endsWith(FileName.str(), ".moc")) {
-diff --git a/src/PreProcessorVisitor.h b/src/PreProcessorVisitor.h
-index dc80ff36..1bb17a5e 100644
--- a/src/PreProcessorVisitor.h
-+++ b/src/PreProcessorVisitor.h
-@@ -71,7 +71,7 @@ class PreProcessorVisitor
-                       clang::SourceRange range, const clang::MacroArgs *) override;
-     void InclusionDirective (clang::SourceLocation HashLoc, const clang::Token &IncludeTok,
-                              clang::StringRef FileName, bool IsAngled, clang::CharSourceRange FilenameRange,
-                             const clang::FileEntry *File, clang::StringRef SearchPath, clang::StringRef RelativePath,
-+                             clazy::OptionalFileEntryRef File, clang::StringRef SearchPath, clang::StringRef RelativePath,
-                              const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
- private:
-     std::string getTokenSpelling(const clang::MacroDefinition &) const;
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4ea923a2..c1a23a4b 100644
--- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -144,6 +144,21 @@ inline bool contains_lower(clang::StringRef haystack, clang::StringRef needle)
- #endif
- }
- 
-+#if LLVM_VERSION_MAJOR >= 15
-+using OptionalFileEntryRef = clang::Optional<clang::FileEntryRef>;
-+#else
-+using OptionalFileEntryRef = const clang::FileEntry*;
-+#endif
-+
-+inline bool isAscii(clang::StringLiteral *lt)
-+{
-+#if LLVM_VERSION_MAJOR >= 15
-+    return lt->isOrdinary();
-+#else
-+    return lt->isAscii();
-+#endif
-+}
-+
- }
- 
- #endif
-diff --git a/src/Utils.cpp b/src/Utils.cpp
-index 3cdf7876..70e0577c 100644
--- a/src/Utils.cpp
-+++ b/src/Utils.cpp
-@@ -25,6 +25,7 @@
- #include "Utils.h"
- #include "StringUtils.h"
- #include "HierarchyUtils.h"
-+#include "SourceCompatibilityHelpers.h"
- #include "StmtBodyRange.h"
- #include "clazy_stl.h"
- 
-@@ -670,7 +671,7 @@ const CXXRecordDecl *Utils::recordForMemberCall(CXXMemberCallExpr *call, string
- bool Utils::isAscii(StringLiteral *lt)
- {
-     // 'é' for some reason has isAscii() == true, so also call containsNonAsciiOrNull
-    return lt && lt->isAscii() && !lt->containsNonAsciiOrNull();
-+    return lt && clazy::isAscii(lt) && !lt->containsNonAsciiOrNull();
- }
- 
- bool Utils::isInDerefExpression(Stmt *s, ParentMap *map)
-diff --git a/src/checkbase.cpp b/src/checkbase.cpp
-index f5936dfd..dcc7c999 100644
--- a/src/checkbase.cpp
-+++ b/src/checkbase.cpp
-@@ -105,7 +105,7 @@ void ClazyPreprocessorCallbacks::MacroDefined(const Token &macroNameTok, const M
- }
- 
- void ClazyPreprocessorCallbacks::InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
-                                                    clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                                                    clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                                                     clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
- {
-     check->VisitInclusionDirective(HashLoc, IncludeTok, FileName, IsAngled, FilenameRange, File, SearchPath, RelativePath, Imported, FileType);
-@@ -182,7 +182,7 @@ void CheckBase::VisitEndif(SourceLocation, SourceLocation)
- }
- 
- void CheckBase::VisitInclusionDirective(clang::SourceLocation , const clang::Token &, clang::StringRef , bool ,
-                        clang::CharSourceRange , const clang::FileEntry *, clang::StringRef ,
-+                        clang::CharSourceRange , clazy::OptionalFileEntryRef, clang::StringRef ,
-                         clang::StringRef , const clang::Module *, clang::SrcMgr::CharacteristicKind )
- {
-     // Overriden in derived classes
-diff --git a/src/checkbase.h b/src/checkbase.h
-index c5db2daf..02f6a6bf 100644
--- a/src/checkbase.h
-+++ b/src/checkbase.h
-@@ -91,7 +91,7 @@ class ClazyPreprocessorCallbacks
-     void Else(clang::SourceLocation loc, clang::SourceLocation ifLoc) override;
-     void Endif(clang::SourceLocation loc, clang::SourceLocation ifLoc) override;
-     void InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
-                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
- private:
-     CheckBase *const check;
-@@ -151,7 +151,7 @@ class CheckBase
-     virtual void VisitElse(clang::SourceLocation loc, clang::SourceLocation ifLoc);
-     virtual void VisitEndif(clang::SourceLocation loc, clang::SourceLocation ifLoc);
-     virtual void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
-                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType);
- 
-     void enablePreProcessorCallbacks();
-diff --git a/src/checks/manuallevel/qt6-fwd-fixes.cpp b/src/checks/manuallevel/qt6-fwd-fixes.cpp
-index 83bf81ee..c87d9ca0 100644
--- a/src/checks/manuallevel/qt6-fwd-fixes.cpp
-+++ b/src/checks/manuallevel/qt6-fwd-fixes.cpp
-@@ -166,7 +166,7 @@ void Qt6FwdFixes::VisitDecl(clang::Decl *decl)
- }
- 
- void Qt6FwdFixes::VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
-                        clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                        clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                         clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
- {
-     auto current_file = m_sm.getFilename(HashLoc);
-diff --git a/src/checks/manuallevel/qt6-fwd-fixes.h b/src/checks/manuallevel/qt6-fwd-fixes.h
-index 37b59d95..bb928ba6 100644
--- a/src/checks/manuallevel/qt6-fwd-fixes.h
-+++ b/src/checks/manuallevel/qt6-fwd-fixes.h
-@@ -47,7 +47,7 @@ class Qt6FwdFixes
-     explicit Qt6FwdFixes(const std::string &name, ClazyContext *context);
-     void VisitDecl(clang::Decl *decl) override;
-     void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
-                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
-     bool m_including_qcontainerfwd = false;
-     std::set<clang::StringRef> m_qcontainerfwd_included_in_files;
-diff --git a/src/checks/manuallevel/qt6-header-fixes.cpp b/src/checks/manuallevel/qt6-header-fixes.cpp
-index d458b77c..aaa28093 100644
--- a/src/checks/manuallevel/qt6-header-fixes.cpp
-+++ b/src/checks/manuallevel/qt6-header-fixes.cpp
-@@ -270,7 +270,7 @@ Qt6HeaderFixes::Qt6HeaderFixes(const std::string &name, ClazyContext *context)
- }
- 
- void Qt6HeaderFixes::VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
-                        clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                        clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                         clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
- {
-     if (shouldIgnoreFile(HashLoc))
-diff --git a/src/checks/manuallevel/qt6-header-fixes.h b/src/checks/manuallevel/qt6-header-fixes.h
-index ae09f7ad..8ffbb100 100644
--- a/src/checks/manuallevel/qt6-header-fixes.h
-+++ b/src/checks/manuallevel/qt6-header-fixes.h
-@@ -46,7 +46,7 @@ class Qt6HeaderFixes
- public:
-     explicit Qt6HeaderFixes(const std::string &name, ClazyContext *context);
-     void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
-                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
- 
- };
--- a/extends-meta-clang/recipes-kde/kdevelop.bb
+++ b/extends-meta-clang/recipes-kde/kdevelop.bb
@@ -1,112 +0,0 @@
-SUMMARY = "Cross-platform IDE for C, C++, Python, QML/JavaScript and PHP"
-LICENSE = "BSD-2-Clause & BSD-3-Clause & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & GPL-3.0-or-later & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only & MIT"
-LIC_FILES_CHKSUM = " \
-    file://LICENSES/BSD-2-Clause.txt;md5=4e290b17e3e05732730de37b44abef90 \
-    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
-    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
-    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
-    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
-    file://LICENSES/GPL-3.0-or-later.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
-    file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031294a26b98c \
-    file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
-    file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \
-    file://LICENSES/LGPL-2.1-or-later.txt;md5=147a320ed8b16b036829a0c71d424153 \
-    file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \
-    file://LICENSES/MIT.txt;md5=4dd71a82d66fd9e3ca0cc65b8be370c0 \
-"
-
-inherit kde-apps gettext pkgconfig gtk-icon-cache mime mime-xdg bash-completion
-
-DEPENDS += " \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdevelop-pg-qt-native \
-    kdoctools-native \
-    ki18n-native \
-    kpackage-native \
-    kcmutils-native \
-    shared-mime-info-native \
-    \
-    qtbase \
-    qtdeclarative \
-    qtwebengine \
-    grantlee \
-    libkomparediff2 \
-    libksysguard \
-    karchive \
-    kcmutils \
-    kconfig \
-    kcrash \
-    kdeclarative \
-    kdevelop-pg-qt \
-    kguiaddons \
-    kiconthemes \
-    kitemmodels \
-    kitemviews \
-    kjobwidgets \
-    kio \
-    knewstuff \
-    knotifications \
-    knotifyconfig \
-    kparts \
-    krunner \
-    kservice \
-    ktexteditor \
-    kxmlgui \
-    kwindowsystem \
-    okteta \
-    purpose \
-    threadweaver \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "3c3baf212fd6ffd7ccb5b0796c2b43e252235c25275979c1570c44f80821f9d6"
-
-EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
-
-do_configure:append() {
-    # although the name is missleading I still love cmake_extra_sanity.bbclass...
-    sed -i \
-        -e 's:${STAGING_DIR_NATIVE}::g' \
-        -e 's:${STAGING_DIR_HOST}::g' \
-        ${B}/plugins/clang/libclang_include_path.h
-}
-
-# Yeah nasty but...
-FILES_SOLIBSDEV = "${libdir}/libKDevC*so ${libdir}/libKDevPlatform*so"
-
-FILES:${PN} += " \
-    ${datadir}/kdev* \
-    ${datadir}/k*5 \
-    ${datadir}/knsrcfiles \
-    ${datadir}/knotifications5 \
-    ${datadir}/mime \
-    ${datadir}/plasma \
-    ${libdir}/libKDevelopSessionsWatch.so \
-    ${OE_QMAKE_PATH_PLUGINS} \
-    ${OE_QMAKE_PATH_QML} \
-"
-
-RDEPENDS:${PN} += " \
-    bash \
-    zsh \
-"
-
-# To give best user experience out of the box..
-RRECOMMENDS:${PN} += " \
-    packagegroup-qt5-toolchain-target \
-    binutils \
-    ccache \
-    make \
-    gcc-symlinks g++-symlinks cpp-symlinks \
-    gdb \
-    cmake \
-    ninja \
-    python3-core \
-    qtwebengine-dev \
-    qtwebengine-mkspecs \
-    qtwebengine-plugins \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebengine-qmlplugins', '', d)} \
-"
-
--- a/extends-meta-oe/cmark_%.bbappend
+++ b/extends-meta-oe/cmark_%.bbappend
@@ -1,9 +0,0 @@
-BBCLASSEXTEND = "native"
-
-DEPENDS:append:class-target = "${BPN}-native"
-
-sysroot_stage_all:append:class-target () {
-    mkdir -p ${SYSROOT_DESTDIR}${bindir}
-    cp ${STAGING_BINDIR_NATIVE}/cmark ${SYSROOT_DESTDIR}${bindir}
-}
-
--- a/extends-meta-oe/libsigrok_%.bbappend
+++ b/extends-meta-oe/libsigrok_%.bbappend
@@ -1 +0,0 @@
-PACKAGECONFIG += "cxx"
--- 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-native_git.bbappend
+++ b/extends-meta-qt5/qtbase-native_git.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"

 # avoid that our sanity check complains about sysroot in created comments
 SRC_URI += "file://0002-qdbusxml2cpp-prepare-commandline-string-manipulation.patch"

-do_configure:append() {
+do_configure_append() {
     # strCmdLine.replace(QString("STRING_FULL_PATH"), QString("STRING_PATH"));
     sed -i 's:STRING_FULL_PATH:${TMPDIR}:g' ${S}/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
     sed -i 's:STRING_PATH:<oe-temp>:g' ${S}/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
--- 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,29 @@ 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,12 @@ static QString moc(const QString &name)
 
 static QTextStream &writeHeader(QTextStream &ts, bool changesWillBeLost)
 {
-+    QString strCmdLine = commandLine;
-+    strCmdLine.replace(QStringLiteral("STRING_FULL_PATH"), QStringLiteral("STRING_PATH"));
-+    strCmdLine.replace(QStringLiteral("recipe-sysroot"), QStringLiteral("recipe--sysroot"));
-     ts << "/*" << 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"));
+	strCmdLine.replace(QStringLiteral("recipe-sysroot"), QStringLiteral("recipe--sysroot"));
+     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,21 +1,10 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
+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 ??= ""
-
-PACKAGECONFIG_DISTRO:append = " \
-    sm \
+# session management only for x11 environment
+PACKAGECONFIG_DISTRO += " \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "sm", "", d)} \
    accessibility \
    sql-sqlite \
    cups \
--- a/extends-meta-qt5/qtsvg_git.bbappend
+++ b/extends-meta-qt5/qtsvg_git.bbappend
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native"
--- a/extends-meta-qt5/qttools_git.bbappend
+++ b/extends-meta-qt5/qttools_git.bbappend
@@ -4,17 +4,14 @@ DEPENDS += "${BPN}-native"


 # It's really time for us to publish cmake_lib.bbclass
-SRC_URI:remove = " \
+SRC_URI_remove = " \
    file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
 "

 # native ignore
-CMAKE_ALIGN_SYSROOT:class-native[1] = "ignore"
-CMAKE_ALIGN_SYSROOT:class-nativesdk[1] = "ignore"
+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)}"
--- 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-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=af67f05b2b6abf61e608dcfccb94b3e1"
-
-DEPENDS = "qtbase zlib"
-
-SRC_URI = "git://github.com/stachenov/quazip.git;branch=master;protocol=https"
-SRCREV = "6117161af08e366c37499895b00ef62f93adc345"
-PV = "1.3"
-S = "${WORKDIR}/git"
-
-inherit cmake_qt5
-
-EXTRA_CMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
--- a/extends-oe-core/flac%.bbappend
+++ b/extends-oe-core/flac%.bbappend
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native"
--- a/extends-oe-core/ghostscript%.bbappend
+++ b/extends-oe-core/ghostscript%.bbappend
@@ -1,20 +0,0 @@
-DEPENDS:append:class-target = " libidn"
-
-EXTRA_OECONF:remove:class-target = "--without-libidn"
-
-do_configure:append:class-target() {
-    # more (so) copy tools from the native ghostscript build
-    mkdir -p soobj/aux
-    for i in genarch genconf mkromfs echogs gendev genht packps; do
-        cp -f ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i soobj/aux/$i
-    done
-}
-
-do_compile:class-target() {
-    oe_runmake so
-}
-
-do_install:class-target() {
-    oe_runmake 'DESTDIR=${D}' soinstall
-    mv -f ${D}${bindir}/gsc ${D}${bindir}/gs
-}
--- a/extends-oe-core/gpgme_%.bbappend
+++ b/extends-oe-core/gpgme_%.bbappend
@@ -1,6 +1,6 @@
 inherit cmake_lib

-CMAKE_ALIGN_SYSROOT:class-native[1] = "ignore"
+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/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/Bison-exception-2.2
+++ b/files/licenses/Bison-exception-2.2
@@ -1,5 +0,0 @@
-Bison Exception
-
-As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof as a parser skeleton. Alternatively, if you modify or redistribute the parser skeleton itself, you may (at your option) remove this special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception.
-
-This special exception was added by the Free Software Foundation in version 2.2 of Bison.
--- a/files/licenses/CC-BY-SA-4.0
+++ b/files/licenses/CC-BY-SA-4.0
@@ -0,0 +1,396 @@
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More_considerations
+     for the public: 
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  d. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  e. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  f. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  g. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  h. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  i. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  j. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  k. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+       4. If You Share Adapted Material You produce, the Adapter's
+          License You apply must not prevent recipients of the Adapted
+          Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material; and
+
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
+
--- 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/MIT-CMU
+++ b/files/licenses/MIT-CMU
@@ -1,17 +0,0 @@
-<copyright notice> By obtaining, using, and/or copying this software and/or
-its associated documentation, you agree that you have read, understood, and
-will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and its associated
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appears in all copies, and that both that
-copyright notice and this permission notice appear in supporting documentation,
-and that the name of the copyright holder not be used in advertising or publicity
-pertaining to distribution of the software without specific, written permission.
-
-THE COPYRIGHT HOLDER DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
-SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM THE 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/files/licenses/Qt-LGPL-exception-1.1
+++ b/files/licenses/Qt-LGPL-exception-1.1
@@ -1,21 +0,0 @@
-The Qt Company Qt LGPL Exception version 1.1
-
-As an additional permission to the GNU Lesser General Public License version 2.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.
-
-Moreover, you may apply this exception to a modified version of the Library, provided that such modification does not involve copying material from the Library into the modified Library's header files unless such material is limited to
-
-   (i) numerical parameters;
-
-   (ii) data structure layouts;
-
-   (iii) accessors; and
-
-   (iv) small macros, templates and inline functions of five lines or less in length.
-
-Furthermore, you are not required to apply this additional permission to a modified version of the Library.
--- 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/files/licenses/Unicode-DFS-2016
+++ b/files/licenses/Unicode-DFS-2016
@@ -1,49 +0,0 @@
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
-
-Unicode Data Files include all data files under the directories http://www.unicode.org/Public/,
-http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
-http://www.unicode.org/ivd/data/, and http://www.unicode.org/utility/trac/browser/.
-
-Unicode Data Files do not include PDF online code charts under the directory
-http://www.unicode.org/Public/.
-
-Software includes any source code published in the Unicode Standard or under
-the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/,
-http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
-and http://www.unicode.org/utility/trac/browser/.
-
-NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING,
-INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"),
-AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND
-BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE,
-DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
-
-COPYRIGHT AND PERMISSION NOTICE Copyright © 1991-2016 Unicode, Inc. All rights
-reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the Unicode data files and any associated documentation (the "Data Files")
-or Unicode software and any associated documentation (the "Software") to deal
-in the Data Files or Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, and/or sell copies
-of the Data Files or Software, and to permit persons to whom the Data Files
-or Software are furnished to do so, provided that either
-
-(a) this copyright and permission notice appear with all copies of the Data
-Files or Software, or
-
-   (b) this copyright and permission notice appear in associated Documentation.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
-BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL 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 THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in these Data Files or Software without prior written authorization of the
-copyright holder.
--- a/files/licenses/X11
+++ b/files/licenses/X11
@@ -1,13 +0,0 @@
-X11 License
-
-Copyright (C) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium.
-
-X Window System is a trademark of X Consortium, Inc.
--- 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 = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-inherit qmake5 pkgconfig 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 = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-inherit qmake5 pkgconfig 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/gottet/gottet.bb
+++ b/recipes-gottcode/gottet/gottet.bb
@@ -1,20 +0,0 @@
-SUMMARY = "A tetris clone using the Qt GUI toolkit"
-HOMEPAGE = "http://gottcode.org/gottet/"
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
-
-inherit qmake5 pkgconfig 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[sha256sum] = "26647b12258180e46e76413a25b43b2a1c2f9169f0ea039015359ba9fbe4f2f8"
-PV = "1.2.0"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
-
-EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
-
-FILES:${PN} += " \
-    ${datadir}/metainfo \
-    ${datadir}/icons \
-"
--- 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 = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-inherit qmake5 pkgconfig 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/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 = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-inherit qmake5 pkgconfig 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/kcolorpicker/kcolorpicker.bb
+++ b/recipes-graphics/kcolorpicker/kcolorpicker.bb
@@ -1,17 +0,0 @@
-SUMMARY = "Qt based Color Picker with popup menu"
-HOMEPAGE = "https://github.com/ksnip/kColorPicker"
-LICENSE = "LGPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404"
-
-SRC_URI = "git://github.com/ksnip/kColorPicker.git;branch=master;protocol=https"
-SRCREV = "15e16374e51153006d3400cb88066d5272698743"
-PV = "0.2.0"
-S = "${WORKDIR}/git"
-
-DEPENDS = " \
-    qtbase \
-"
-
-inherit cmake_qt5_extra pkgconfig
-
-EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON"
--- a/recipes-graphics/kimageannotator/kimageannotator.bb
+++ b/recipes-graphics/kimageannotator/kimageannotator.bb
@@ -1,19 +0,0 @@
-SUMMARY = "A lightweight compositor for X11"
-HOMEPAGE = "https://github.com/ksnip/kImageAnnotator"
-LICENSE = "LGPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404"
-
-SRC_URI = "git://github.com/ksnip/kImageAnnotator.git;branch=master;protocol=https"
-SRCREV = "6651dc09ccbf277359669141669ccc9e6a9f2cc2"
-PV = "0.6.0"
-S = "${WORKDIR}/git"
-
-DEPENDS = " \
-    qttools-native \
-    qtsvg \
-    kcolorpicker \
-"
-
-inherit cmake_qt5_extra pkgconfig qt5-translation
-
-EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON"
--- 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;protocol=https"
-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 pkgconfig 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 = "GPL-2.0-only"
-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 pkgconfig 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/sddm/sddm/0001-Workaround-missing-sessions.patch
+++ b/recipes-graphics/sddm/sddm/0001-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-Status: 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 1953c76..549cd4d 100644
--- a/src/greeter/SessionModel.cpp
-+++ b/src/greeter/SessionModel.cpp
-@@ -125,22 +125,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"));
-                const QStringList pathList = envPath.split(QLatin1Char(':'));
-                for(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.34.1
-
--- 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-kdab/hotspot/hotspot_git.bb
+++ b/recipes-kdab/hotspot/hotspot_git.bb
@@ -1,8 +1,8 @@
 SUMMARY = "The Linux perf GUI for performance analysis"
-LICENSE = "GPL-2.0-or-later | KDAB-Commercial | KDAB-Commercial-US"
+LICENSE = "GPLv2+ | KDAB-Commercial"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.txt;md5=50a9af6464b390664488e7af1cc5c148 \
-    file://LICENSE.GPL.txt;md5=8b7a65584aeb92995bcb6066ed0f58f7 \
+    file://LICENSE.txt;md5=a6b8a64054f1549420f27724acd2337a \
+    file://LICENSE.GPL.txt;md5=eed541e1ee57f0373b3cb5824dfe6b93 \
    file://LICENSE.US.txt;md5=1cf6e30372544be558f7146a7e229cdd \
 "

@@ -21,11 +21,11 @@ DEPENDS += " \
    kio \
    solid \
 "
-SRC_URI = "gitsm://github.com/KDAB/hotspot.git;protocol=https;branch=master"
-SRCREV = "35d1865babf40b9df454810ca8cc09e77b0c349a"
+SRC_URI = "gitsm://github.com/KDAB/hotspot.git"
+SRCREV = "a41a0a5ba1fead202bfdcb2198f192114d030484"
 S = "${WORKDIR}/git"
-PV = "1.2.0+git${SRCPV}"
+PV = "1.1.0+git${SRCPV}"

-FILES:${PN} += "${datadir}/icons"
+FILES_${PN} += "${datadir}/icons"

-RDEPENDS:${PN} += "perf"
+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 = "BSD-3-Clause & MIT"
-LIC_FILES_CHKSUM = " \
-    file://LICENSES/BSD-3-Clause.txt;md5=f225922a2c12dfa5218fb70c49db3ea6 \
-    file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \
-"
-
-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;branch=master;protocol=https"
-SRCREV = "aa9de13376a5e9f4c8802091776584614db8677e"
-S = "${WORKDIR}/git"
-PV = "3.0.0"
-
-FILES:${PN}-dev += "${datadir}/mkspecs"
--- a/recipes-kdab/kdreports/kdreports_git.bb
+++ b/recipes-kdab/kdreports/kdreports_git.bb
@@ -1,25 +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 = "BSD-3-Clause & MIT"
-LIC_FILES_CHKSUM = " \
-    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
-    file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \
-"
-
-inherit cmake_qt5_extra
-
-DEPENDS += " \
-    qtbase \
-    kdcharts \
-"
-
-SRC_URI = "git://github.com/KDAB/KDReports.git;branch=master;protocol=https"
-SRCREV = "a5095bd266b5d4697978e1a3042481edd72c2c3f"
-S = "${WORKDIR}/git"
-PV = "2.2.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 = "(GPL-2.0-only & LGPL-2.1-only & AGPL-3.0-only) | 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;branch=master"
-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 = "GPL-2.0-only & LGPL-2.0-only & 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] = "beaa65dcc664a1d7cd5320cb07ecce4473b1dc5cd8f42432220460c5fc3f4eea"
-
-FILES:${PN} += " \
-    ${datadir}/libanalitza \
-    ${OE_QMAKE_PATH_QML} \
-"
--- a/recipes-kde/apps/ark/ark.bb
+++ b/recipes-kde/apps/ark/ark.bb
@@ -1,21 +1,18 @@
 SUMMARY = "Ark is KDE's file archiver"
-LICENSE = "BSD-2-Clause & CC0-1.0 & GPL-2.0-or-later & LGPL-3.0-only & MIT"
+LICENSE = "GPLv2 & LGPLv3"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/BSD-2-Clause.txt;md5=4e290b17e3e05732730de37b44abef90 \
-    file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
-    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
-    file://LICENSES/LGPL-3.0-only.txt;md5=7b8fde44990707e743d3613054065137 \
-    file://LICENSES/MIT.txt;md5=4dd71a82d66fd9e3ca0cc65b8be370c0 \
+    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
+    file://COPYING.icons;md5=6e01bfa20e899e8ad569d5488923cbd2 \
 "

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

 DEPENDS += "\
    libarchive \
-    libzip \
    karchive \
    kauth-native \
    kconfig-native \
+    kcoreaddons-native \
    kcrash \
    kdbusaddons \
    kdoctools-native \
@@ -31,12 +28,20 @@ DEPENDS += "\
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "9cc79811d95eb61e491a8ff6f0aebbab9b38b739ac4a5f66fe3807cd22a78065"
+SRC_URI[md5sum] = "ca6926e80afc64f8ab1b3a0adb5286e1"
+SRC_URI[sha256sum] = "e544c3433350fb837570b62e14faeb1033ef31458084a819d49c630b58a6e736"
+SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"

-FILES:${PN} += " \
+FILES_${PN} += " \
    ${datadir}/config.kcfg \
    ${datadir}/icons \
    ${datadir}/mime \
    ${datadir}/k*5 \
    ${OE_QMAKE_PATH_PLUGINS} \
 "
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/*/.debug \
+    ${OE_QMAKE_PATH_PLUGINS}/kf5/kio_dnd/.debug \
+"
--- a/recipes-kde/apps/ark/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
+++ b/recipes-kde/apps/ark/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
@@ -0,0 +1,48 @@
+From b7285c71f5b04bc55441217bf963078b38d6bad4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 11 Oct 2015 21:41:27 +0200
+Subject: [PATCH] fix build with QT_NO_SESSIONMANAGER set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+
+---
+ app/main.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/app/main.cpp b/app/main.cpp
+index 0396400..5924683 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);
+ 
+#ifndef QT_NO_SESSIONMANAGER
+     // Session restoring.
+     if (application.isSessionRestored()) {
+         if (!KMainWindow::canBeRestored(1)) {
+@@ -218,8 +219,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).
+#endif
+    {
+         // Open any given URLs.
+         const QStringList urls = parser.positionalArguments();
+ 
+-- 
+2.5.5
+
--- a/recipes-kde/apps/artikulate/artikulate.bb
+++ b/recipes-kde/apps/artikulate/artikulate.bb
@@ -1,30 +0,0 @@
-SUMMARY = "Artikulate is a pronunciation trainer"
-LICENSE = "GPL-2.0-only & CC-BY-SA-4.0"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=93e64b4a83c7e441e48bbdeeea05c977 \
-    file://COPYING.DOC;md5=4b39cb11ffa11c92d3f7a3431390e0d9 \
-"
-
-inherit kde-apps gtk-icon-cache
-
-DEPENDS += " \
-    qtmultimedia \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    karchive \
-    kcrash \
-    ki18n \
-    knewstuff \
-    kirigami2 \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "d207cbbb37869767810277f0a58ee3372f6d7f4513b73c391aee319c107ede4c"
-
-FILES:${PN} += " \
-    ${datadir}/config.kcfg \
-    ${datadir}/knsrcfiles \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"
--- a/recipes-kde/apps/baloo-widgets/baloo-widgets.bb
+++ b/recipes-kde/apps/baloo-widgets/baloo-widgets.bb
@@ -1,13 +1,8 @@
 SUMMARY = "Widgets for Baloo"
-LICENSE = "GPL-2.0-only & GPL-3.0-only & LGPL-2.0-only & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only"
+LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
-    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
-    file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031294a26b98c \
-    file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
-    file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \
-    file://LICENSES/LGPL-2.1-or-later.txt;md5=147a320ed8b16b036829a0c71d424153 \
-    file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \
+    file://COPYING.README;md5=f5d7c5af660f94231a1d4e19501bce8f \
+    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "

 inherit kde-apps gettext
@@ -24,9 +19,10 @@ DEPENDS += "\
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "0baabcbf277a56f4d7b1fb8f7aff2bddf77d1261bbabd6b717c0d26d2929db5a"
+SRC_URI[md5sum] = "5d27fce69637836b315c9d6baf30da14"
+SRC_URI[sha256sum] = "4903d58bf747e5d2898c750f179bb5539eaabcd77fbbc7a70a18dd752aaad408"

-FILES:${PN} += " \
+FILES_${PN} += " \
    ${datadir}/kservices5 \
    ${OE_QMAKE_PATH_PLUGINS} \
 "
--- a/recipes-kde/apps/bovo/bovo.bb
+++ b/recipes-kde/apps/bovo/bovo.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Bovo is a Gomoku like game for two players"
 DESCRIPTION = "Bovo is a Gomoku (from Japanese 五目並べ - lit. 'five points') like game for two players, where the opponents alternate in placing their respective pictogram on the game board. (Also known as: Connect Five, Five in a row, X and O, Naughts and Crosses)"
-LICENSE = "GPL-2.0-only & GFDL-1.2"
+LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=3c8ea28d12b8a786603a5394fc50096d \
    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -19,9 +19,10 @@ DEPENDS += "\
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "a0b4f72a32d789d72a0d7f3115777c360216952dd24ec822514ee5490a620f18"
+SRC_URI[md5sum] = "780378835e74c5924c5a59a30680b5d7"
+SRC_URI[sha256sum] = "6a1f4b97dc623ff8d25561dd75ab688d9d1aac56ab45f0d1dc2c078018a8732d"

-FILES:${PN} += " \
+FILES_${PN} += " \
    ${datadir}/kxmlgui5 \
    ${datadir}/icons \
 "
--- 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/0001-Fix-build-with-newer-Qt.patch
+++ b/recipes-kde/apps/calligra/kdb/0001-Fix-build-with-newer-Qt.patch
@@ -1,71 +0,0 @@
-From 3a31ad05fcc7682bf3b65143af99fdb9b2e1e248 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH 20/22] Fix build with newer Qt
-
-(cherry picked from commit b36d74f13a1421437a725fb74502c993c359392a)
-
-Upstream-Status: Accepted
---
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
--- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
-                str[new_length++] = '\\';
-                str[new_length++] = '\\';
-                str[new_length++] = '0' + val / 64;
-                str[new_length++] = '0' + (val % 64) / 8;
-                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
-                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-            str[new_length++] = intToHexDigit(val / 16);
-            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
-        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
-        str[new_length++] = '\'';
-        str[new_length++] = ':';
-        str[new_length++] = ':';
-        str[new_length++] = 'b';
-        str[new_length++] = 'y';
-        str[new_length++] = 't';
-        str[new_length++] = 'e';
-        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
-- 
-2.31.1
-
-
--- a/recipes-kde/apps/calligra/kdb_3.1.0.bb
+++ b/recipes-kde/apps/calligra/kdb_3.1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Database Connectivity and Creation Framework"
 HOMEPAGE = "https://community.kde.org/KDb"
-LICENSE = "LGPL-2.0-only & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
 LIC_FILES_CHKSUM = " \
    file://COPYING.LIB;md5=a9cc0417b6424a8311f616fa527d0755 \
    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -15,11 +15,8 @@ DEPENDS += " \
    kcoreaddons \
 "

-SRC_URI = " \
-    ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
-    file://0001-Do-not-rely-on-python2.patch \
-    file://0001-Fix-build-with-newer-Qt.patch \
-"
-SRC_URI[sha256sum] = "8f8983bc8d143832dc14bc2003ba6af1af27688e477c0c791fd61445464f2069"
+SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "25651209050396a76d660856f109cf04"
+SRC_URI[sha256sum] = "175645a149ae4d758ff2746900f6eabe4734b2bdac4d8c95893c650be4f929f2"

-FILES:${PN} += "${OE_QMAKE_PATH_PLUGINS}"
+FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
--- a/recipes-kde/apps/calligra/kexi/0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch
+++ b/recipes-kde/apps/calligra/kexi/0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch
@@ -1,7 +1,7 @@
-From 8ed7b093ea4d7ed8e435cb7704e5a30418356796 Mon Sep 17 00:00:00 2001
+From 11f1c4adc5141a66552f6862d943c7af3c8972b3 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
+Date: Mon, 18 Jun 2018 23:31:15 +0200
+Subject: [PATCH] replace try_run by try_compile in breeze-icon-check
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,29 +12,31 @@ Upstream-Status: Inappropriate [embedded specific]

 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- cmake/modules/CheckGlobalBreezeIcons.cmake | 18 ------------------
- 1 file changed, 18 deletions(-)
+ cmake/modules/CheckGlobalBreezeIcons.cmake | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)

 diff --git a/cmake/modules/CheckGlobalBreezeIcons.cmake b/cmake/modules/CheckGlobalBreezeIcons.cmake
-index 9763213..dfff662 100644
+index 9763213..46a218a 100644
 --- a/cmake/modules/CheckGlobalBreezeIcons.cmake
 +++ b/cmake/modules/CheckGlobalBreezeIcons.cmake
-@@ -24,21 +24,3 @@ else()
+@@ -24,21 +24,14 @@ 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}
+try_compile(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()
+    OUTPUT_VARIABLE COMPILE_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. \
@@ -42,5 +44,5 @@ index 9763213..dfff662 100644
 -Result: ${RUN_OUTPUT}")
 -endif()
 -- 
-2.14.4
+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/0004-Set-extern-C-after-including-common-headers.patch
+++ b/recipes-kde/apps/calligra/kexi/0004-Set-extern-C-after-including-common-headers.patch
@@ -1,53 +0,0 @@
-From 0690fc08719e29d0d026102d54deb6cd667fed2a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 1 May 2021 10:47:22 +0200
-Subject: [PATCH] Set extern "C" after including common headers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Latest gcc/glibc complains:
-| /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/kexi/3.2.0-r0/recipe-sysroot/usr/include/c++/10.3.0/type_traits:101:3: error: template with C linkage
-|  101 |   template<typename...>
-|      |   ^~~~~~~~
-| In file included from /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/kexi/3.2.0-r0/kexi-3.2.0/src/migration/mdb/src/keximdb/mdbmigrate.h:24,
-|                  from /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/kexi/3.2.0-r0/kexi-3.2.0/src/migration/mdb/src/keximdb/mdbmigrate.cpp:21:
-| /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/kexi/3.2.0-r0/kexi-3.2.0/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h:22:3: note: 'extern "C"' linkage started here
-|    22 |   extern "C" {
-|       |   ^~~~~~~~~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h b/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h
-index 31f48c1..d5e0075 100644
--- a/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h
-+++ b/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h
-@@ -18,9 +18,6 @@
- #ifndef _mdbtools_h_
- #define _mdbtools_h_
- 
-#ifdef __cplusplus
-  extern "C" {
-#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -34,6 +31,10 @@
- #include <string.h>
- #include <glib.h>
- 
-+#ifdef __cplusplus
-+  extern "C" {
-+#endif
-+
- #ifdef HAVE_ICONV
- #include <iconv.h>
- #endif
-- 
-2.30.2
-
--- a/recipes-kde/apps/calligra/kexi/0005-Use-plain-Marble-package-instead-of-KexiMarble.patch
+++ b/recipes-kde/apps/calligra/kexi/0005-Use-plain-Marble-package-instead-of-KexiMarble.patch
@@ -1,200 +0,0 @@
-From 3280c5ec9940f329dc75b2b8d9a52285b20209f0 Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-Date: Wed, 5 May 2021 00:09:49 +0200
-Subject: [PATCH] Use plain Marble package instead of KexiMarble
-
-Marble has shipped with a MarbleConfig.cmake file since ~2016. Kexi
-already depends on KF5 versions that are much newer than that.
-
-Upstream-Status: Backport[https://invent.kde.org/office/kexi/-/commit/3280c5ec9940f329dc75b2b8d9a52285b20209f0]
---
- CMakeLists.txt                                |   8 +-
- cmake/modules/FindKexiMarble.cmake            | 115 ------------------
- src/plugins/forms/widgets/CMakeLists.txt      |   2 +-
- .../forms/widgets/mapbrowser/CMakeLists.txt   |   3 +-
- 4 files changed, 5 insertions(+), 123 deletions(-)
- delete mode 100644 cmake/modules/FindKexiMarble.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 82ebc70..17181b5 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -199,16 +199,14 @@ endif()
- ## Test for marble
- ##
- set(MARBLE_MIN_VERSION "0.19.2")
-find_package(KexiMarble ${MARBLE_MIN_VERSION})
-set_package_properties(KexiMarble PROPERTIES
-+find_package(Marble ${MARBLE_MIN_VERSION} CONFIG)
-+set_package_properties(Marble PROPERTIES
-     DESCRIPTION "KDE World Globe Widget library"
-     URL "https://marble.kde.org"
-     TYPE RECOMMENDED
-     PURPOSE "Required by Kexi form map widget"
- )
-if(NOT MARBLE_FOUND)
-    set(MARBLE_INCLUDE_DIR "")
-else()
-+if(Marble_FOUND)
-     set(HAVE_MARBLE TRUE)
- endif()
- set_package_properties(GLIB2 PROPERTIES TYPE RECOMMENDED PURPOSE "${_REQUIRED_BY_MDB}")
-diff --git a/cmake/modules/FindKexiMarble.cmake b/cmake/modules/FindKexiMarble.cmake
-deleted file mode 100644
-index 4ec1c5195..000000000
--- a/cmake/modules/FindKexiMarble.cmake
-+++ /dev/null
-@@ -1,115 +0,0 @@
-# - Try to find the Marble Library
-# Once done this will define
-#
-#  MARBLE_FOUND - system has Marble
-#  MARBLE_INCLUDE_DIR - the Marble include directory
-#  MARBLE_LIBRARIES - Libraries needed to use Marble
-#  MARBLE_VERSION - This contains combined MAJOR.MINOR.PATCH version (eg. 0.19.2);
-#                   Can be missing if version could not be found
-#
-#  Versions mapping can be found at: https://marble.kde.org/changelog.php
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-#=============================================================================
-# Copyright 2006-2009 Kitware, Inc.
-# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
-# Copyright 2009-2011 Mathieu Malaterre <mathieu.malaterre@gmail.com>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-function(from_hex HEX DEC)
-  string(TOUPPER "${HEX}" HEX)
-  set(_res 0)
-  string(LENGTH "${HEX}" _strlen)
-
-  while (_strlen GREATER 0)
-    math(EXPR _res "${_res} * 16")
-    string(SUBSTRING "${HEX}" 0 1 NIBBLE)
-    string(SUBSTRING "${HEX}" 1 -1 HEX)
-    if (NIBBLE STREQUAL "A")
-      math(EXPR _res "${_res} + 10")
-    elseif (NIBBLE STREQUAL "B")
-      math(EXPR _res "${_res} + 11")
-    elseif (NIBBLE STREQUAL "C")
-      math(EXPR _res "${_res} + 12")
-    elseif (NIBBLE STREQUAL "D")
-      math(EXPR _res "${_res} + 13")
-    elseif (NIBBLE STREQUAL "E")
-      math(EXPR _res "${_res} + 14")
-    elseif (NIBBLE STREQUAL "F")
-      math(EXPR _res "${_res} + 15")
-    else()
-      math(EXPR _res "${_res} + ${NIBBLE}")
-    endif()
-
-    string(LENGTH "${HEX}" _strlen)
-  endwhile()
-
-  set(${DEC} ${_res} PARENT_SCOPE)
-endfunction()
-
-if ( MARBLE_INCLUDE_DIR AND MARBLE_GLOBAL_HEADER AND MARBLE_LIBRARIES )
-   # in cache already
-   set( MARBLE_FIND_QUIETLY TRUE )
-endif ()
-
-find_path( MARBLE_INCLUDE_DIR NAMES marble/MarbleMap.h PATH_SUFFIXES marble)
-find_file( MARBLE_GLOBAL_HEADER NAMES marble/MarbleGlobal.h PATH_SUFFIXES marble)
-find_library( MARBLE_LIBRARIES NAMES marblewidget-qt5 )
-
-if(MARBLE_GLOBAL_HEADER)
-    file(STRINGS ${MARBLE_GLOBAL_HEADER}
-         marble_version_line
-         REGEX "^#define[\t ]+MARBLE_VERSION[\t ]+0x([0-9a-fA-F])+.*")
-
-    string(REGEX REPLACE
-            "^.*MARBLE_VERSION[\t ]+0x([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F]).*$"
-            "\\1;\\2;\\3" marble_version_list "${marble_version_line}")
-
-    list(GET marble_version_list 0 MARBLE_VERSION_MAJOR)
-    from_hex("${MARBLE_VERSION_MAJOR}" MARBLE_VERSION_MAJOR)
-
-    list(GET marble_version_list 1 MARBLE_VERSION_MINOR)
-    from_hex("${MARBLE_VERSION_MINOR}" MARBLE_VERSION_MINOR)
-
-    list(GET marble_version_list 2 MARBLE_VERSION_PATCH)
-    from_hex("${MARBLE_VERSION_PATCH}" MARBLE_VERSION_PATCH)
-
-    set(MARBLE_VERSION "${MARBLE_VERSION_MAJOR}.${MARBLE_VERSION_MINOR}.${MARBLE_VERSION_PATCH}" CACHE STRING "Found Marble version")
-endif()
-
-include( FindPackageHandleStandardArgs )
-
-if(MARBLE_VERSION)
-    if(DEFINED MARBLE_MIN_VERSION AND ${MARBLE_VERSION} VERSION_LESS ${MARBLE_MIN_VERSION})
-        set(MARBLE_FOUND FALSE)
-        unset(MARBLE_INCLUDE_DIR)
-        unset(MARBLE_LIBRARIES)
-    else()
-        find_package_handle_standard_args( Marble
-            REQUIRED_VARS
-                MARBLE_INCLUDE_DIR
-                MARBLE_LIBRARIES
-            VERSION_VAR
-                MARBLE_VERSION
-            FAIL_MESSAGE
-                "Could not find Marble"
-        )
-    endif()
-else()
-    find_package_handle_standard_args( marble
-            DEFAULT_MSG
-            MARBLE_INCLUDE_DIR
-            MARBLE_LIBRARIES )
-endif()
-
-mark_as_advanced(MARBLE_GLOBAL_HEADER MARBLE_VERSION_MAJOR MARBLE_VERSION_MINOR MARBLE_VERSION_PATCH)
-diff --git a/src/plugins/forms/widgets/CMakeLists.txt b/src/plugins/forms/widgets/CMakeLists.txt
-index 107d578a8..109341fe0 100644
--- a/src/plugins/forms/widgets/CMakeLists.txt
-+++ b/src/plugins/forms/widgets/CMakeLists.txt
-@@ -11,7 +11,7 @@ endmacro()
- # the main widgets plugin
- add_subdirectory(main)
- 
-if(MARBLE_FOUND)
-+if(Marble_FOUND)
- #TODO  add_subdirectory(mapbrowser)
- endif()
- 
-diff --git a/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt b/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt
-index 3ff7f4fc8..f5be7fd02 100644
--- a/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt
-+++ b/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt
-@@ -1,7 +1,6 @@
- include_directories(
-     ${CMAKE_SOURCE_DIR}/src/formeditor
-     ${CMAKE_SOURCE_DIR}/src/core
-    ${MARBLE_INCLUDE_DIR}
- )
- 
- set(kexiforms_mapwidgetplugin_SRCS
-@@ -20,8 +19,8 @@ target_link_libraries(kexiforms_mapwidgetplugin
-     kexiextendedwidgets
-     kexiformutils
-     kexidataviewcommon
-    ${MARBLE_LIBRARIES}
- 
-+    Marble
-     Qt5::Xml
- )
- 
-- 
-2.31.1
-
--- a/recipes-kde/apps/calligra/kexi_3.1.0.bb
+++ b/recipes-kde/apps/calligra/kexi_3.1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Kexi is a visual database applications creator"
 HOMEPAGE = "https://www.calligra.org/kexi/"
-LICENSE = "GPL-2.0-only & LGPL-2.0-only & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2 & BSD"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=8608b1f74c58ebcb11718f46e8619749 \
    file://COPYING.LIB;md5=7537f2f34ef162007ae9f34b9f256dcb \
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
    file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
 "

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

 DEPENDS += " \
    qtwebkit \
@@ -33,34 +33,35 @@ DEPENDS += " \
    kcompletion \
    kio \
    ktexteditor \
-    mariadb \
-    postgresql \
+    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://0001-replace-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 \
-    file://0004-Set-extern-C-after-including-common-headers.patch \
-    file://0005-Use-plain-Marble-package-instead-of-KexiMarble.patch \
 "
-SRC_URI[sha256sum] = "7a813f9ea815a09c1e733d0e7dc879c64eee85f075389e87e6aab99cf0c1c1ff"
+SRC_URI[md5sum] = "22d6c4739109441f5274da584f67f1c8"
+SRC_URI[sha256sum] = "6d55cd4af177bcb060673a0977d52bc91cc2dd1b1420d008a78f9783312152fb"

-do_install:append() {
+do_install_append() {
    install -d "${D}/${datadir}/pixmaps"
    install ${S}/src/pics/icons/breeze/apps/48/kexi.svg ${D}/${datadir}/pixmaps/
 }

-FILES:${PN} += " \
+FILES_${PN} += " \
    ${OE_QMAKE_PATH_PLUGINS} \
 "

-RDEPENDS:${PN} += "breeze-icons-binres"
+RDEPENDS_${PN} += "breeze-icons-binres"

-# REVISIT (try marble again once 3.3.x is out)
+# 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.1.0.bb
+++ b/recipes-kde/apps/calligra/kproperty_3.1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Property editing framework with editor widget"
 HOMEPAGE = "https://community.kde.org/KProperty"
-LICENSE = "LGPL-2.0-only & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
 LIC_FILES_CHKSUM = " \
    file://COPYING.LIB;md5=3dcc9b0b0118292a0c5d1c18927ef176 \
    file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
@@ -18,9 +18,12 @@ DEPENDS += " \
 "

 SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "67af0c2d74715957bd5373a6a30589ff0a996cb1d267dfd0538dccaa9a768dfa"
+SRC_URI[md5sum] = "ee888d41a677ddc6b8c63f0f71e82026"
+SRC_URI[sha256sum] = "7ede8ee868ba480e4666a32b4b26d279b1e45177f83b0ada32a15fa9cee514a3"

-FILES:${PN} += " \
-    ${datadir}/kproperty3 \
+FILES_${PN} += " \
+    ${datadir}/kpropertywidgets3 \
+    ${datadir}/kservicetypes5 \
+    ${datadir}/kreport3 \
    ${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/recipes-kde/apps/calligra/kreport_3.1.0.bb
+++ b/recipes-kde/apps/calligra/kreport_3.1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Framework for creation and generation of reports"
 HOMEPAGE = "https://community.kde.org/KReport"
-LICENSE = "LGPL-2.0-only & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
 LIC_FILES_CHKSUM = " \
    file://COPYING.LIB;md5=1634220ce20ef95161c3b8401908638c \
    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -23,14 +23,11 @@ DEPENDS += " \
    qtwebkit \
 "

-SRC_URI = " \
-    ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
-    file://0001-Do-not-rely-on-python2.patch \
-    file://0001-Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch \
-"
-SRC_URI[sha256sum] = "22716d719654e8f887fe4d33654e252ddf3d3d818c44e15a8af0e6f2e7d6ccd7"
+SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "48216d8f83a48c93bed9acd0081daa92"
+SRC_URI[sha256sum] = "3b6485629b5e4343b7ddf42efb1927310d60b143a22afe79925147d0ddcdf36c"

-FILES:${PN} += " \
+FILES_${PN} += " \
    ${datadir}/kservicetypes5 \
    ${datadir}/kreport3 \
    ${OE_QMAKE_PATH_PLUGINS} \
--- a/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb
+++ b/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Plugins for Dolphin"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"

 inherit kde-apps gettext

@@ -8,6 +8,7 @@ DEPENDS += "\
    kauth-native \
    kconfig-native \
    kcoreaddons-native \
+    kdesignerplugin-native \
    kdelibs4support-native \
    kdelibs4support \
    sonnet-native \
@@ -18,10 +19,15 @@ DEPENDS += "\
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "703c4666d5fb9a48cca01b52ca5bc4aacbcba3a82c1656487f40334513851517"
+SRC_URI[md5sum] = "898477ec482c80eeda7784fd57bf1fe4"
+SRC_URI[sha256sum] = "3bea72ffe16aac221e2ffa2f91c910b78912dca557aba4866204aa3ed85c26c9"

-FILES:${PN} += " \
+FILES_${PN} += " \
    ${datadir}/config.kcfg \
    ${datadir}/kservices5 \
    ${OE_QMAKE_PATH_PLUGINS} \
 "
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+"
--- a/recipes-kde/apps/dolphin/dolphin.bb
+++ b/recipes-kde/apps/dolphin/dolphin.bb
@@ -1,21 +1,21 @@
 SUMMARY = "KDE File Manager"
-LICENSE = "GPL-2.0-only & GFDL-1.2"
+LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "

-inherit kde-apps gettext mime-xdg
+inherit kde-apps gettext

 DEPENDS += " \
    kauth-native \
    kconfig-native \
    kcoreaddons-native \
    kdoctools-native \
-    kcmutils-native \
    sonnet-native \
    \
    kinit \
+    kcmutils \
    knewstuff \
    ki18n \
    kdbusaddons \
@@ -36,20 +36,16 @@ DEPENDS += " \
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "971489a59cdd6b297e2142eb3315847addafbc4e3504e1609fe5e1d119cf15a3"
-
-EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
+SRC_URI[md5sum] = "645ecbd2896ef47ac5ce7a7f1fd3b738"
+SRC_URI[sha256sum] = "5efb4c5dc304a6d179915b6553ad0f5232dc4e6b38a9d4dbd80a72a5351e6fe4"
+SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"

 FILES_SOLIBSDEV = "${libdir}/libdolphin*${SOLIBSDEV}"

-FILES:${PN} += " \
+FILES_${PN} += " \
    ${datadir}/config.kcfg \
    ${datadir}/k*5 \
-    ${datadir}/kconf_update \
-    ${datadir}/kglobalaccel \
-    ${datadir}/knsrcfiles \
    ${datadir}/dbus-1 \
    ${libdir}/libkdeinit5_dolphin.so \
    ${OE_QMAKE_PATH_PLUGINS} \
-    ${systemd_user_unitdir} \
 "
--- a/recipes-kde/apps/dolphin/files/0001-fix-build-for-qtbase-without-session-management.patch
+++ b/recipes-kde/apps/dolphin/files/0001-fix-build-for-qtbase-without-session-management.patch
@@ -0,0 +1,53 @@
+From b9abe385e2563d7178fbf982ec6977b9f3e625bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 28 Aug 2015 23:22:18 +0200
+Subject: [PATCH 2/2] fix build for qtbase without session management
+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/dolphinmainwindow.cpp | 2 ++
+ src/main.cpp              | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
+index f7a7613..127cd85 100644
+--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
+@@ -346,9 +346,11 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
+     // Find out if Dolphin is closed directly by the user or
+     // by the session manager because the session is closed
+     bool closedByUser = true;
+#ifndef QT_NO_SESSIONMANAGER
+     if (qApp->isSavingSession()) {
+         closedByUser = false;
+     }
+#endif
+ 
+     if (m_tabWidget->count() > 1 && GeneralSettings::confirmClosingMultipleTabs() && closedByUser) {
+         // Ask the user if he really wants to quit and close all tabs.
+diff --git a/src/main.cpp b/src/main.cpp
+index b4ca2c6..5c058a9 100644
+--- a/src/main.cpp
+++ b/src/main.cpp
+@@ -134,6 +134,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
+ 
+     mainWindow->show();
+ 
+#ifndef QT_NO_SESSIONMANAGER
+     if (app.isSessionRestored()) {
+         const QString className = KXmlGuiWindow::classNameOfToplevel(1);
+         if (className == QLatin1String("DolphinMainWindow")) {
+@@ -142,6 +143,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
+            qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
+         }
+     }
+#endif
+ 
+     return app.exec(); // krazy:exclude=crash;
+ }
+-- 
+2.1.0
+
--- a/recipes-kde/apps/dragon/dragon.bb
+++ b/recipes-kde/apps/dragon/dragon.bb
@@ -1,13 +1,11 @@
 SUMMARY = "Simple KDE multimedia player"
-LICENSE = "GFDL-1.2 & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only"
+LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
-    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
-    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
-    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "

-inherit kde-apps gettext mime-xdg
+inherit kde-apps gettext

 DEPENDS += " \
    phonon \
@@ -31,13 +29,18 @@ DEPENDS += " \
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "ea699d4c7c780063aa0598a2050f78f3ce93de86c3818f56541e59d20fa9e6ad"
+SRC_URI[md5sum] = "06baf39ea96ece188be9157e12ce9e6c"
+SRC_URI[sha256sum] = "a6f7ae038b3f7f753bec5e99e9b257225f48000cc4b1d5d0ce3bb3d3beb51b08"

 CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"

-FILES:${PN} += " \
+FILES_${PN} += " \
    ${datadir}/k*5 \
    ${datadir}/solid \
    ${datadir}/icons \
    ${OE_QMAKE_PATH_PLUGINS} \
 "
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+"
--- a/recipes-kde/apps/filelight/filelight.bb
+++ b/recipes-kde/apps/filelight/filelight.bb
@@ -1,12 +1,11 @@
 SUMMARY = "KDE graphical diskspace analyser"
-LICENSE = "GFDL-1.2 & GPL-2.0-only & GPL-3.0-only"
+LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/GFDL-1.2-or-later.txt;md5=9f58808219e9a42ff1228309d6f83dc6 \
-    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
-    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
+    file://COPYING;md5=e098acff086ea3d1264fc89b51242144 \
+    file://COPYING-DOCS;md5=ad1419ecc56e060eccf8184a87c4285f \
 "

-inherit kde-apps gettext mime-xdg
+inherit kde-apps gettext

 DEPENDS += "\
    kauth-native \
@@ -14,9 +13,6 @@ DEPENDS += "\
    kcoreaddons-native \
    kdoctools-native \
    sonnet-native \
-    kpackage-native \
-    qtquickcontrols2 \
-    kdeclarative \
    kio \
    kparts \
    solid \
@@ -25,10 +21,18 @@ DEPENDS += "\
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "d28b9b9e6628bc4f97398e04872f57d9b46c1a7259a5d68f8311e50db3a74f6e"
+SRC_URI[md5sum] = "5973b0176f48e80a52ea1eca33ec4bc7"
+SRC_URI[sha256sum] = "69de0bafa3e407cc6c9b52cb942cbb414db526fee7e99154498f7e821fc0a6f3"
+SRC_URI += " \
+    file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
+"

-FILES:${PN} += " \
+FILES_${PN} += " \
    ${datadir}/k*5 \
    ${datadir}/icons \
    ${OE_QMAKE_PATH_PLUGINS} \
 "
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+"
--- a/recipes-kde/apps/filelight/files/0001-fix-build-for-qtbase-build-without-session-support-Q.patch
+++ b/recipes-kde/apps/filelight/files/0001-fix-build-for-qtbase-build-without-session-support-Q.patch
@@ -0,0 +1,40 @@
+From d83637a54457d77687088f45a9036b9a2a7bcf11 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 24 Apr 2015 11:35:45 +0200
+Subject: [PATCH] fix build for qtbase build without session support
+ QT_NO_SESSIONMANAGER
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/main.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 2463a29..1709717 100644
+--- a/src/main.cpp
+++ b/src/main.cpp
+@@ -78,6 +78,7 @@ int main(int argc, char *argv[])
+     options.process(app);
+     about.processCommandLine(&options);
+ 
+#ifndef QT_NO_SESSIONMANAGER
+     if (!app.isSessionRestored()) {
+         MainWindow *mw = new MainWindow();
+ 
+@@ -89,7 +90,9 @@ int main(int argc, char *argv[])
+ 
+         mw->show();
+     }
+-    else RESTORE(MainWindow);
+    else
+#endif
+		RESTORE(MainWindow);
+ 
+     return app.exec();
+ }
+-- 
+1.9.3
+
--- a/recipes-kde/apps/granatier/granatier.bb
+++ b/recipes-kde/apps/granatier/granatier.bb
@@ -1,10 +1,9 @@
 SUMMARY = "Granatier is a clone of the classic Bomberman game"
 DESCRIPTION = "Granatier is a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"
-LICENSE = "GFDL-1.2+ & GPL-2.0-or-later & LGPL-2.0-only"
+LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
-    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
-    file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031294a26b98c \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "

 inherit kde-apps gtk-icon-cache
@@ -25,9 +24,10 @@ DEPENDS += " \
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "16527c0b596de555a19b5f67672bf1a463a4a934c85d578aef23b0bae856d458"
+SRC_URI[md5sum] = "fa563c48468f03dcc6be6605402ccc7c"
+SRC_URI[sha256sum] = "5898f962dfde9f124c9967c75581c2e2d8015fecac765f1c3470edb7f97ddf1a"

-FILES:${PN} += " \
+FILES_${PN} += " \
    ${datadir}/config.kcfg \
    ${datadir}/icons \
    ${datadir}/kxmlgui5 \
--- a/recipes-kde/apps/gwenview/files/0001-Set-Kipi-package-properties.patch
+++ b/recipes-kde/apps/gwenview/files/0001-Set-Kipi-package-properties.patch
@@ -0,0 +1,30 @@
+From 06f07a9b331bec4ff51c2a5174e758b1bffba10c Mon Sep 17 00:00:00 2001
+From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
+Date: Wed, 6 Apr 2016 19:23:55 +0000
+Subject: [PATCH 2/3] Set Kipi package properties
+
+This change make Kipi optional.
+
+Upstream-Status: Pending
+
+Signed-off-by: Luis Gustavo S. Barreto <gustavo@ossystems.com.br>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a18ca16..d855192 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -75,7 +75,7 @@ find_package(KF5Kipi)
+ if (KF5Kipi_FOUND)
+    set(KIPI_FOUND true)
+ endif()
+-# set_package_properties(Kipi PROPERTIES URL"http://www.kipi-plugins.org" DESCRIPTION "Provides various image manipulation and export features" TYPE OPTIONAL)
+set_package_properties(KF5Kipi PROPERTIES URL "http://www.kipi-plugins.org" DESCRIPTION "Provides various image manipulation and export features" TYPE OPTIONAL)
+ 
+ find_package(LCMS2)
+ set_package_properties(LCMS2 PROPERTIES URL "http://www.littlecms.com" DESCRIPTION "Color management engine" TYPE REQUIRED)
+-- 
+2.1.4
+
--- a/recipes-kde/apps/gwenview/files/0002-Avoid-try_run.patch
+++ b/recipes-kde/apps/gwenview/files/0002-Avoid-try_run.patch
@@ -0,0 +1,108 @@
+From e5170c60d0443d8f50b5bf6a85bea64bea29fbc0 Mon Sep 17 00:00:00 2001
+From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
+Date: Wed, 6 Apr 2016 19:42:07 +0000
+Subject: [PATCH 3/3] Avoid try_run
+
+When cross compiling, the executable compiled in the first step usually
+cannot be run on the build host. For this reason, we use try_compile()
+to determine what version of libjpeg is available.
+
+Upstream-Status: Pending
+
+Signed-off-by: Luis Gustavo S. Barreto <gustavo@ossystems.com.br>
+---
+ lib/CMakeLists.txt | 71 ++++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 42 insertions(+), 29 deletions(-)
+
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index d51b80d..db3ac7b 100644
+--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
+@@ -10,42 +10,55 @@ message(STATUS "Looking for libjpeg version in ${JPEG_INCLUDE_DIR}/jpeglib.h")
+ # found in (between libjpeg, libjpeg-turbo and various multilib header
+ # forwarding schemes seen in distros), have a simple program print out the
+ # right version.
+-set(JPEGLIB_VERSION_CHECK_PATH "${CMAKE_CURRENT_BINARY_DIR}/jpeglib-version-check.c")
+-file(WRITE ${JPEGLIB_VERSION_CHECK_PATH} "
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <jpeglib.h>
+function(JPEGVersionCheck Ret Op Version)
+    set(JPEGLIB_VERSION_CHECK_PATH "${CMAKE_CURRENT_BINARY_DIR}/jpeglib-version-check.c")
+    file(WRITE ${JPEGLIB_VERSION_CHECK_PATH} "
+    #include <stddef.h>
+    #include <stdio.h>
+    #include <jpeglib.h>
+    int main()
+    {
+    #if (JPEG_LIB_VERSION ${Op} ${Version})
+    #error JPEG_LIB_VERSION ${Op} ${Version}
+    #endif
+    return 0;
+    }
+    ")
+ 
+-int main(void) { printf(\"%d\\\n\", JPEG_LIB_VERSION); }
+-")
+try_compile(COMPILE_RESULT_VAR
+     "${CMAKE_BINARY_DIR}" "${JPEGLIB_VERSION_CHECK_PATH}"
+      COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS}"
+      OUTPUT_VARIABLE COMPILE_OUT)
+ 
+-try_run(JPEGLIB_RUN_RESULT JPEGLIB_COMPILE_RESULT
+-    ${CMAKE_CURRENT_BINARY_DIR} ${JPEGLIB_VERSION_CHECK_PATH}
+-    CMAKE_FLAGS -DINCLUDE_DIRECTORIES:PATH=${JPEG_INCLUDE_DIR}
+-    RUN_OUTPUT_VARIABLE jpeglib_version)
+    set(${Ret} ${COMPILE_OUT} PARENT_SCOPE)
+endfunction()
+ 
+-if ((${JPEGLIB_COMPILE_RESULT} EQUAL FALSE) OR ("${JPEGLIB_RUN_RESULT}" EQUAL FAILED_TO_RUN) OR "${jpeglib_version}" STREQUAL "")
+-    message(FATAL_ERROR "Could not find jpeglib.h. This file comes with libjpeg.")
+-endif()
+find_package(JPEG REQUIRED)
+if(JPEG_FOUND)
+    JPEGVersionCheck(JPEG_LIB_VERSION < 80)
+    if (${JPEG_LIB_VERSION} MATCHES "#error")
+      set(GV_JPEG_DIR libjpeg-62)
+    endif()
+ 
+-if ("${jpeglib_version}" LESS 80)
+-    set(GV_JPEG_DIR libjpeg-62)
+-endif()
+    JPEGVersionCheck(JPEG_LIB_VERSION == 80)
+    if (${JPEG_LIB_VERSION} MATCHES "#error")
+      set(GV_JPEG_DIR libjpeg-80)
+    endif()
+ 
+-if ("${jpeglib_version}" EQUAL 80)
+-    set(GV_JPEG_DIR libjpeg-80)
+-endif()
+    JPEGVersionCheck(JPEG_LIB_VERSION == 90)
+    if (${JPEG_LIB_VERSION} MATCHES "#error")
+      set(GV_JPEG_DIR libjpeg-90)
+    endif()
+ 
+-if ("${jpeglib_version}" EQUAL 90)
+-    set(GV_JPEG_DIR libjpeg-90)
+-endif()
+-
+-if ("${GV_JPEG_DIR}" STREQUAL "")
+-    message(FATAL_ERROR "Unknown libjpeg version: ${jpeglib_version}")
+    if ("${GV_JPEG_DIR}" STREQUAL "")
+        message(FATAL_ERROR "Unknown libjpeg version")
+    else()
+        message(STATUS "using ${GV_JPEG_DIR}")
+    endif()
+else(JPEG_FOUND)
+    message(FATAL_ERROR "Could not find jpeglib.h. This file comes with libjpeg.")
+ endif()
+-
+-message(STATUS "libjpeg version: ${jpeglib_version}")
+-
+ 
+ add_definitions(-Dlibjpeg_EXPORTS)
+ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/${GV_JPEG_DIR}
+-- 
+2.5.5
+
--- a/recipes-kde/apps/gwenview/gwenview.bb
+++ b/recipes-kde/apps/gwenview/gwenview.bb
@@ -1,42 +1,48 @@
 SUMMARY = "A fast and easy to use image viewer for KDE"
-LICENSE = "GPL-2.0-only"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b"

-inherit kde-apps gettext mime-xdg
+inherit kde-apps gettext

 DEPENDS += " \
-    kdelibs4support-native \
-    kdoctools-native \
    jpeg \
    exiv2 \
    lcms \
    phonon \
    kdelibs4support \
+    kdelibs4support-native \
    kded \
    kactivities \
    kcoreaddons-native \
    kconfig-native \
    kauth-native \
+    kdesignerplugin-native \
    sonnet-native \
    kxmlgui \
    kfilemetadata \
    baloo \
    libkdcraw \
-    kimageannotator \
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "f125eb729dd81ea265471c9bbca54fe6a7e87348c9a782b321331da72a02aa6e"
+SRC_URI[md5sum] = "702ea798307dbb07f7216df928c1be78"
+SRC_URI[sha256sum] = "d4b22bd4a3935c84e9aaa7eb8437ee43df12efe07200ff3b1f554020ef5169db"

-EXTRA_OECMAKE += " \
-    -DJPEGLIB_RUN_RESULT=true \
-    -DJPEGLIB_RUN_RESULT__TRYRUN_OUTPUT=0 \
+SRC_URI += " \
+    file://0001-Set-Kipi-package-properties.patch  \
+    file://0002-Avoid-try_run.patch \
 "

-FILES:${PN} += " \
+CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
+
+FILES_${PN} += " \
    ${datadir}/k*5 \
    ${datadir}/icons \
    ${datadir}/solid \
    ${datadir}/kconf_update \
    ${OE_QMAKE_PATH_PLUGINS} \
 "
+
+FILES_${PN}-dbg += " \
+    ${OE_QMAKE_PATH_PLUGINS}/.debug \
+"
--- a/recipes-kde/apps/kalgebra/kalgebra.bb
+++ b/recipes-kde/apps/kalgebra/kalgebra.bb
@@ -1,30 +0,0 @@
-SUMMARY = "2D and 3D Graph Calculator"
-LICENSE = "GPL-2.0-only & LGPL-2.0-only & GFDL-1.2"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-    file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
-"
-
-inherit kde-apps gettext gtk-icon-cache mime-xdg
-
-DEPENDS += "\
-    ncurses \
-    readline \
-    analitza \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    ki18n \
-    kconfigwidgets \
-    kwidgetsaddons \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "82e0007a9a71a1771624410449be4a7c2db13fa9583e917b330270265512f977"
-
-FILES:${PN} += " \
-    ${datadir}/icons \
-    ${datadir}/kalgebramobile \
-"
--- a/recipes-kde/apps/kalzium/kalzium.bb
+++ b/recipes-kde/apps/kalzium/kalzium.bb
@@ -1,19 +1,12 @@
 SUMMARY = "Periodic Table of Elements"
-LICENSE = "BSD-2-Clause & BSD-3-Clause & CC0-1.0 & GFDL-1.2 & GPL-2.0-or-later & LGPL-2.0-or-later & LGPL-2.1-or-later"
+LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/BSD-2-Clause.txt;md5=534956ece1a160a65f088a8f82672ef9 \
-    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
-    file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
-    file://LICENSES/GFDL-1.2-or-later.txt;md5=9f58808219e9a42ff1228309d6f83dc6 \
-    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
-    file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
-    file://LICENSES/LGPL-2.1-or-later.txt;md5=147a320ed8b16b036829a0c71d424153 \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
 "

-# avogadrolibs -> glew
-REQUIRED_DISTRO_FEATURES = "opengl"
-
-inherit kde-apps gettext pkgconfig gtk-icon-cache mime-xdg features_check
+inherit kde-apps pythonnative gettext pkgconfig gtk-icon-cache

 DEPENDS += " \
    qtsvg \
@@ -21,10 +14,6 @@ DEPENDS += " \
    openbabel \
    avogadrolibs \
    \
-    kcoreaddons-native \
-    kconfig-native \
-    kdoctools-native \
-    kauth-native \
    karchive \
    kconfig \
    kcoreaddons \
@@ -41,11 +30,11 @@ DEPENDS += " \
 "

 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "0c743f7cef68ffca68605763ca740ed3a7fd26d0f085a80ad6b5f3b777ea5c50"
+SRC_URI[md5sum] = "72bde526067b7f54ba7d13a69cac5fc7"
+SRC_URI[sha256sum] = "50050c85fb1760a99b7bbd0ed0f1047b4456139eb8d3f012005f6106e16a880e"

-FILES:${PN} += " \
+FILES_${PN} += " \
    ${datadir}/config.kcfg \
    ${datadir}/kxmlgui5 \
-    ${datadir}/knsrcfiles \
    ${datadir}/libkdeedu \
 "
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andreas Müller	6f6e1eccbd	sddm-autologin.pam: remove pam_permit.so Not the best idea to just trust what people send... Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2020-03-05 22:34:57 +01:00
Andreas Müller	aecc2a940d	qtiohelper: upgrade 0.3.994+ -> 0.4.0+ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2019-10-24 11:46:09 +02:00
Andreas Müller	b5277d6441	exiv2: add all CVE patches found ad fedora see [1] [1] https://src.fedoraproject.org/cgit/rpms/exiv2.git/ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2019-01-04 21:04:53 +01:00
Andreas Müller	a8753216e9	exiv2: remove bogus do_install prepend Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2019-01-04 21:04:43 +01:00
Andreas Müller	78e6ebc828	exiv2: update SRC_URI Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2019-01-04 21:04:32 +01:00
Andreas Müller	3f0741da9f	kdeclarative: Fix build if QML-debugger was not enabled Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2019-01-01 20:53:57 +01:00