wip: a number of recipe fixes, mainly for kde/kf5 to build for kirkstone

Signed-off-by: Jan Vermaete <jan.vermaete@gmail.com>

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 genarated sources
+        # check for generated 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}"
+            bbfatal "One or more files contain links to build host sysroot ${STAGING_DIR_HOST}(-native)"
         fi
     fi
 }

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
@@ -95,7 +95,7 @@ python () {
 # 2. 3. in cmake_sysroot
 
 # 4. Handle CMAKE_ALIGN_SYSROOT
-python do_populate_sysroot_append() {
+python do_populate_sysroot:append() {
     pn = d.getVar('PN')
 
     # parse single parameter in CMAKE_ALIGN_SYSROOT[..] and return array of line strings extracted
@@ -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"

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() {
+python do_populate_sysroot:prepend() {
     tmpfile = d.getVar('CMAKEINSTALLED')
     if os.path.isfile(tmpfile):
         os.remove(tmpfile)
 }
 
 # 2. keep cmake files staged to sysroot
-sysroot_stage_dir_append() {
+sysroot_stage_dir:append() {
     # avoid doubles causing double replacement
     for file in `find $dest -name '*.cmake'`; do
         if ! grep -q "$file" ${CMAKEINSTALLED} ; then

classes/kde-apps.bbclass

@@ -1,7 +1,7 @@
 inherit kde-base
 
-KDE_APP_VERSION = "21.04.3"
+KDE_APP_VERSION = "22.08.3"
 
-SRC_URI = "${KDE_MIRROR}/stable/release-service/${PV}/src/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/release-service/${PV}/src/${BPN}-${PV}.tar.xz"
 
-RRECOMMENDS_${PN} += "qtbase-plugins"
+RRECOMMENDS:${PN} += "qtbase-plugins"

classes/kde-base.bbclass

@@ -1,34 +1,28 @@
-DEPENDS_prepend_class-nativesdk = "nativesdk-qtbase "
-DEPENDS_prepend_class-target = "qtbase "
+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 += "extra-cmake-modules-native "
 
-KDE_MIRROR = "http://download.kde.org"
+#KDE_MIRROR = "https://download.kde.org"
+KDE_MIRROR = "https://mirror.accum.se/mirror/kde.org/ftp/Attic"
 
-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"
+SRC_URI = "${KDE_MIRROR}/frameworks/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
 
-SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
+#https://mirror.accum.se/mirror/kde.org/ftp/Attic/frameworks/5.101/syntax-highlighting-5.101.0.tar.xz
+#https://mirror.accum.se/mirror/kde.org/ftp/Attic/frameworks/stable/frameworks/5.101/syntax-highlighting-5.101.0.tar.xz
+#https://mirror.accum.se/mirror/kde.org/ftp/Attic/frameworks/stable/frameworks/5.101/syntax-highlighting-5.101.0.tar.xz
 
 # extra-cmake-modules cause dependent to check for python
-inherit cmake_qt5_extra python3native
+inherit cmake_qt5_extra pkgconfig python3native
 
 DEPENDS += "libxml2-native"
 
-do_compile_prepend() {
+do_compile:prepend() {
     export XDG_DATA_HOME=${STAGING_DATADIR}
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kf5 \
     ${datadir}/qlogging-categories5 \
     ${libdir}/plugins/kf5 \
@@ -45,9 +39,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"

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}/frameworks/${KF5_VERSION_DIR}/portingAids/${BPN}-${PV}.tar.xz"

classes/kde-kf5.bbclass

@@ -1,10 +1,10 @@
 inherit kde-base
 
-KF5_VERSION = "5.84.0"
+KF5_VERSION = "5.101.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}/frameworks/${KF5_VERSION_DIR}/${BPN}-${PV}.tar.xz"

classes/kde-plasma.bbclass

@@ -1,8 +1,8 @@
 inherit kde-base
 
-PLASMA_VERSION = "5.22.4"
+PLASMA_VERSION = "5.26.2"
 
-SRC_URI = "${KDE_MIRROR}/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"
 
 DEPENDS += " \
     kwayland \

classes/liri.bbclass

@@ -1,6 +1,6 @@
 LIRI_GIT_BRANCH ?= "develop"
 
-SRC_URI = "git://github.com/lirios/${@'${BPN}'.replace('liri-', '')}.git;protocol=git;branch=${LIRI_GIT_BRANCH}"
+SRC_URI = "git://github.com/lirios/${@'${BPN}'.replace('liri-', '')}.git;branch=${LIRI_GIT_BRANCH};protocol=https"
 
 DEPENDS += " \
     qtwayland-native \
@@ -11,6 +11,7 @@ DEPENDS += " \
     qttools \
     qtdeclarative \
     qtwayland \
+    qtquickcontrols2 \
 "
 
 inherit cmake_qt5_extra pkgconfig

classes/lxqt.bbclass

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

classes/qt5-translation.bbclass

@@ -5,7 +5,7 @@ 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"
 
 python qt_do_split_locales() {
     import glob
@@ -53,16 +53,16 @@ python qt_do_split_locales() {
         files = ''
         for transvar in d.getVar('QT_TRANSLATION_FILES').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)))
 }
 
-PACKAGESPLITFUNCS_prepend = "qt_do_split_locales "
+PACKAGESPLITFUNCS:prepend = "qt_do_split_locales "
 

conf/layer.conf

@@ -6,6 +6,10 @@ 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"
@@ -19,7 +23,7 @@ LAYERDEPENDS_meta-qt5-extra = " \
     gnome-layer \
     meta-python \
 "
-LAYERSERIES_COMPAT_meta-qt5-extra = "dunfell gatesgarth hardknott"
+LAYERSERIES_COMPAT_meta-qt5-extra = "honister kirkstone langdale nanbield scarthgap styhead walnascar"
 
 LICENSE_PATH += "${LAYERDIR}/files/licenses"
 

extends-meta-clang/recipes-kde/clazy.bb

@@ -0,0 +1,24 @@
+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"

extends-meta-clang/recipes-kde/clazy/0001-clazy-no-rpath.patch

@@ -0,0 +1,33 @@
+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
+
+

extends-meta-clang/recipes-kde/clazy/0002-Build-fixes-for-LLVM_Clang_15.0.0.patch

@@ -0,0 +1,220 @@
+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;
+ 
+ };

extends-meta-clang/recipes-kde/kdevelop.bb

@@ -1,17 +1,21 @@
 SUMMARY = "Cross-platform IDE for C, C++, Python, QML/JavaScript and PHP"
-LICENSE = "GPL-2.0 & GFDL-1.2 & LGPL-2.0"
+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://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
-    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+    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-base gettext pkgconfig gtk-icon-cache mime mime-xdg bash-completion
-
-python() {
-    if 'clang-layer' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-clang to be present due to qttools-native - see extends-meta-qt5/qttools_git.bbappend.')
-}
+inherit kde-apps gettext pkgconfig gtk-icon-cache mime mime-xdg bash-completion
 
 DEPENDS += " \
     kauth-native \
@@ -21,6 +25,7 @@ DEPENDS += " \
     kdoctools-native \
     ki18n-native \
     kpackage-native \
+    kcmutils-native \
     shared-mime-info-native \
     \
     qtbase \
@@ -55,13 +60,12 @@ DEPENDS += " \
     threadweaver \
 "
 
-PV = "5.6.2"
-SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "0f86bc3fe53f761c1e3e3f7544577a0c41433be8bff310cf2e729f76f4363bf6"
+PV = "${KDE_APP_VERSION}"
+SRC_URI[sha256sum] = "3c3baf212fd6ffd7ccb5b0796c2b43e252235c25275979c1570c44f80821f9d6"
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
-do_configure_append() {
+do_configure:append() {
     # although the name is missleading I still love cmake_extra_sanity.bbclass...
     sed -i \
         -e 's:${STAGING_DIR_NATIVE}::g' \
@@ -72,7 +76,7 @@ do_configure_append() {
 # Yeah nasty but...
 FILES_SOLIBSDEV = "${libdir}/libKDevC*so ${libdir}/libKDevPlatform*so"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kdev* \
     ${datadir}/k*5 \
     ${datadir}/knsrcfiles \
@@ -84,13 +88,13 @@ FILES_${PN} += " \
     ${OE_QMAKE_PATH_QML} \
 "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     bash \
     zsh \
 "
 
 # To give best user experience out of the box..
-RRECOMMENDS_${PN} += " \
+RRECOMMENDS:${PN} += " \
     packagegroup-qt5-toolchain-target \
     binutils \
     ccache \

extends-meta-oe/cmark_%.bbappend

@@ -0,0 +1,9 @@
+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}
+}
+

extends-meta-oe/poppler_%.bbappend

@@ -1,3 +1,3 @@
-PACKAGECONFIG_append = " qt5"
+PACKAGECONFIG:append = " qt5"
 
 inherit cmake_qt5

extends-meta-qt5/qt5-creator_git.bbappend

@@ -1,5 +1,5 @@
 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)}"
+PACKAGECONFIG:append = " ${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', ' clang', '', d)}"
 

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

extends-meta-qt5/qtbase_git.bbappend

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 PACKAGECONFIG_FONTS = "fontconfig"
 
@@ -8,13 +8,13 @@ PACKAGECONFIG_FONTS = "fontconfig"
 # 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"
+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 = " \
+PACKAGECONFIG_DISTRO:append = " \
     sm \
     accessibility \
     sql-sqlite \

extends-meta-qt5/qtsvg_git.bbappend

@@ -0,0 +1 @@
+BBCLASSEXTEND = "native"

extends-meta-qt5/qttools_git.bbappend

@@ -4,17 +4,17 @@ 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)}"
+PACKAGECONFIG:append = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', ' clang', '', d)}"

extends-meta-qt5/qtwayland_git.bbappend

@@ -5,7 +5,7 @@
 # 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() {
+do_patch:append:class-native() {
     bb.build.exec_func('do_fix_qtwaylandscanner_cpp', d)
 }
 

extends-meta-qt5/quazip.bb

@@ -1,13 +1,13 @@
 SUMMARY = "Qt/C++ wrapper for ZIP/UNZIP package"
 HOMEPAGE = "https://github.com/stachenov/quazip"
-LICENSE = "LGPL-2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4c01c380a79ed7138aa9049e29df9c6a"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=af67f05b2b6abf61e608dcfccb94b3e1"
 
 DEPENDS = "qtbase zlib"
 
-SRC_URI = "git://github.com/stachenov/quazip.git"
-SRCREV = "100578f686b7da029a19c0bc9ad3c93f80adb2bb"
-PV = "1.1"
+SRC_URI = "git://github.com/stachenov/quazip.git;branch=master;protocol=https"
+SRCREV = "6117161af08e366c37499895b00ef62f93adc345"
+PV = "1.3"
 S = "${WORKDIR}/git"
 
 inherit cmake_qt5

extends-oe-core/ghostscript%.bbappend

@@ -0,0 +1,20 @@
+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
+}

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}/"

extends-oe-core/gstreamer1.0-plugins-good_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " qt5"
+PACKAGECONFIG:append = " qt5"

files/licenses/X11

@@ -0,0 +1,13 @@
+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.

recipes-gottcode/connectagram/connectagram.bb

@@ -1,9 +1,9 @@
 SUMMARY = "Connectagram is a word unscrambling game"
 HOMEPAGE = "https://gottcode.org/connectagram/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 qt5-translation gtk-icon-cache
+inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
 
 DEPENDS = "qttools-native qtbase hicolor-icon-theme"
 
@@ -15,11 +15,11 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
 "
 
 # WIP: qt5-translation expects *.qm to work properly so pack word data in PN for now
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/connectagram/data \
 "

recipes-gottcode/focuswriter/focuswriter.bb

@@ -1,9 +1,9 @@
 SUMMARY = "FocusWriter is a simple, distraction-free writing environment"
 HOMEPAGE = "http://gottcode.org/gottet/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 qt5-translation gtk-icon-cache mime-xdg
+inherit qmake5 pkgconfig qt5-translation gtk-icon-cache mime-xdg
 
 DEPENDS += " \
     qttools-native \
@@ -21,7 +21,7 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/${BPN}/icons \
     ${datadir}/${BPN}/symbols1000.dat \

recipes-gottcode/gottet/gottet.bb

@@ -1,21 +1,20 @@
 SUMMARY = "A tetris clone using the Qt GUI toolkit"
 HOMEPAGE = "http://gottcode.org/gottet/"
-LICENSE = "GPL-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
 
-inherit qmake5 qt5-translation gtk-icon-cache
+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] = "9e0c5cf63233376228dc7888515e6556"
-SRC_URI[sha256sum] = "6c979caa5b3fa6854ca8367ca0595814fcc101f0bdfad02d64219dd9049abb2b"
-PV = "1.1.9"
+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} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/icons \
 "

recipes-gottcode/hexalate/hexalate.bb

@@ -1,21 +1,20 @@
 SUMMARY = "A color matching game"
 HOMEPAGE = "http://gottcode.org/hexalate/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 qt5-translation gtk-icon-cache
+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] = "4c318906a2782aed37a1e7244f73f97c"
-SRC_URI[sha256sum] = "5d3198523960d4df394d2092cd7e7b9003878a70a2934dbada60947651b1c88d"
-PV = "1.1.6"
+SRC_URI[sha256sum] = "a54aa31c6243ba091f46a6ced17be70e7481cc2af7de94f7e0288864355133bd"
+PV = "1.2.0"
 UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/icons \
 "

recipes-gottcode/kapow/kapow.bb

@@ -1,9 +1,9 @@
 SUMMARY = "Kapow is a punch clock program to easily keep track of your hours"
 HOMEPAGE = "https://gottcode.org/kapow/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 qt5-translation gtk-icon-cache
+inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
 
 DEPENDS = "qttools-native qtbase hicolor-icon-theme"
 
@@ -15,6 +15,6 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
 "

recipes-gottcode/packagegroups/gottcode-world.bb

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     connectagram \
     focuswriter \
     gottet \

recipes-gottcode/peg-e/peg-e.bb

@@ -1,9 +1,9 @@
 SUMMARY = "Peg-E is a peg solitaire game"
 HOMEPAGE = "http://gottcode.org/peg-e/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 qt5-translation gtk-icon-cache
+inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
 
 DEPENDS = "qttools-native qtbase hicolor-icon-theme"
 
@@ -15,7 +15,7 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/peg-e/icons \
 "

recipes-gottcode/simsu/simsu.bb

@@ -1,20 +1,19 @@
 SUMMARY = "Simsu is a basic Sudoku game"
 HOMEPAGE = "http://gottcode.org/simsu/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 qt5-translation gtk-icon-cache
+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] = "dc33b6c8c0cc5c60e47e1c094f99c467"
-SRC_URI[sha256sum] = "b5df8994ff7bc35e775c466c8214e4362d1f720757383c9cd412693fcb6f143b"
-PV = "1.3.9"
+SRC_URI[sha256sum] = "6db0c004de67c122ac67f34cc6c1a68cd78be02034eceeab922848f87cb85e87"
+PV = "1.4.0"
 UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
 "

recipes-gottcode/tetzle/tetzle.bb

@@ -1,9 +1,9 @@
 SUMMARY = "Tetzle is a jigsaw puzzle game that uses tetrominoes for the pieces"
 HOMEPAGE = "https://gottcode.org/tetzle/"
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 qt5-translation gtk-icon-cache mime-xdg
+inherit qmake5 pkgconfig qt5-translation gtk-icon-cache mime-xdg
 
 DEPENDS += "qttools-native qtbase hicolor-icon-theme"
 
@@ -15,6 +15,6 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
 "

recipes-graphics/kcolorpicker/kcolorpicker.bb

@@ -0,0 +1,17 @@
+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"

recipes-graphics/kimageannotator/kimageannotator.bb

@@ -0,0 +1,19 @@
+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"

recipes-graphics/picom/picom.bb

@@ -3,7 +3,7 @@ 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"
+SRC_URI = "git://github.com/yshui/picom.git;branch=stable/8;protocol=https"
 SRCREV = "dac85eac10082dfc3df463aaa74b811144e22122"
 PV = "8.2"
 S = "${WORKDIR}/git"
@@ -28,7 +28,7 @@ DEPENDS = " \
     uthash \
 "
 
-inherit meson features_check gtk-icon-cache
+inherit meson pkgconfig features_check gtk-icon-cache
 
 REQUIRED_DISTRO_FEATURES = "x11"
 

recipes-graphics/qpdfview/qpdfview_0.4.18.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Light-weight tabbed PDF, DJVU and PostScript viewer"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS += "cups poppler qtsvg"
@@ -11,7 +11,7 @@ SRC_URI = " \
 SRC_URI[md5sum] = "4d63ee0095e939602f9bf4759ae57953"
 SRC_URI[sha256sum] = "cc642e7fa74029373ca9b9fbc29adc4883f8b455130a78ad54746d6844a0396c"
 
-inherit qmake5 mime-xdg
+inherit qmake5 pkgconfig mime-xdg
 
 QMAKE_PROFILES = "${S}/qpdfview.pro"
 EXTRA_QMAKEVARS_PRE += " \
@@ -20,4 +20,4 @@ EXTRA_QMAKEVARS_PRE += " \
     PLUGIN_INSTALL_PATH=${libdir}/${BPN} \
 "
 
-FILES_${PN} += "${datadir}"
+FILES:${PN} += "${datadir}"

recipes-graphics/scribus/scribus_1.5.7.bb

@@ -1,25 +0,0 @@
-SUMMARY = "Scribus: Open source desktop publishing"
-HOMEPAGE = "https://www.scribus.net/"
-LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later & BSD-3-Clause & MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=46d73026c0f1b3a4016bc06a677411ab"
-
-inherit cmake_qt5 cmake_extra_sanity python3native gtk-icon-cache mime mime-xdg
-
-DEPENDS += " \
-    qttools-native \
-    boost \
-    tiff \
-    lcms \
-    hunspell \
-    poppler \
-"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-devel/${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce"
-
-
-FILES_${PN} += " \
-    ${datadir}/icons \
-    ${datadir}/mime \
-    ${datadir}/metainfo \
-"

recipes-graphics/sddm/sddm.bb

@@ -1,5 +1,5 @@
 SUMMARY = "SDDM is a modern display manager for X11"
-LICENSE = "GPLv2 & CC-BY-3.0"
+LICENSE = "GPL-2.0-only & CC-BY-3.0"
 LIC_FILES_CHKSUM = " \
     file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b \
     file://LICENSE.CC-BY-3.0;md5=36b7342d5619a3a0d3b581e89803ec25 \
@@ -17,15 +17,14 @@ PACKAGECONFIG[pam] = "-DENABLE_PAM=ON, -DENABLE_PAM=OFF, libpam"
 # Note: we should check default config changes by running sddm --example-config on target.
 # This is usually done during build but does not work for our cross environment
 SRC_URI = " \
-    git://github.com/sddm/${BPN}.git;protocol=git;branch=master \
-    file://0001-fix-qml-install-dir.patch \
-    file://0002-Workaround-missing-sessions.patch \
+    git://github.com/sddm/${BPN}.git;branch=develop;protocol=https \
+    file://0001-Workaround-missing-sessions.patch \
     file://sddm.pam \
     file://sddm-autologin.pam \
     file://sddm.conf \
 "
-SRCREV = "de41b8ea555f2e42ba47d83530ad654ca708cf85"
-PV = "0.18.1"
+SRCREV = "c257a40ba95f56b5f3830b923b1c56aa055cf8ea"
+PV = "0.19.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -34,7 +33,7 @@ EXTRA_OECMAKE += " \
     -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \
 "
 
-do_configure_append() {
+do_configure:append() {
     # fix sysroot path
     sed -i 's:${STAGING_DIR_HOST}.*${libdir}:${libdir}:g' ${B}/src/common/Constants.h
 }
@@ -45,7 +44,7 @@ install_pam() {
     install -m 644 ${WORKDIR}/sddm-autologin.pam ${D}${sysconfdir}/pam.d/sddm-autologin
 }
 
-do_install_append() {
+do_install:append() {
     install -d ${D}/${sysconfdir}/sddm.conf.d
     install -m 644 ${WORKDIR}/sddm.conf ${D}/${sysconfdir}/sddm.conf.d/00-default.conf
 
@@ -56,14 +55,14 @@ do_install_append() {
     ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'install_pam', '', d)}
 }
 
-FILES_${PN} += "${OE_QMAKE_PATH_QML}"
+FILES:${PN} += "${OE_QMAKE_PATH_QML}"
 
-SYSTEMD_SERVICE_${PN} = "${BPN}.service"
+SYSTEMD_SERVICE:${PN} = "${BPN}.service"
 
 USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/sddm --shell /bin/false --user-group --groups video sddm"
+USERADD_PARAM:${PN} = "--system --home ${localstatedir}/lib/sddm --shell /bin/false --user-group --groups video sddm"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     bash \
     packagegroup-core-x11-xserver \
     xinit \
@@ -76,7 +75,7 @@ RDEPENDS_${PN} += " \
     qtdeclarative-qmlplugins \
 "
 
-RRECOMMENDS_${PN += " \
+RRECOMMENDS:${PN += " \
     qtvirtualkeyboard-plugins \
     qtvirtualkeyboard-qmlplugins \
 "

recipes-graphics/sddm/sddm/0001-Workaround-missing-sessions.patch

@@ -14,7 +14,7 @@ The current approach is wrong in many ways:
   environment: There is no PATH variable set by systemd. So for session files
   without path: Do not perform further checks / just trust for now.
   
-Upstream-Sttaus: Pending
+Upstream-Status: Pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
@@ -22,10 +22,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 4 insertions(+), 15 deletions(-)
 
 diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp
-index 2a3c091..927bce2 100644
+index 1953c76..549cd4d 100644
 --- a/src/greeter/SessionModel.cpp
 +++ b/src/greeter/SessionModel.cpp
-@@ -124,22 +124,11 @@ namespace SDDM {
+@@ -125,22 +125,11 @@ namespace SDDM {
  
              Session *si = new Session(type, session);
              bool execAllowed = true;
@@ -41,8 +41,8 @@ index 2a3c091..927bce2 100644
 -                execAllowed = false;
 -                QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
 -                QString envPath = env.value(QStringLiteral("PATH"));
--                QStringList pathList = envPath.split(QLatin1Char(':'));
--                foreach(const QString &path, pathList) {
+-                const QStringList pathList = envPath.split(QLatin1Char(':'));
+-                for(const QString &path : pathList) {
 -                    QDir pathDir(path);
 -                    fi.setFile(pathDir, si->tryExec());
 -                    if (fi.exists() && fi.isExecutable()) {
@@ -53,5 +53,5 @@ index 2a3c091..927bce2 100644
              }
              // add to sessions list
 -- 
-2.14.5
+2.34.1
 

recipes-graphics/sddm/sddm/0001-fix-qml-install-dir.patch

@@ -1,28 +0,0 @@
-From 45038115cf962f0b5923a74ae362e3a430ec5a3b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 8 Nov 2018 10:37:24 +0100
-Subject: [PATCH] fix qml install dir
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- components/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
-index 33920a6..22d75c9 100644
---- a/components/CMakeLists.txt
-+++ b/components/CMakeLists.txt
-@@ -1,5 +1,5 @@
- configure_file("2.0/LayoutBox.qml" "2.0/LayoutBox.qml")
- 
--install(DIRECTORY "2.0/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
--install(DIRECTORY "common/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
--install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/2.0/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
-+install(DIRECTORY "2.0/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
-+install(DIRECTORY "common/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
-+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/2.0/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
--- 
-2.14.5
-

recipes-kdab/hotspot/hotspot_git.bb

@@ -1,5 +1,5 @@
 SUMMARY = "The Linux perf GUI for performance analysis"
-LICENSE = "GPLv2+ | KDAB-Commercial | KDAB-Commercial-US"
+LICENSE = "GPL-2.0-or-later | KDAB-Commercial | KDAB-Commercial-US"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.txt;md5=50a9af6464b390664488e7af1cc5c148 \
     file://LICENSE.GPL.txt;md5=8b7a65584aeb92995bcb6066ed0f58f7 \
@@ -21,11 +21,11 @@ DEPENDS += " \
     kio \
     solid \
 "
-SRC_URI = "gitsm://github.com/KDAB/hotspot.git"
+SRC_URI = "gitsm://github.com/KDAB/hotspot.git;protocol=https;branch=master"
 SRCREV = "35d1865babf40b9df454810ca8cc09e77b0c349a"
 S = "${WORKDIR}/git"
 PV = "1.2.0+git${SRCPV}"
 
-FILES_${PN} += "${datadir}/icons"
+FILES:${PN} += "${datadir}/icons"
 
-RDEPENDS_${PN} += "perf"
+RDEPENDS:${PN} += "perf"

recipes-kdab/kdcharts/kdcharts_git.bb

@@ -1,8 +1,8 @@
 SUMMARY = "A Qt tool for creating business and scientific charts"
-LICENSE = "GPLv2+ | KDAB-Commercial"
+LICENSE = "BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.txt;md5=d5e1956ab398a4ae39e2470a9abd4889 \
-    file://LICENSE.GPL.txt;md5=6af452a21ffa624c438c2cde4423a893 \
+    file://LICENSES/BSD-3-Clause.txt;md5=f225922a2c12dfa5218fb70c49db3ea6 \
+    file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \
 "
 
 inherit cmake_qt5_extra
@@ -12,14 +12,14 @@ DEPENDS += " \
     qtsvg \
 "
 
-do_install_append() {
+do_install:append() {
     # these have gone wild / qmake was always pain
     rm -r ${D}/usr/mkspecs
 }
 
-SRC_URI = "git://github.com/KDAB/KDChart.git"
-SRCREV = "95547e8a2f6c362db1dd071a2df00b0e75e05da0"
+SRC_URI = "git://github.com/KDAB/KDChart.git;branch=master;protocol=https"
+SRCREV = "aa9de13376a5e9f4c8802091776584614db8677e"
 S = "${WORKDIR}/git"
-PV = "2.7.2"
+PV = "3.0.0"
 
-FILES_${PN}-dev += "${datadir}/mkspecs"
+FILES:${PN}-dev += "${datadir}/mkspecs"

recipes-kdab/kdreports/kdreports_git.bb

@@ -1,8 +1,9 @@
 SUMMARY = "Qt library for generating printable and exportable reports"
 DESCRIPTION = "Qt library for generating printable and exportable reports from code and from XML descriptions"
-LICENSE = "(LGPL-2.1 | LGPL-3.0) & (GPL-2.0 | GPL-3.0 ) | KDAB-Commercial"
+LICENSE = "BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.txt;md5=d988404a6396edf41e7f8cbb2db3c185 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \
 "
 
 inherit cmake_qt5_extra
@@ -12,12 +13,12 @@ DEPENDS += " \
     kdcharts \
 "
 
-SRC_URI = "git://github.com/KDAB/KDReports.git"
-SRCREV = "47728293e7842140d36a7861cf4316f2c1cbd795"
+SRC_URI = "git://github.com/KDAB/KDReports.git;branch=master;protocol=https"
+SRCREV = "a5095bd266b5d4697978e1a3042481edd72c2c3f"
 S = "${WORKDIR}/git"
-PV = "1.9.0"
+PV = "2.2.0"
 
-do_install_append() {
+do_install:append() {
     # these have gone wild / qmake was always pain
     rm -r ${D}/usr/mkspecs
 }

recipes-kdab/kdsoap/kdsoap.bb

@@ -7,4 +7,4 @@ DEPENDS += " \
 
 SRC_URI += "file://0002-Do-not-export-kdwsdl2cpp-as-target-it-will-fin-it-s-.patch"
 
-FILES_${PN}-dev += "${datadir}/mkspecs"
+FILES:${PN}-dev += "${datadir}/mkspecs"

recipes-kdab/kdsoap/kdsoap.inc

@@ -1,5 +1,5 @@
 SUMMARY = "A Qt-based client-side and server-side SOAP component"
-LICENSE = "(GPLv2 & LGPL-2.1 & AGPL-3.0) | KDAB-Commercial"
+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 \
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
 
 inherit cmake_qt5
 
-SRC_URI = "git://github.com/KDAB/KDSoap.git;protocol=https"
+SRC_URI = "git://github.com/KDAB/KDSoap.git;protocol=https;branch=master"
 SRCREV = "fb0e905e242c2044fd25683a406eb6d369db052f"
 S = "${WORKDIR}/git"
 PV = "1.9.0"

recipes-kde/apps/analitza/analitza.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Add mathematical features to your program"
-LICENSE = "GPL-2.0 & LGPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & LGPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
@@ -15,9 +15,9 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "edfd64d5f11de28a9d37244e3d744b57d0436b7ae0e4bc5a4ea625aa28cab450"
+SRC_URI[sha256sum] = "beaa65dcc664a1d7cd5320cb07ecce4473b1dc5cd8f42432220460c5fc3f4eea"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/libanalitza \
     ${OE_QMAKE_PATH_QML} \
 "

recipes-kde/apps/ark/ark.bb

@@ -1,18 +1,21 @@
 SUMMARY = "Ark is KDE's file archiver"
-LICENSE = "GPL-2.0 & LGPL-3.0"
+LICENSE = "BSD-2-Clause & CC0-1.0 & GPL-2.0-or-later & LGPL-3.0-only & MIT"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-    file://COPYING.icons;md5=78d89b1a70de936b57b7231c94b75ca6 \
+    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 \
 "
 
 inherit kde-apps gtk-icon-cache mime mime-xdg
 
 DEPENDS += "\
     libarchive \
+    libzip \
     karchive \
     kauth-native \
     kconfig-native \
-    kcoreaddons-native \
     kcrash \
     kdbusaddons \
     kdoctools-native \
@@ -28,9 +31,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af"
+SRC_URI[sha256sum] = "9cc79811d95eb61e491a8ff6f0aebbab9b38b739ac4a5f66fe3807cd22a78065"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/mime \

recipes-kde/apps/artikulate/artikulate.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Artikulate is a pronunciation trainer"
-LICENSE = "GPL-2.0 & CC-BY-SA-4.0"
+LICENSE = "GPL-2.0-only & CC-BY-SA-4.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=93e64b4a83c7e441e48bbdeeea05c977 \
     file://COPYING.DOC;md5=4b39cb11ffa11c92d3f7a3431390e0d9 \
@@ -21,9 +21,9 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "c0f18f4c239881ec0cd8e7d5b4feeaa195224bcf558dc7ac65f4a92c4934d67a"
+SRC_URI[sha256sum] = "d207cbbb37869767810277f0a58ee3372f6d7f4513b73c391aee319c107ede4c"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/knsrcfiles \
     ${OE_QMAKE_PATH_PLUGINS} \

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

@@ -1,8 +1,13 @@
 SUMMARY = "Widgets for Baloo"
-LICENSE = "LGPL-2.0"
+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"
 LIC_FILES_CHKSUM = " \
-    file://COPYING.README;md5=f5d7c5af660f94231a1d4e19501bce8f \
-    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+    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 \
 "
 
 inherit kde-apps gettext
@@ -19,9 +24,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc"
+SRC_URI[sha256sum] = "0baabcbf277a56f4d7b1fb8f7aff2bddf77d1261bbabd6b717c0d26d2929db5a"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kservices5 \
     ${OE_QMAKE_PATH_PLUGINS} \
 "

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 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=3c8ea28d12b8a786603a5394fc50096d \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -19,9 +19,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "aa9927af7f8f98f2e56eebe9eac73c06adc62e598a1300be210e962e878deae1"
+SRC_URI[sha256sum] = "a0b4f72a32d789d72a0d7f3115777c360216952dd24ec822514ee5490a620f18"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
 "

recipes-kde/apps/calligra/kdb/0001-Fix-build-with-newer-Qt.patch

@@ -0,0 +1,71 @@
+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
+
+

recipes-kde/apps/calligra/kdb_3.2.0.bb

@@ -1,6 +1,6 @@
 SUMMARY = "Database Connectivity and Creation Framework"
 HOMEPAGE = "https://community.kde.org/KDb"
-LICENSE = "LGPL-2.0 & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "LGPL-2.0-only & GFDL-1.2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=a9cc0417b6424a8311f616fa527d0755 \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -16,9 +16,10 @@ DEPENDS += " \
 "
 
 SRC_URI = " \
-    ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
+    ${KDE_MIRROR}/${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"
 
-FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
+FILES:${PN} += "${OE_QMAKE_PATH_PLUGINS}"

recipes-kde/apps/calligra/kexi/0005-Use-plain-Marble-package-instead-of-KexiMarble.patch

@@ -0,0 +1,200 @@
+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
+

recipes-kde/apps/calligra/kexi_3.2.0.bb

@@ -1,6 +1,6 @@
 SUMMARY = "Kexi is a visual database applications creator"
 HOMEPAGE = "https://www.calligra.org/kexi/"
-LICENSE = "GPL-2.0 & LGPL-2.0 & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "GPL-2.0-only & LGPL-2.0-only & GFDL-1.2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=8608b1f74c58ebcb11718f46e8619749 \
     file://COPYING.LIB;md5=7537f2f34ef162007ae9f34b9f256dcb \
@@ -33,36 +33,34 @@ DEPENDS += " \
     kcompletion \
     kio \
     ktexteditor \
-    marble \
+    mariadb \
+    postgresql \
 "
 
 SRC_URI = " \
-    ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
+    ${KDE_MIRROR}/${BPN}/src/${BPN}-${PV}.tar.xz \
     file://0001-remove-try_run-by-try_compile-in-breeze-icon-check.patch \
     file://0002-Add-missing-include-to-fix-build-with-Qt-5.11.patch \
     file://0003-Fix-build-with-Qt-5.13.patch \
     file://0004-Set-extern-C-after-including-common-headers.patch \
+    file://0005-Use-plain-Marble-package-instead-of-KexiMarble.patch \
 "
 SRC_URI[sha256sum] = "7a813f9ea815a09c1e733d0e7dc879c64eee85f075389e87e6aab99cf0c1c1ff"
 
-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
+# REVISIT (try marble again once 3.3.x is out)
 #-- 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
 

recipes-kde/apps/calligra/kproperty_3.2.0.bb

@@ -1,6 +1,6 @@
 SUMMARY = "Property editing framework with editor widget"
 HOMEPAGE = "https://community.kde.org/KProperty"
-LICENSE = "LGPL-2.0 & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "LGPL-2.0-only & GFDL-1.2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=3dcc9b0b0118292a0c5d1c18927ef176 \
     file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
@@ -17,10 +17,10 @@ DEPENDS += " \
     kguiaddons \
 "
 
-SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/${BPN}/src/${BPN}-${PV}.tar.xz"
 SRC_URI[sha256sum] = "67af0c2d74715957bd5373a6a30589ff0a996cb1d267dfd0538dccaa9a768dfa"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kproperty3 \
     ${OE_QMAKE_PATH_PLUGINS} \
 "

recipes-kde/apps/calligra/kreport_3.2.0.bb

@@ -1,6 +1,6 @@
 SUMMARY = "Framework for creation and generation of reports"
 HOMEPAGE = "https://community.kde.org/KReport"
-LICENSE = "LGPL-2.0 & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "LGPL-2.0-only & GFDL-1.2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=1634220ce20ef95161c3b8401908638c \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -24,13 +24,13 @@ DEPENDS += " \
 "
 
 SRC_URI = " \
-    ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
+    ${KDE_MIRROR}/${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"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kservicetypes5 \
     ${datadir}/kreport3 \
     ${OE_QMAKE_PATH_PLUGINS} \

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

@@ -1,6 +1,6 @@
 SUMMARY = "Plugins for Dolphin"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881"
 
 inherit kde-apps gettext
 
@@ -18,9 +18,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44"
+SRC_URI[sha256sum] = "703c4666d5fb9a48cca01b52ca5bc4aacbcba3a82c1656487f40334513851517"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/kservices5 \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/dolphin/dolphin.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KDE File Manager"
-LICENSE = "GPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -12,10 +12,10 @@ DEPENDS += " \
     kconfig-native \
     kcoreaddons-native \
     kdoctools-native \
+    kcmutils-native \
     sonnet-native \
     \
     kinit \
-    kcmutils \
     knewstuff \
     ki18n \
     kdbusaddons \
@@ -36,15 +36,16 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264"
+SRC_URI[sha256sum] = "971489a59cdd6b297e2142eb3315847addafbc4e3504e1609fe5e1d119cf15a3"
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
 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 \

recipes-kde/apps/dragon/dragon.bb

@@ -31,11 +31,11 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "c69bbfb477d23e83944099ff58e79866c754b548aeb873e66dace6f19aef8070"
+SRC_URI[sha256sum] = "ea699d4c7c780063aa0598a2050f78f3ce93de86c3818f56541e59d20fa9e6ad"
 
 CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/solid \
     ${datadir}/icons \

recipes-kde/apps/filelight/filelight.bb

@@ -14,6 +14,9 @@ DEPENDS += "\
     kcoreaddons-native \
     kdoctools-native \
     sonnet-native \
+    kpackage-native \
+    qtquickcontrols2 \
+    kdeclarative \
     kio \
     kparts \
     solid \
@@ -22,9 +25,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3"
+SRC_URI[sha256sum] = "d28b9b9e6628bc4f97398e04872f57d9b46c1a7259a5d68f8311e50db3a74f6e"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/icons \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/granatier/granatier.bb

@@ -25,9 +25,9 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "a8a3fcc075cbae3047dfbf4e2b46e5b46f1dd0a4d37295d6246085ca37b8e49f"
+SRC_URI[sha256sum] = "16527c0b596de555a19b5f67672bf1a463a4a934c85d578aef23b0bae856d458"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/gwenview/gwenview.bb

@@ -1,5 +1,5 @@
 SUMMARY = "A fast and easy to use image viewer for KDE"
-LICENSE = "GPL-2.0"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b"
 
 inherit kde-apps gettext mime-xdg
@@ -22,17 +22,18 @@ DEPENDS += " \
     kfilemetadata \
     baloo \
     libkdcraw \
+    kimageannotator \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2"
+SRC_URI[sha256sum] = "f125eb729dd81ea265471c9bbca54fe6a7e87348c9a782b321331da72a02aa6e"
 
 EXTRA_OECMAKE += " \
     -DJPEGLIB_RUN_RESULT=true \
     -DJPEGLIB_RUN_RESULT__TRYRUN_OUTPUT=0 \
 "
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/icons \
     ${datadir}/solid \

recipes-kde/apps/kalgebra/kalgebra.bb

@@ -1,5 +1,5 @@
 SUMMARY = "2D and 3D Graph Calculator"
-LICENSE = "GPL-2.0 & LGPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & LGPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
@@ -22,9 +22,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "60f450776d785c8c402806c28abce208e8a8f951b0da81875b3e29de4a13e1af"
+SRC_URI[sha256sum] = "82e0007a9a71a1771624410449be4a7c2db13fa9583e917b330270265512f977"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/icons \
     ${datadir}/kalgebramobile \
 "

recipes-kde/apps/kalzium/kalzium.bb

@@ -1,9 +1,13 @@
 SUMMARY = "Periodic Table of Elements"
-LICENSE = "GPL-2.0 & GFDL-1.2 & LGPL-2.0"
+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"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-    file://COPYING.DOC;md5=d8855fca80aa0b428deafa405d0ea17a \
+    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 \
 "
 
 # avogadrolibs -> glew
@@ -37,9 +41,9 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "1549b5e08caa3ef7cab5375cfb8677dfc02a28a15136bef1edaf93c9fcadad15"
+SRC_URI[sha256sum] = "0c743f7cef68ffca68605763ca740ed3a7fd26d0f085a80ad6b5f3b777ea5c50"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/kxmlgui5 \
     ${datadir}/knsrcfiles \

recipes-kde/apps/kapman/kapman.bb

@@ -26,9 +26,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "3d2c38d8ca6a3addb3f5059fa35a5cf09c4802ee78a45dc4ddbd9ccfdf9927ac"
+SRC_URI[sha256sum] = "379d0c108d9e2d1d2ea73909cae37bf464b2d9b93176586ec570d51e1b2381b8"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
 "

recipes-kde/apps/kate/kate.bb

@@ -1,14 +1,10 @@
 SUMMARY = "An advanced editor component which is used in numerous KDE applications requiring a text editing component"
-LICENSE = "GPL-2.0+ & GPL-3.0 & LGPL-2.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-3.0 & MIT & The-Qt-Company-GPL-Exception-1.0"
+LICENSE = "GPL-2.0-or-later & LGPL-2.0-only & LGPL-2.0-or-later & MIT"
 LIC_FILES_CHKSUM = " \
     file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
-    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
     file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
     file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
-    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
-    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
     file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
-    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=06c4b774de9d70e39292959b3e6757be \
 "
 
 inherit kde-apps gettext mime-xdg
@@ -39,11 +35,11 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb"
+SRC_URI[sha256sum] = "d195bc0ecf4eed66a123225686ca37c4e673d8ca30e7c39fccb02dfdc7945fa6"
 
 FILES_SOLIBSDEV = ""
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kateproject \
     ${datadir}/k*5 \
     ${datadir}/plasma \

recipes-kde/apps/katomic/katomic.bb

@@ -27,12 +27,12 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "c1477c5a8c98c0fd5642316964e366616527ea97ffa475ddde36ce21c811d9b6"
+SRC_URI[sha256sum] = "99fe86f6b1dd79da4615fd984fd51e0c144c47af2f4c0368353f4f32c2f154d7"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/kconf_update \
     ${datadir}/knsrcfiles \
 "
 
-RDEPENDS_${PN} += "perl"
+RDEPENDS:${PN} += "perl"

recipes-kde/apps/kblocks/kblocks.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KBlocks - Falling Blocks Game"
-LICENSE = "GPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -22,9 +22,9 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "8cf49362c77985c655c20f492142cc0f8c8a7a8cdcf226dd5cbba37a85391df6"
+SRC_URI[sha256sum] = "8487035e19277df8ef962201e2fa8cf7683f800755de2745944465627d3d9532"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/knsrcfiles \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/kbounce/kbounce.bb

@@ -27,9 +27,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "3602903c8414a617461b308fb6c033a95facf14007d40b4105c601e4faba6046"
+SRC_URI[sha256sum] = "7b712872db2a3510eb8a5b91c4c85980a63971b4171d192081cf61b90777ab58"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
 "

recipes-kde/apps/kbreakout/kbreakout.bb

@@ -23,9 +23,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "519bba779a8b5211b9aa33398787dc5203ba9a6fd5330096c40a0ca8ea1e03a0"
+SRC_URI[sha256sum] = "34c3300f607a56f51b11f68869c58a0789876265572db6f89826db9ef4ddfe38"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
 "

recipes-kde/apps/kcachegrind/kcachegrind.bb

@@ -25,11 +25,11 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926"
+SRC_URI[sha256sum] = "160b9b2f28e1e6986026c0fc3dc34df26d56d88e3355704a0226e60786218ac7"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
 "
 
-RRECOMMENDS_${PN} += "graphviz"
-RDEPENDS_${PN} += "perl"
+RRECOMMENDS:${PN} += "graphviz"
+RDEPENDS:${PN} += "perl"

recipes-kde/apps/kcalc/kcalc.bb

@@ -1,8 +1,9 @@
 SUMMARY = "KDE's calculator application"
-LICENSE = "GPL-2.0 & LGPL-2.1"
+LICENSE = "BSD-3-Clause & CC0-1.0 & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-3-Clause.txt;md5=f225922a2c12dfa5218fb70c49db3ea6 \
+    file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
 "
 
 inherit kde-apps gettext
@@ -23,11 +24,11 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "cf389a1c4db1c7da8b5b7ecec030e9c68df5d950c581d91f3931b7f6d2a7cacf"
+SRC_URI[sha256sum] = "b43e76cceec89954954895b07f5c79ce8834d7efb35091e428b37941b361fd4b"
 
 FILES_SOLIBSDEV = ""
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/kxmlgui5 \
     ${datadir}/kconf_update \

recipes-kde/apps/kcharselect/kcharselect.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Tool to copy and paste characters from all installed fonts"
-LICENSE = "GPL-2.0"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
 "
@@ -19,4 +19,4 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "c96cf5ca405df80a3c0fb674001c58f68710c3f2f463e26d87f91178cd74f418"
+SRC_URI[sha256sum] = "063ba99e3eba8988316633b31eb0e10a98b349efa4df7a04f1a548b9bad5f490"

recipes-kde/apps/kcolorchooser/kcolorchooser.bb

@@ -16,8 +16,8 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "12987b375ab326e5cf8e6cdd848a067d4d8c7df88e3efd0a67f5e8e5c112b191"
+SRC_URI[sha256sum] = "1d9c328469f7eaf19b3be9de418fc0db51a5a709282857e1b20f92cb6d6104fd"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/icons \
 "

recipes-kde/apps/kdeconnect/kdeconnect.bb

@@ -0,0 +1,44 @@
+SUMMARY = "Multi-platform app that allows your devices to communicate"
+LICENSE = "Apache-2.0 & BSD-3-Clause & GPL-2.0-only & GPL-2.0-or-later & GPL-3.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/Artistic-2.0.txt;md5=7f086b1df814d268c59965d8db41f13c \
+    file://LICENSES/BSD-3-Clause.txt;md5=f225922a2c12dfa5218fb70c49db3ea6 \
+    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/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=7dda4e90ded66ab88b86f76169f28663 \
+"
+
+inherit kde-apps
+
+DEPENDS += " \
+    kdoctools-native \
+    kpackage-native \
+    qca \
+    pulseaudio-qt \
+    ki18n \
+    kconfigwidgets \
+    kdbusaddons \
+    kiconthemes \
+    knotifications \
+    kio \
+    kcmutils \
+    kservice \
+    solid \
+    kirigami2 \
+    kpeople \
+    kwindowsystem \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[sha256sum] = "f125eb729dd81ea265471c9bbca54fe6a7e87348c9a782b321331da72a02aa6e"
+
+EXTRA_OECMAKE += " \
+"
+
+FILES:${PN} += " \
+"

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

@@ -17,7 +17,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 0144610..f6b2105 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -71,7 +71,7 @@ if(WIN32)
+@@ -77,7 +77,7 @@ if(WIN32)
      find_package(DrMinGW)
      set(MLT_PREFIX "..")
  else()
@@ -25,7 +25,4 @@ index 0144610..f6b2105 100644
 +    set(MLT_PREFIX ${MLT_ROOT_DIR} CACHE STRING "mlt prefix")
  endif()
  
- if(KF5FileMetaData_FOUND)
--- 
-2.30.2
-
+ # macOS

recipes-kde/apps/kdenlive/kdenlive.bb

@@ -1,7 +1,12 @@
 SUMMARY = "Kdenlive is an intuitive and powerful multi-track video editor"
-LICENSE = "GPL-2.0"
+LICENSE = "BSD-3-Clause & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & GPL-3.0-or-later & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=38adfe5a9f2953129da1774430b28adf \
+    file://LICENSES/BSD-3-Clause.txt;md5=f225922a2c12dfa5218fb70c49db3ea6 \
+    file://LICENSES/GPL-2.0-only.txt;md5=3d26203303a722dedc6bf909d95ba815 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=3d26203303a722dedc6bf909d95ba815 \
+    file://LICENSES/GPL-3.0-only.txt;md5=8da5784ab1c72e63ac74971f88658166 \
+    file://LICENSES/GPL-3.0-or-later.txt;md5=8da5784ab1c72e63ac74971f88658166 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=7b8fde44990707e743d3613054065137 \
 "
 
 inherit kde-apps gtk-icon-cache mime mime-xdg
@@ -40,15 +45,15 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "754fae49644afbc8ecc0f5a4d579f09738f189a7626c99f862e5e4cdb6426df1"
+SRC_URI += "file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch"
+SRC_URI[sha256sum] = "9c5cc37d24d99d1da4e708ef960fd4df828d3c0abdd4b02adbf7c37aa40d0e29"
 
-SRC_URI += " \
-    file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \
+EXTRA_OECMAKE += " \
+    -DMLT_PREFIX=${prefix} \
+    -DBUILD_TESTING=OFF \
 "
 
-EXTRA_OECMAKE += "-DMLT_PREFIX=${prefix}"
-
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/k*5 \
@@ -58,4 +63,4 @@ FILES_${PN} += " \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
 
-RRECOMMENDS_${PN} += "ffmpeg"
+RRECOMMENDS:${PN} += "ffmpeg"

recipes-kde/apps/kdevelop/kdevelop-pg-qt.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KDevelop-PG-Qt is a parser generator"
-LICENSE = "LGPL-2.0"
+LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=15ce55ef03e0531acfa5ca508b9f85b2"
 
 inherit kde-base
@@ -7,7 +7,6 @@ inherit kde-base
 DEPENDS += "qtbase"
 
 PV = "2.2.1"
-SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
 SRC_URI[sha256sum] = "c13931788ac9dc02188cdd9c6e71e164ae81b4568b048748652bbf6fa4a9c62b"
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"

recipes-kde/apps/kdevelop/libkomparediff2.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Library to compare files and strings, used in Kompare and KDevelop"
-LICENSE = "GPL-2.0 & LGPL-2.0"
+LICENSE = "GPL-2.0-only & LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8d8cc811a0870dd8391a69e61a77967a"
 
 inherit kde-apps gettext
@@ -15,4 +15,4 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a"
+SRC_URI[sha256sum] = "bd51abb720184f93a06fbfa562d1604c0e52873676b785cd1ed0329f20af9f30"

recipes-kde/apps/kdf/kdf.bb

@@ -1,7 +1,8 @@
 SUMMARY = "KDiskFree displays the file devices' information"
-LICENSE = "GPL-2.0"
+LICENSE = "CC0-1.0 & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
+    file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
 "
 
 inherit kde-apps gtk-icon-cache
@@ -12,6 +13,7 @@ DEPENDS += "\
     kconfigwidgets \
     kcoreaddons-native \
     kdoctools-native \
+    kcmutils-native \
     ki18n \
     kiconthemes \
     kio \
@@ -22,9 +24,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "1c5701339e2be1161a22e1ded046a096e24f84c4e59e36bc8b82f8508324a7ca"
+SRC_URI[sha256sum] = "db2ad8d53439a86279626960bff52267b696a7b8fd15d7e65644345b53c9a8ab"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/icons \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/kdialog/kdialog.bb

@@ -1,8 +1,7 @@
 SUMMARY = "Tool to show nice dialog boxes from shell scripts"
-LICENSE = "GPL-2.0-or-later & GFDL-1.3"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-    file://COPYING.DOC;md5=10b9de612d532fdeeb7fe8fcd1435cc6 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
 "
 
 inherit kde-apps gettext
@@ -21,6 +20,6 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6"
+SRC_URI[sha256sum] = "9d1226e6e646a564ada1b218f70c98278c4ef4f118f55ca1e3e143698d016a8b"
 
-FILES_${PN} += "${datadir}/dbus-1"
+FILES:${PN} += "${datadir}/dbus-1"

recipes-kde/apps/kdiamond/kdiamond.bb

@@ -26,9 +26,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "0cdddfe7dbe4b1a25c0ef470b9cad469a7efe04a7b2c8076e24acf375d18267b"
+SRC_URI[sha256sum] = "470cacb596cbec4c676ab12e82e231f160640cd79fc25d6b5bacf622dd9e448b"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/knsrcfiles \
 "

recipes-kde/apps/kfind/kfind.bb

@@ -20,8 +20,8 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663"
+SRC_URI[sha256sum] = "3fcc78876f05d67eaecd55f1db2f2c8084824e787d107e4f6a87d2f335cd5ad7"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/icons \
 "

recipes-kde/apps/kgeography/kgeography.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KGeography is a geography learning tool"
-LICENSE = "GPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
     file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
@@ -21,9 +21,9 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "f93ffaf4d5b340994b6025324fd972a2f211fbf9e0c83b6201dfb20db0fe539b"
+SRC_URI[sha256sum] = "ac66323872f20ef85d2fbf2c41cb09d5dbcaa8db3c654487811d1248caef8f07"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/kxmlgui5 \
 "

recipes-kde/apps/kgoldrunner/kgoldrunner.bb

@@ -23,9 +23,9 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "1187b43789957fd2d6d826a589741231c60fb15fd2f8e29c29c107b86efc949b"
+SRC_URI[sha256sum] = "9504916b0e7d44ba57b092c3fbca2095870fd057e1c9b4d627123cb3741854f7"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/knsrcfiles \
     ${datadir}/kxmlgui5 \
 "

recipes-kde/apps/khelpcenter/khelpcenter.bb

@@ -1,10 +1,13 @@
 SUMMARY = "Application to show KDE Applications' documentation"
-LICENSE = "GPL-2.0"
+LICENSE = "GFDL-1.2 & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=7108e5acd7ce861dee282297d7c2f38c \
+    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
+    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 \
 "
 
-inherit kde-apps gettext
+inherit kde-apps gettext mime-xdg
 
 DEPENDS += " \
     grantlee \
@@ -28,12 +31,12 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6"
+SRC_URI[sha256sum] = "1960949b60e8c6cbf09330f76351a4e94d7239a6b8f6cfcca34a1a82dfa69900"
 
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/k*5 \
     ${datadir}/dbus-1 \
@@ -41,4 +44,4 @@ FILES_${PN} += " \
     ${libdir}/libkdeinit5_khelpcenter.so \
 "
 
-RDEPENDS_${PN} += "perl"
+RDEPENDS:${PN} += "perl"

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

@@ -1,5 +1,5 @@
 SUMMARY = "Additional components to increase the functionality of KIO"
-LICENSE = "BSD-3-Clause & GPL-2.0 & GPL-2.0+ & GPL-3.0 & GPL-3.0+ & LGPL-2.0+ & MIT"
+LICENSE = "BSD-3-Clause & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & GPL-3.0-or-later & LGPL-2.0-or-later & MIT"
 
 LIC_FILES_CHKSUM = " \
     file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = " \
 inherit kde-apps gettext mime
 
 DEPENDS += " \
+    libssh \
     qtsvg \
     qtwebengine \
     \
@@ -44,7 +45,6 @@ DEPENDS += " \
 "
 
 # REVISIT optionals
-# libssh \
 # openslp
 # openssh <-> dropbear
 DEPENDS += " \
@@ -54,15 +54,15 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d"
+SRC_URI[sha256sum] = "2836c9417044c4aba8594b7b355edf55aa686c5c40cfde7bf1e4f118843a73eb"
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
-do_configure_append() {
-    sed -i 's:${S}/smb/kdsoap-ws-discovery-client/src/kdwsdl2cpp:${STAGING_BINDIR_NATIVE}/kdwsdl2cpp:g' ${B}/build.ninja
+do_configure:append() {
+    sed -i 's:smb/kdsoap-ws-discovery-client/src/kdwsdl2cpp:${STAGING_BINDIR_NATIVE}/kdwsdl2cpp:g' ${B}/build.ninja
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kio_bookmarks \
     ${datadir}/kio_info \ 
     ${datadir}/config.kcfg \
@@ -79,4 +79,4 @@ FILES_${PN} += " \
     ${OE_QMAKE_PATH_PLUGINS} \
 "
 
-RDEPENDS_${PN} += "perl"
+RDEPENDS:${PN} += "perl"

recipes-kde/apps/kmag/kmag.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KMag is a screen magnifier"
-LICENSE = "GPL-2.0 & GFDL-1.2"
+LICENSE = "GPL-2.0-only & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=38adfe5a9f2953129da1774430b28adf \
     file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
@@ -19,9 +19,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413"
+SRC_URI[sha256sum] = "16916858bf4a7be97db2e4d8205e9b88772a05328b35db9993910106d6391627"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
 "

recipes-kde/apps/kmahjongg/kmahjongg.bb

@@ -23,9 +23,9 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "414d0d3531a2479fb32400397defe1d3e821061590db607c4f8eecd8766d83c2"
+SRC_URI[sha256sum] = "24360d1ed40c77257780578fc09c45dc74191c7d449dcfb89920b2e8a1dcbc9c"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/kmines/kmines.bb

@@ -23,9 +23,9 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "f9703b5158633c63662b9c7892c049dd57a4fdf66c00f9378745a99ac71ab1a1"
+SRC_URI[sha256sum] = "2c051194a5def732cdff46117785cdd4e2a1c2265264c0e647a6216eaa68b1b6"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/icons \
     ${datadir}/knotifications5 \
 "

recipes-kde/apps/kmix/kmix.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KDE's audio mixer"
-LICENSE = "GPL-2.0 & GFDL-1.2 & LGPL-2.0"
+LICENSE = "GPL-2.0-only & GFDL-1.2 & LGPL-2.0-only"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
@@ -32,13 +32,13 @@ PACKAGECONFIG = "pulseaudio"
 PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb"
+SRC_URI[sha256sum] = "2aaf379dcb0bdd3a6b53364cf643f36581a66cd4ef656643846dfe5dfabf206b"
 
 EXTRA_OECMAKE += "-DKMIX_KF5_BUILD=1"
 
 FILES_SOLIBSDEV = ""
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/config.kcfg \
     ${datadir}/plasma \

recipes-kde/apps/kmplot/kmplot.bb

@@ -1,8 +1,8 @@
 SUMMARY = "Mathematical Function Plotter"
-LICENSE = "GPL-2.0 & GFDL-1.2"
+LICENSE = "GFDL-1.2 & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
-    file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
+    file://LICENSES/GFDL-1.2-or-later.txt;md5=9f58808219e9a42ff1228309d6f83dc6 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
 "
 
 inherit kde-apps gtk-icon-cache mime-xdg
@@ -23,9 +23,9 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "05b7bdc184e7c10b1b293812827bec44a3d773a3eefffd91eb782f08b45abf96"
+SRC_URI[sha256sum] = "6aee62d9729ab2e7636725c30813dcbfdc79c7361e85dd5521a5c589791c2b68"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/kxmlgui5 \
     ${datadir}/dbus-1 \

recipes-kde/apps/kolourpaint/kolourpaint.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KolourPaint - Paint Program"
-LICENSE = "GPL-2.0 & GFDL-1.2 & LGPL-2.0 & MIT"
+LICENSE = "GPL-2.0-only & GFDL-1.2 & LGPL-2.0-only & MIT"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=7549f6da638b0246572ed9cf4275b860 \
     file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
@@ -30,9 +30,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e"
+SRC_URI[sha256sum] = "347e8cae7b4be169968d7274618e96bd35224c2a963879709b7e07f440eac60f"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/icons \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/konsole/konsole.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KDE's terminal emulator"
-LICENSE = "GPL-2.0 & GFDL-1.2 & LGPL-2.0"
+LICENSE = "GPL-2.0-only & GFDL-1.2 & LGPL-2.0-only"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
     file://COPYING.DOC;md5=d8855fca80aa0b428deafa405d0ea17a \
@@ -40,15 +40,18 @@ DEPENDS += " \
 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14"
+SRC_URI[sha256sum] = "a6f07c4dc05b52c7844071137b6fe1b21f3cb54c63164d81c9a6332720fac09a"
 
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/khotkeys \
     ${datadir}/knsrcfiles \
+    ${datadir}/kconf_update \
+    ${datadir}/kio/servicemenus \
     ${OE_QMAKE_PATH_PLUGINS} \
     ${libdir}/libkdeinit5_konsole.so \
+    ${libdir}/kconf_update_bin \
 "