sddm-autologin.pam: remove pam_permit.so

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

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

README.md

@@ -4,7 +4,7 @@ OE layer to desktop environments based on Qt5
 
 Layer dependencies:
 ----------------------
-see [layer.conf](conf/layer.conf) for dependencies and [Layer-index](https://layers.openembedded.org/layerindex/branch/master/layers/) where to find layers
+see [layer.conf](conf/layer.conf) for dependencies and https://layers.openembedded.org/layerindex/branch/master/layers/ where to find layers
 
 
 Contributing
@@ -14,14 +14,11 @@ Contributing
 
 Policies
 --------
-* **Please do not send private emails to maintainer - they will not be answered anymore**. For bug-reports/questions/suggestions.. use [issues](https://github.com/schnitzeltony/meta-qt5-extra/issues).
+* Please do not send private emails to maintainers. For questions/suggestions.. use GitHub issues.
 * Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
-  * Use 4 spaces for indentation always (shell and python code)
-  * For splitting of long list values use four-space indentation on successive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
-  * Pull-requests with patches fixing issues for musl, clang or gold-linker are accepted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.
-* Be aware that **this layer changes other layer's defaults by bbappends**. Maintainer disagrees with common 'configure to death practice' and won't waste time explaining dozens of knobs that are mandatory to get working/useful builds. See
-  [extends-meta-oe](extends-meta-oe) / [extends-meta-qt5](extends-meta-qt5) / [extends-oe-core](extends-oe-core).
-  Pull requests removing appends for sake of magic 'compliant' scripts  are not accepted.
+  * Use 4 spaces for indention always
+  * For splitting of long list values use four-space indentation on sucessive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
+  * Pull-requests with patches fixing issues for musl, clang or gold-linker are accepeted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.
 
 
 Maintainers

classes/cmake_auto_align_paths.bbclass

@@ -0,0 +1,14 @@
+CMAKE_ALIGN_FILES_FIND ??= "*Targets.cmake"
+
+do_configure_append() {
+    # remove absolute paths from exported cmake files
+    for f in `find ${B} -name '${CMAKE_ALIGN_FILES_FIND}'` ${CMAKE_ADD_ALIGN_FILES} ; do
+        sed -i 's:${STAGING_INCDIR_NATIVE}:${includedir}:g' "$f"
+        sed -i 's:${STAGING_INCDIR}:${includedir}:g' "$f"
+        sed -i 's:${STAGING_LIBDIR_NATIVE}:${libdir}:g' "$f"
+        sed -i 's:${STAGING_LIBDIR}:${libdir}:g' "$f"
+        sed -i 's:${STAGING_BASELIBDIR_NATIVE}:${base_libdir}:g' "$f"
+        sed -i 's:${STAGING_BASELIBDIR}:${base_libdir}:g' "$f"
+    done
+}
+

classes/cmake_extra_sanity.bbclass

@@ -1,15 +1,15 @@
 inherit cmake_sysroot
 
-# do_install:append:class-cross does not work so hack
-do_install:prepend:class-native() {
+# do_install_append_class-cross does not work so hack
+do_install_prepend_class-native() {
     no_staging_check=true
 }
 
-do_install:prepend:class-nativesdk() {
+do_install_prepend_class-nativesdk() {
     no_staging_check=true
 }
 
-do_install:append() {
+do_install_append() {
     # avoid strange prefixing seen often
     old_dir=`pwd`
     cd ${D}
@@ -22,7 +22,7 @@ do_install:append() {
     # TBD: -> oe-core (1st part - genarated sources - should work with autotools too)
     if [ x = x$no_staging_check ] ; then
         error=
-        # check for generated sources
+        # check for genarated sources
         for f in `find ${B} -name '*.h' -o -name '*.cpp'` ; do
             if grep -q 'recipe-sysroot' $f ; then
                 bbwarn "$f contains links to build sysroot!"
@@ -40,7 +40,7 @@ do_install:append() {
         done
 
         if [ x != x$error ] ; then
-            bbfatal "One or more files contain links to build host sysroot ${STAGING_DIR_HOST}(-native)"
+            bbfatal "One or more files contain links to build host sysroot ${STAGING_DIR}"
         fi
     fi
 }

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 = "22.08.3"
+KDE_APP_VERSION = "19.08.3"
 
-SRC_URI = "${KDE_MIRROR}/stable/release-service/${PV}/src/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"
 
-RRECOMMENDS:${PN} += "qtbase-plugins"
+RRECOMMENDS_${PN} += "qtbase-plugins"

classes/kde-base.bbclass

@@ -1,22 +1,31 @@
-DEPENDS:prepend:class-nativesdk = "nativesdk-qtbase "
-DEPENDS:prepend:class-target = "qtbase "
-# Do not pin hard for extra-cmake-modules itself
-DEPENDS += "extra-cmake-modules-native "
+DEPENDS += "qtbase extra-cmake-modules-native"
 
 KDE_MIRROR = "http://download.kde.org"
 
+MIRRORS += "\
+${KDE_MIRROR}	http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde \n \
+${KDE_MIRROR}	http://mirrors.mit.edu/kde \n \
+${KDE_MIRROR}	http://mirror.cc.columbia.edu/pub/software/kde \n \
+${KDE_MIRROR}	http://ftp.is.co.za/mirror/ftp.kde.org \n \
+${KDE_MIRROR}	http://mirror.squ.edu.om/kde \n \
+${KDE_MIRROR}	http://ftp.fi.muni.cz/pub/kde \n \
+${KDE_MIRROR}	http://mirrors.fe.up.pt/pub/kde \n \
+${KDE_MIRROR}	http://mirror.its.dal.ca/kde \n \
+${KDE_MIRROR}	http://kde.c3sl.ufpr.br \n \
+"
+
 SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
 
 # extra-cmake-modules cause dependent to check for python
-inherit cmake_qt5_extra pkgconfig python3native
+inherit cmake_qt5_extra 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 \
@@ -33,9 +42,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}/stable/frameworks/5.64/portingAids/${BPN}-${PV}.tar.xz"

classes/kde-kf5.bbclass

@@ -1,10 +1,5 @@
 inherit kde-base
 
-KF5_VERSION = "5.101.0"
+KF5_VERSION = "5.64.0"
 
-def kde_verdir(v):
-    return oe.utils.trim_version(v, 2)
-
-KF5_VERSION_DIR = "${@kde_verdir("${KF5_VERSION}")}"
-
-SRC_URI = "${KDE_MIRROR}/stable/frameworks/${KF5_VERSION_DIR}/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.64/${BPN}-${PV}.tar.xz"

classes/kde-plasma.bbclass

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

classes/liri.bbclass

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

classes/lxqt.bbclass

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

classes/qemu-ext.bbclass

@@ -0,0 +1,22 @@
+inherit qemu
+
+DEPENDS += "qemu-native"
+
+# This is an extended/modified qemu.bbclass tailored four our needs:
+#
+# * add qemu-native to DEPENDS: we can do that because there is no
+#   introspection/interception delayed qemu usage here
+# * The executable binary is set by absolute path: oe-core's qemu.bbclass
+#   expects it in sysroot. Here we usually run binaries in builddir which are
+#   not yet installed.
+# * A recipe can set an extra library path in 'QEMU_EXTRA_LIBDIR'. This path is
+#   an absolute path.
+
+def qemu_run_binary_local(data, rootfs_path, binary):
+    libdir = rootfs_path + data.getVar("libdir")
+    base_libdir = rootfs_path + data.getVar("base_libdir")
+    extra_libdir = data.getVar("QEMU_EXTRA_LIBDIR")
+    if extra_libdir:
+        return qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir, extra_libdir]) + binary
+    else:
+        return qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir]) + binary

classes/qt5-translation.bbclass

@@ -5,17 +5,19 @@ DEPENDS += "qttools-native"
 # default location
 QT_TRANSLATION_FILES ??= "${datadir}/*/translations/*.qm ${datadir}/*/translations/*/*.qm ${datadir}/*/translations/*/*/*.qm"
 
-FILES:${PN}-locale = "${datadir}/*/translations"
+FILES_${PN}-locale = "${datadir}/*/translations"
+
+# remove ${datadir}/${BPN} set by bitbake.conf
+FILES_${PN}_remove = "${datadir}/${BPN}"
 
 python qt_do_split_locales() {
     import glob
-    import collections
 
     if (d.getVar('PACKAGE_NO_LOCALE') == '1'):
         bb.debug(1, "package requested not splitting locales")
         return
 
-    packages = collections.deque((d.getVar('PACKAGES') or "").split())
+    packages = (d.getVar('PACKAGES') or "").split()
 
     datadir = d.getVar('datadir')
     if not datadir:
@@ -39,7 +41,7 @@ python qt_do_split_locales() {
                 locales.append(locale)
 
     if not locales:
-        bb.warn("No locale files for recipe %s. Remove qt5-translation from inherit?" % d.getVar('PN'))
+        bb.debug(1, "No locale files in this package")
         return
 
     summary = d.getVar('SUMMARY') or pn
@@ -49,20 +51,20 @@ python qt_do_split_locales() {
     for l in sorted(locales):
         ln = legitimize_package_name(l)
         pkg = pn + '-locale-' + ln
-        packages.appendleft(pkg)
+        packages.append(pkg)
         files = ''
         for transvar in d.getVar('QT_TRANSLATION_FILES').split():
             files = '%s %s' % (files, transvar.replace('*.qm', '*_%s.qm' % l))
-        d.setVar('FILES:' + pkg, files )
-        d.setVar('RRECOMMENDS:' + pkg, '%svirtual-locale-%s' % (mlprefix, ln))
-        d.setVar('RPROVIDES:' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
-        d.setVar('SUMMARY:' + pkg, '%s - %s translations' % (summary, l))
-        d.setVar('DESCRIPTION:' + pkg, '%s  This package contains language translation files for the %s locale.' % (description, l))
+        d.setVar('FILES_' + pkg, files )
+        d.setVar('RRECOMMENDS_' + pkg, '%svirtual-locale-%s' % (mlprefix, ln))
+        d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
+        d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l))
+        d.setVar('DESCRIPTION_' + pkg, '%s  This package contains language translation files for the %s locale.' % (description, l))
         if locale_section:
-            d.setVar('SECTION:' + pkg, locale_section)
+            d.setVar('SECTION_' + pkg, locale_section)
 
-    d.setVar('PACKAGES', ' '.join(list(packages)))
+    d.setVar('PACKAGES', ' '.join(packages))
 }
 
-PACKAGESPLITFUNCS:prepend = "qt_do_split_locales "
+PACKAGESPLITFUNCS_prepend = "qt_do_split_locales "
 

conf/layer.conf

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

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

@@ -1,24 +0,0 @@
-SUMMARY = "Qt oriented code checker based on clang framework"
-LICENSE = "LGPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING-LGPL2.txt;md5=d31701979430eba03ad0eac6e517dec3"
-
-DEPENDS = "clang"
-
-inherit kde-base
-
-PV = "1.11"
-SRC_URI += " \
-    file://0001-clazy-no-rpath.patch \
-    file://0002-Build-fixes-for-LLVM_Clang_15.0.0.patch \
-"
-SRC_URI[sha256sum] = "66165df33be8785218720c8947aa9099bae6d06c90b1501953d9f95fdfa0120a"
-
-EXTRA_OECMAKE += " \
-    -DREGEX_RUN_RESULT=0 \
-    -DFILESYSTEM_RUN_RESULT=0 \
-    -DFILESYSTEM_RUN_RESULT__TRYRUN_OUTPUT=0 \
-"
-
-FILES:${PN} += "${libdir}/ClazyPlugin.so"
-
-BBCLASSEXTEND += "native nativesdk"

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

@@ -1,33 +0,0 @@
-From ab4ef9168d79e5196f4b010bbab9368716509354 Mon Sep 17 00:00:00 2001
-From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
-Date: Sat, 1 May 2021 20:31:45 -0400
-Subject: [PATCH] clazy no rpath
-
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 46173fa..c893590 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -237,6 +237,7 @@ if (NOT CLAZY_BUILD_WITH_CLANG)
-   endif()
- 
-   # rpath
-+if(FALSE)  # Disable rpath
-   set(CMAKE_SKIP_BUILD_RPATH FALSE)
-   set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-   set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-@@ -245,6 +246,7 @@ if (NOT CLAZY_BUILD_WITH_CLANG)
-   if("${isSystemDir}" STREQUAL "-1")
-     set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-   endif("${isSystemDir}" STREQUAL "-1")
-+endif()
- 
-   # Build clazy-standalone
-   add_executable(clazy-standalone ${CLAZY_STANDALONE_SRCS})
--- 
-2.30.2
-
-

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

@@ -1,220 +0,0 @@
-From 20fca52da739ebefa47e35f6b338bb99a0da3cfe Mon Sep 17 00:00:00 2001
-From: Cristian Adam <cristian.adam@qt.io>
-Date: Tue, 6 Sep 2022 16:30:02 +0200
-Subject: [PATCH] Build fixes for LLVM/Clang 15.0.0
-
-Change-Id: Icc39a0b1acffb5a6a4798b1259d8ad4e7dd47bc5
----
- CMakeLists.txt                              |  6 ++++++
- src/PreProcessorVisitor.cpp                 |  2 +-
- src/PreProcessorVisitor.h                   |  2 +-
- src/SourceCompatibilityHelpers.h            | 15 +++++++++++++++
- src/Utils.cpp                               |  3 ++-
- src/checkbase.cpp                           |  4 ++--
- src/checkbase.h                             |  4 ++--
- src/checks/manuallevel/qt6-fwd-fixes.cpp    |  2 +-
- src/checks/manuallevel/qt6-fwd-fixes.h      |  2 +-
- src/checks/manuallevel/qt6-header-fixes.cpp |  2 +-
- src/checks/manuallevel/qt6-header-fixes.h   |  2 +-
- 11 files changed, 33 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c780b0d..100135af 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -114,6 +114,10 @@ else()
-     set(clang_tooling_refactoring_lib clangToolingRefactor)
- endif()
- 
-+if (${LLVM_VERSION} VERSION_GREATER_EQUAL "15.0.0")
-+  set(clang_support_lib clangSupport)
-+endif()
-+
- macro(link_to_llvm name is_standalone)
-   if (CLAZY_LINK_CLANG_DYLIB)
-     target_link_libraries(${name} clang-cpp)
-@@ -131,6 +135,7 @@ macro(link_to_llvm name is_standalone)
- 
-       target_link_libraries(${name} ${clang_lib})
-     endforeach()
-+    target_link_libraries(${name} ${clang_support_lib})
-     target_link_libraries(${name} clangTooling)
-     target_link_libraries(${name} clangToolingCore)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-@@ -302,6 +307,7 @@ else()
-     clangFrontendTool
-     clangRewrite
-     clangSerialization
-+    ${clang_support_lib}
-     clangTooling
-     clangStaticAnalyzerCheckers
-     clangStaticAnalyzerCore
-diff --git a/src/PreProcessorVisitor.cpp b/src/PreProcessorVisitor.cpp
-index 5e63a131..5fdfe5f3 100644
---- a/src/PreProcessorVisitor.cpp
-+++ b/src/PreProcessorVisitor.cpp
-@@ -185,7 +185,7 @@ void PreProcessorVisitor::MacroExpands(const Token &MacroNameTok, const MacroDef
- 
- void PreProcessorVisitor::InclusionDirective (clang::SourceLocation, const clang::Token &,
-                                               clang::StringRef FileName, bool IsAngled, clang::CharSourceRange FilenameRange,
--                                              const clang::FileEntry *, clang::StringRef, clang::StringRef,
-+                                              clazy::OptionalFileEntryRef, clang::StringRef, clang::StringRef,
-                                               const clang::Module *, clang::SrcMgr::CharacteristicKind)
- {
-    if (m_ci.getPreprocessor().isInPrimaryFile() && !clazy::endsWith(FileName.str(), ".moc")) {
-diff --git a/src/PreProcessorVisitor.h b/src/PreProcessorVisitor.h
-index dc80ff36..1bb17a5e 100644
---- a/src/PreProcessorVisitor.h
-+++ b/src/PreProcessorVisitor.h
-@@ -71,7 +71,7 @@ class PreProcessorVisitor
-                       clang::SourceRange range, const clang::MacroArgs *) override;
-     void InclusionDirective (clang::SourceLocation HashLoc, const clang::Token &IncludeTok,
-                              clang::StringRef FileName, bool IsAngled, clang::CharSourceRange FilenameRange,
--                             const clang::FileEntry *File, clang::StringRef SearchPath, clang::StringRef RelativePath,
-+                             clazy::OptionalFileEntryRef File, clang::StringRef SearchPath, clang::StringRef RelativePath,
-                              const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
- private:
-     std::string getTokenSpelling(const clang::MacroDefinition &) const;
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4ea923a2..c1a23a4b 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -144,6 +144,21 @@ inline bool contains_lower(clang::StringRef haystack, clang::StringRef needle)
- #endif
- }
- 
-+#if LLVM_VERSION_MAJOR >= 15
-+using OptionalFileEntryRef = clang::Optional<clang::FileEntryRef>;
-+#else
-+using OptionalFileEntryRef = const clang::FileEntry*;
-+#endif
-+
-+inline bool isAscii(clang::StringLiteral *lt)
-+{
-+#if LLVM_VERSION_MAJOR >= 15
-+    return lt->isOrdinary();
-+#else
-+    return lt->isAscii();
-+#endif
-+}
-+
- }
- 
- #endif
-diff --git a/src/Utils.cpp b/src/Utils.cpp
-index 3cdf7876..70e0577c 100644
---- a/src/Utils.cpp
-+++ b/src/Utils.cpp
-@@ -25,6 +25,7 @@
- #include "Utils.h"
- #include "StringUtils.h"
- #include "HierarchyUtils.h"
-+#include "SourceCompatibilityHelpers.h"
- #include "StmtBodyRange.h"
- #include "clazy_stl.h"
- 
-@@ -670,7 +671,7 @@ const CXXRecordDecl *Utils::recordForMemberCall(CXXMemberCallExpr *call, string
- bool Utils::isAscii(StringLiteral *lt)
- {
-     // 'é' for some reason has isAscii() == true, so also call containsNonAsciiOrNull
--    return lt && lt->isAscii() && !lt->containsNonAsciiOrNull();
-+    return lt && clazy::isAscii(lt) && !lt->containsNonAsciiOrNull();
- }
- 
- bool Utils::isInDerefExpression(Stmt *s, ParentMap *map)
-diff --git a/src/checkbase.cpp b/src/checkbase.cpp
-index f5936dfd..dcc7c999 100644
---- a/src/checkbase.cpp
-+++ b/src/checkbase.cpp
-@@ -105,7 +105,7 @@ void ClazyPreprocessorCallbacks::MacroDefined(const Token &macroNameTok, const M
- }
- 
- void ClazyPreprocessorCallbacks::InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                                                    clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                                                    clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                                                     clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
- {
-     check->VisitInclusionDirective(HashLoc, IncludeTok, FileName, IsAngled, FilenameRange, File, SearchPath, RelativePath, Imported, FileType);
-@@ -182,7 +182,7 @@ void CheckBase::VisitEndif(SourceLocation, SourceLocation)
- }
- 
- void CheckBase::VisitInclusionDirective(clang::SourceLocation , const clang::Token &, clang::StringRef , bool ,
--                        clang::CharSourceRange , const clang::FileEntry *, clang::StringRef ,
-+                        clang::CharSourceRange , clazy::OptionalFileEntryRef, clang::StringRef ,
-                         clang::StringRef , const clang::Module *, clang::SrcMgr::CharacteristicKind )
- {
-     // Overriden in derived classes
-diff --git a/src/checkbase.h b/src/checkbase.h
-index c5db2daf..02f6a6bf 100644
---- a/src/checkbase.h
-+++ b/src/checkbase.h
-@@ -91,7 +91,7 @@ class ClazyPreprocessorCallbacks
-     void Else(clang::SourceLocation loc, clang::SourceLocation ifLoc) override;
-     void Endif(clang::SourceLocation loc, clang::SourceLocation ifLoc) override;
-     void InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
- private:
-     CheckBase *const check;
-@@ -151,7 +151,7 @@ class CheckBase
-     virtual void VisitElse(clang::SourceLocation loc, clang::SourceLocation ifLoc);
-     virtual void VisitEndif(clang::SourceLocation loc, clang::SourceLocation ifLoc);
-     virtual void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType);
- 
-     void enablePreProcessorCallbacks();
-diff --git a/src/checks/manuallevel/qt6-fwd-fixes.cpp b/src/checks/manuallevel/qt6-fwd-fixes.cpp
-index 83bf81ee..c87d9ca0 100644
---- a/src/checks/manuallevel/qt6-fwd-fixes.cpp
-+++ b/src/checks/manuallevel/qt6-fwd-fixes.cpp
-@@ -166,7 +166,7 @@ void Qt6FwdFixes::VisitDecl(clang::Decl *decl)
- }
- 
- void Qt6FwdFixes::VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                        clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                        clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                         clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
- {
-     auto current_file = m_sm.getFilename(HashLoc);
-diff --git a/src/checks/manuallevel/qt6-fwd-fixes.h b/src/checks/manuallevel/qt6-fwd-fixes.h
-index 37b59d95..bb928ba6 100644
---- a/src/checks/manuallevel/qt6-fwd-fixes.h
-+++ b/src/checks/manuallevel/qt6-fwd-fixes.h
-@@ -47,7 +47,7 @@ class Qt6FwdFixes
-     explicit Qt6FwdFixes(const std::string &name, ClazyContext *context);
-     void VisitDecl(clang::Decl *decl) override;
-     void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
-     bool m_including_qcontainerfwd = false;
-     std::set<clang::StringRef> m_qcontainerfwd_included_in_files;
-diff --git a/src/checks/manuallevel/qt6-header-fixes.cpp b/src/checks/manuallevel/qt6-header-fixes.cpp
-index d458b77c..aaa28093 100644
---- a/src/checks/manuallevel/qt6-header-fixes.cpp
-+++ b/src/checks/manuallevel/qt6-header-fixes.cpp
-@@ -270,7 +270,7 @@ Qt6HeaderFixes::Qt6HeaderFixes(const std::string &name, ClazyContext *context)
- }
- 
- void Qt6HeaderFixes::VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                        clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                        clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                         clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
- {
-     if (shouldIgnoreFile(HashLoc))
-diff --git a/src/checks/manuallevel/qt6-header-fixes.h b/src/checks/manuallevel/qt6-header-fixes.h
-index ae09f7ad..8ffbb100 100644
---- a/src/checks/manuallevel/qt6-header-fixes.h
-+++ b/src/checks/manuallevel/qt6-header-fixes.h
-@@ -46,7 +46,7 @@ class Qt6HeaderFixes
- public:
-     explicit Qt6HeaderFixes(const std::string &name, ClazyContext *context);
-     void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
- 
- };

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

@@ -1,112 +0,0 @@
-SUMMARY = "Cross-platform IDE for C, C++, Python, QML/JavaScript and PHP"
-LICENSE = "BSD-2-Clause & BSD-3-Clause & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & GPL-3.0-or-later & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only & MIT"
-LIC_FILES_CHKSUM = " \
-    file://LICENSES/BSD-2-Clause.txt;md5=4e290b17e3e05732730de37b44abef90 \
-    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
-    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
-    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
-    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
-    file://LICENSES/GPL-3.0-or-later.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
-    file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031294a26b98c \
-    file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
-    file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \
-    file://LICENSES/LGPL-2.1-or-later.txt;md5=147a320ed8b16b036829a0c71d424153 \
-    file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \
-    file://LICENSES/MIT.txt;md5=4dd71a82d66fd9e3ca0cc65b8be370c0 \
-"
-
-inherit kde-apps gettext pkgconfig gtk-icon-cache mime mime-xdg bash-completion
-
-DEPENDS += " \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdevelop-pg-qt-native \
-    kdoctools-native \
-    ki18n-native \
-    kpackage-native \
-    kcmutils-native \
-    shared-mime-info-native \
-    \
-    qtbase \
-    qtdeclarative \
-    qtwebengine \
-    grantlee \
-    libkomparediff2 \
-    libksysguard \
-    karchive \
-    kcmutils \
-    kconfig \
-    kcrash \
-    kdeclarative \
-    kdevelop-pg-qt \
-    kguiaddons \
-    kiconthemes \
-    kitemmodels \
-    kitemviews \
-    kjobwidgets \
-    kio \
-    knewstuff \
-    knotifications \
-    knotifyconfig \
-    kparts \
-    krunner \
-    kservice \
-    ktexteditor \
-    kxmlgui \
-    kwindowsystem \
-    okteta \
-    purpose \
-    threadweaver \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "3c3baf212fd6ffd7ccb5b0796c2b43e252235c25275979c1570c44f80821f9d6"
-
-EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
-
-do_configure:append() {
-    # although the name is missleading I still love cmake_extra_sanity.bbclass...
-    sed -i \
-        -e 's:${STAGING_DIR_NATIVE}::g' \
-        -e 's:${STAGING_DIR_HOST}::g' \
-        ${B}/plugins/clang/libclang_include_path.h
-}
-
-# Yeah nasty but...
-FILES_SOLIBSDEV = "${libdir}/libKDevC*so ${libdir}/libKDevPlatform*so"
-
-FILES:${PN} += " \
-    ${datadir}/kdev* \
-    ${datadir}/k*5 \
-    ${datadir}/knsrcfiles \
-    ${datadir}/knotifications5 \
-    ${datadir}/mime \
-    ${datadir}/plasma \
-    ${libdir}/libKDevelopSessionsWatch.so \
-    ${OE_QMAKE_PATH_PLUGINS} \
-    ${OE_QMAKE_PATH_QML} \
-"
-
-RDEPENDS:${PN} += " \
-    bash \
-    zsh \
-"
-
-# To give best user experience out of the box..
-RRECOMMENDS:${PN} += " \
-    packagegroup-qt5-toolchain-target \
-    binutils \
-    ccache \
-    make \
-    gcc-symlinks g++-symlinks cpp-symlinks \
-    gdb \
-    cmake \
-    ninja \
-    python3-core \
-    qtwebengine-dev \
-    qtwebengine-mkspecs \
-    qtwebengine-plugins \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebengine-qmlplugins', '', d)} \
-"
-

extends-meta-oe/cmark_%.bbappend

@@ -1,9 +0,0 @@
-BBCLASSEXTEND = "native"
-
-DEPENDS:append:class-target = "${BPN}-native"
-
-sysroot_stage_all:append:class-target () {
-    mkdir -p ${SYSROOT_DESTDIR}${bindir}
-    cp ${STAGING_BINDIR_NATIVE}/cmark ${SYSROOT_DESTDIR}${bindir}
-}
-

extends-meta-oe/poppler_%.bbappend

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

extends-meta-qt5/qt5-creator_git.bbappend

@@ -1,5 +0,0 @@
-inherit cmake_extra_sanity
-
-# yeah I know yocto does not want us to change this
-PACKAGECONFIG:append = " ${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', ' clang', '', d)}"
-

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/0002-qdbusxml2cpp-prepare-commandline-string-manipulation.patch

@@ -8,32 +8,29 @@ Content-Transfer-Encoding: 8bit
 
 Upstream-Status: Inappropriate [embedded specific]
 
-Date: Sat, 18 Jan 2020 16:35:24 +0100
-Adjusted to Qt 5.14
-
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
-index ce4232f3e8..d9003f4508 100644
+index 76401da..3a712d2 100644
 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
 +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
-@@ -161,9 +161,12 @@ static QString moc(const QString &name)
+@@ -289,9 +289,12 @@ static QString moc(const QString &name)
  
  static QTextStream &writeHeader(QTextStream &ts, bool changesWillBeLost)
  {
-+    QString strCmdLine = commandLine;
-+    strCmdLine.replace(QStringLiteral("STRING_FULL_PATH"), QStringLiteral("STRING_PATH"));
-+    strCmdLine.replace(QStringLiteral("recipe-sysroot"), QStringLiteral("recipe--sysroot"));
-     ts << "/*" << Qt::endl
-        << " * This file was generated by " PROGRAMNAME " version " PROGRAMVERSION << Qt::endl
--       << " * Command line was: " << commandLine << Qt::endl
-+       << " * Command line was: " << strCmdLine << Qt::endl
-        << " *" << Qt::endl
-        << " * " PROGRAMNAME " is " PROGRAMCOPYRIGHT << Qt::endl
-        << " *" << Qt::endl
++	QString strCmdLine = commandLine;
++	strCmdLine.replace(QStringLiteral("STRING_FULL_PATH"), QStringLiteral("STRING_PATH"));
++	strCmdLine.replace(QStringLiteral("recipe-sysroot"), QStringLiteral("recipe--sysroot"));
+     ts << "/*" << endl
+        << " * This file was generated by " PROGRAMNAME " version " PROGRAMVERSION << endl
+-       << " * Command line was: " << commandLine << endl
++       << " * Command line was: " << strCmdLine << endl
+        << " *" << endl
+        << " * " PROGRAMNAME " is " PROGRAMCOPYRIGHT << endl
+        << " *" << endl
 -- 
-2.21.0
+2.1.0
 

extends-meta-qt5/qtbase_git.bbappend

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

extends-meta-qt5/qtsvg_git.bbappend

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

extends-meta-qt5/qttools_git.bbappend

@@ -4,17 +4,14 @@ DEPENDS += "${BPN}-native"
 
 
 # It's really time for us to publish cmake_lib.bbclass
-SRC_URI:remove = " \
+SRC_URI_remove = " \
     file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
 "
 
 # native ignore
-CMAKE_ALIGN_SYSROOT:class-native[1] = "ignore"
-CMAKE_ALIGN_SYSROOT:class-nativesdk[1] = "ignore"
+CMAKE_ALIGN_SYSROOT_class-native[1] = "ignore"
+CMAKE_ALIGN_SYSROOT_class-nativesdk[1] = "ignore"
 
 # cross -> native binaries
 CMAKE_ALIGN_SYSROOT[1] = "Qt5Help, -S${bindir}${QT_DIR_NAME}, -s${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}"
 CMAKE_ALIGN_SYSROOT[2] = "Qt5LinguistTools, -S${bindir}${QT_DIR_NAME}, -s${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}"
-
-# yeah I know yocto does not want us to change this
-PACKAGECONFIG:append = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', ' clang', '', d)}"

extends-meta-qt5/qtwayland_git.bbappend

@@ -1,16 +0,0 @@
-# Since Qt5.15 qtwaylandscanner creates a comment as:
-
-# // source file is /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/kwayland/5.70.0-r0/recipe-sysroot/usr/share/wayland-protocols/unstable/tablet/tablet-unstable-v2.xml
-
-# which triggers our make_extra_sanity.bbclass.
-# To be compatible with Qt5.14 (dunfell) and >= Qt5.15 (current master) we do
-# some sed instead of patching.
-do_patch:append:class-native() {
-    bb.build.exec_func('do_fix_qtwaylandscanner_cpp', d)
-}
-
-do_fix_qtwaylandscanner_cpp () {
-    if [ -f ${S}/src/qtwaylandscanner/qtwaylandscanner.cpp ]; then
-        sed -i 's:printf("// source file is://printf("// source file is:' ${S}/src/qtwaylandscanner/qtwaylandscanner.cpp
-    fi
-}

extends-meta-qt5/quazip.bb

@@ -1,15 +0,0 @@
-SUMMARY = "Qt/C++ wrapper for ZIP/UNZIP package"
-HOMEPAGE = "https://github.com/stachenov/quazip"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=af67f05b2b6abf61e608dcfccb94b3e1"
-
-DEPENDS = "qtbase zlib"
-
-SRC_URI = "git://github.com/stachenov/quazip.git;branch=master;protocol=https"
-SRCREV = "6117161af08e366c37499895b00ef62f93adc345"
-PV = "1.3"
-S = "${WORKDIR}/git"
-
-inherit cmake_qt5
-
-EXTRA_CMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"

extends-oe-core/ghostscript%.bbappend

@@ -1,20 +0,0 @@
-DEPENDS:append:class-target = " libidn"
-
-EXTRA_OECONF:remove:class-target = "--without-libidn"
-
-do_configure:append:class-target() {
-    # more (so) copy tools from the native ghostscript build
-    mkdir -p soobj/aux
-    for i in genarch genconf mkromfs echogs gendev genht packps; do
-        cp -f ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i soobj/aux/$i
-    done
-}
-
-do_compile:class-target() {
-    oe_runmake so
-}
-
-do_install:class-target() {
-    oe_runmake 'DESTDIR=${D}' soinstall
-    mv -f ${D}${bindir}/gsc ${D}${bindir}/gs
-}

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 +0,0 @@
-PACKAGECONFIG:append = " qt5"

files/licenses/Bison-exception-2.2

@@ -1,5 +0,0 @@
-Bison Exception
-
-As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof as a parser skeleton. Alternatively, if you modify or redistribute the parser skeleton itself, you may (at your option) remove this special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception.
-
-This special exception was added by the Free Software Foundation in version 2.2 of Bison.

files/licenses/CC-BY-SA-4.0

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

files/licenses/MIT-CMU

@@ -1,17 +0,0 @@
-<copyright notice> By obtaining, using, and/or copying this software and/or
-its associated documentation, you agree that you have read, understood, and
-will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and its associated
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appears in all copies, and that both that
-copyright notice and this permission notice appear in supporting documentation,
-and that the name of the copyright holder not be used in advertising or publicity
-pertaining to distribution of the software without specific, written permission.
-
-THE COPYRIGHT HOLDER DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
-SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM THE LOSS OF USE, DATA OR
-PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

files/licenses/Qt-LGPL-exception-1.1

@@ -1,21 +0,0 @@
-The Qt Company Qt LGPL Exception version 1.1
-
-As an additional permission to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate material from a header file that is part of the Library. You may distribute such object code under terms of your choice, provided that:
-
-   (i) the header files of the Library have not been modified; and
-
-   (ii) the incorporated material is limited to numerical parameters, data structure layouts, accessors, macros, inline functions and templates; and
-
-   (iii) you comply with the terms of Section 6 of the GNU Lesser General Public License version 2.1.
-
-Moreover, you may apply this exception to a modified version of the Library, provided that such modification does not involve copying material from the Library into the modified Library's header files unless such material is limited to
-
-   (i) numerical parameters;
-
-   (ii) data structure layouts;
-
-   (iii) accessors; and
-
-   (iv) small macros, templates and inline functions of five lines or less in length.
-
-Furthermore, you are not required to apply this additional permission to a modified version of the Library.

files/licenses/Unicode-DFS-2016

@@ -1,49 +0,0 @@
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
-
-Unicode Data Files include all data files under the directories http://www.unicode.org/Public/,
-http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
-http://www.unicode.org/ivd/data/, and http://www.unicode.org/utility/trac/browser/.
-
-Unicode Data Files do not include PDF online code charts under the directory
-http://www.unicode.org/Public/.
-
-Software includes any source code published in the Unicode Standard or under
-the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/,
-http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
-and http://www.unicode.org/utility/trac/browser/.
-
-NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING,
-INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"),
-AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND
-BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE,
-DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
-
-COPYRIGHT AND PERMISSION NOTICE Copyright © 1991-2016 Unicode, Inc. All rights
-reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the Unicode data files and any associated documentation (the "Data Files")
-or Unicode software and any associated documentation (the "Software") to deal
-in the Data Files or Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, and/or sell copies
-of the Data Files or Software, and to permit persons to whom the Data Files
-or Software are furnished to do so, provided that either
-
-(a) this copyright and permission notice appear with all copies of the Data
-Files or Software, or
-
-   (b) this copyright and permission notice appear in associated Documentation.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
-BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
-OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in these Data Files or Software without prior written authorization of the
-copyright holder.

files/licenses/X11

@@ -1,13 +0,0 @@
-X11 License
-
-Copyright (C) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium.
-
-X Window System is a trademark of X Consortium, Inc.

recipes-gottcode/connectagram/connectagram.bb

@@ -1,25 +1,24 @@
 SUMMARY = "Connectagram is a word unscrambling game"
 HOMEPAGE = "https://gottcode.org/connectagram/"
-LICENSE = "GPL-3.0-only"
+LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
+inherit qmake5 qt5-translation gtk-icon-cache
 
 DEPENDS = "qttools-native qtbase hicolor-icon-theme"
 
 SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[md5sum] = "6ec03e98a79b8404a414353a3538aec7"
-SRC_URI[sha256sum] = "a711da70bd08383dd06b5f7ccbd92dcd201165426dfd20343c64f584a23f9de1"
-PV = "1.2.11"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
+SRC_URI[md5sum] = "db3ad80358b31df292d69b067c5657c6"
+SRC_URI[sha256sum] = "04dbe12f52e68a0fececad1bbab08e279d7fd2f438e126bfc6d047daf1a55b75"
+PV = "1.2.10"
 
 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,11 +1,11 @@
 SUMMARY = "FocusWriter is a simple, distraction-free writing environment"
 HOMEPAGE = "http://gottcode.org/gottet/"
-LICENSE = "GPL-3.0-only"
+LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 pkgconfig qt5-translation gtk-icon-cache mime-xdg
+inherit qmake5 qt5-translation gtk-icon-cache
 
-DEPENDS += " \
+DEPENDS = " \
     qttools-native \
     qtbase \
     qtmultimedia \
@@ -14,14 +14,13 @@ DEPENDS += " \
 "
 
 SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[md5sum] = "ba9e316b4bc0c4568d71f7dc3cd64fff"
-SRC_URI[sha256sum] = "34f576a49c9fe64aedad66e02efafc29c840b6c3ddc98a42d87dfda499710541"
-PV = "1.7.6"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
+SRC_URI[md5sum] = "a9a33873fc7c0f919fe575b78278fdbf"
+SRC_URI[sha256sum] = "5886054427da20ef0542dc97c8d2b4308b0a169b49f0409633dd8b17fe71bc94"
+PV = "1.7.3"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES:${PN} += " \
+FILES_${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/${BPN}/icons \
     ${datadir}/${BPN}/symbols1000.dat \

recipes-gottcode/gottet/gottet.bb

@@ -1,20 +1,20 @@
 SUMMARY = "A tetris clone using the Qt GUI toolkit"
 HOMEPAGE = "http://gottcode.org/gottet/"
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
+inherit qmake5 qt5-translation gtk-icon-cache
 
 DEPENDS = "qttools-native qtbase hicolor-icon-theme"
 
 SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[sha256sum] = "26647b12258180e46e76413a25b43b2a1c2f9169f0ea039015359ba9fbe4f2f8"
-PV = "1.2.0"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
+SRC_URI[md5sum] = "85272ffa824695e76e726dcce798dbe3"
+SRC_URI[sha256sum] = "440e9570e2909e3029cced304774a15d83b4019925ac9a4cfb44c1f8a77592d8"
+PV = "1.1.8"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES:${PN} += " \
+FILES_${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/icons \
 "

recipes-gottcode/hexalate/hexalate.bb

@@ -1,20 +1,20 @@
 SUMMARY = "A color matching game"
 HOMEPAGE = "http://gottcode.org/hexalate/"
-LICENSE = "GPL-3.0-only"
+LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
+inherit qmake5 qt5-translation gtk-icon-cache
 
 DEPENDS = "qttools-native qtbase hicolor-icon-theme"
 
 SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[sha256sum] = "a54aa31c6243ba091f46a6ced17be70e7481cc2af7de94f7e0288864355133bd"
-PV = "1.2.0"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
+SRC_URI[md5sum] = "465bdcaa8793dd74e1f1a13dddb78631"
+SRC_URI[sha256sum] = "422f5fed8adc7e2bc43e22a5c0573385143f8b15e8b3495b7b766e0409fa9782"
+PV = "1.1.5"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES:${PN} += " \
+FILES_${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/icons \
 "

recipes-gottcode/kapow/kapow.bb

@@ -1,20 +1,19 @@
 SUMMARY = "Kapow is a punch clock program to easily keep track of your hours"
 HOMEPAGE = "https://gottcode.org/kapow/"
-LICENSE = "GPL-3.0-only"
+LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
+inherit qmake5 qt5-translation gtk-icon-cache
 
 DEPENDS = "qttools-native qtbase hicolor-icon-theme"
 
 SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[md5sum] = "51900b071ef71da4c86ee38bda161e72"
-SRC_URI[sha256sum] = "6ba62239f5717422d899573ff50f8a967aea8fbbd79ac57406d6b86a333d027c"
-PV = "1.5.10"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
+SRC_URI[md5sum] = "4f0fee606eff49d5a5cf9cdc9baae622"
+SRC_URI[sha256sum] = "f18ccc4e42d6ddb763983d0bfdc1da4ff91faa83289796e1b238f5fa5404e51e"
+PV = "1.5.9"
 
 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,21 +1,20 @@
 SUMMARY = "Peg-E is a peg solitaire game"
 HOMEPAGE = "http://gottcode.org/peg-e/"
-LICENSE = "GPL-3.0-only"
+LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
+inherit qmake5 qt5-translation gtk-icon-cache
 
 DEPENDS = "qttools-native qtbase hicolor-icon-theme"
 
 SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[md5sum] = "ea2659e5cf6e0d981189cbe2751588df"
-SRC_URI[sha256sum] = "06d6a07c056b82372cdd6ac258dbfedab397ad4f13b70117f548b8218201ff17"
-PV = "1.2.8"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
+SRC_URI[md5sum] = "9730d413dc6df67de93cd6f506680db6"
+SRC_URI[sha256sum] = "07025165f903a2e0e57c5ff537a7abb6e849a8d0f0c531b48db4a452edf6a0fc"
+PV = "1.2.7"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES:${PN} += " \
+FILES_${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/peg-e/icons \
 "

recipes-gottcode/simsu/simsu.bb

@@ -1,19 +1,19 @@
 SUMMARY = "Simsu is a basic Sudoku game"
 HOMEPAGE = "http://gottcode.org/simsu/"
-LICENSE = "GPL-3.0-only"
+LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 pkgconfig qt5-translation gtk-icon-cache
+inherit qmake5 qt5-translation gtk-icon-cache
 
 DEPENDS = "qttools-native qtbase hicolor-icon-theme"
 
 SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[sha256sum] = "6db0c004de67c122ac67f34cc6c1a68cd78be02034eceeab922848f87cb85e87"
-PV = "1.4.0"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
+SRC_URI[md5sum] = "d3e8887703dddc59999021bb364da860"
+SRC_URI[sha256sum] = "79b35bef30b6629574cb563d60291b4dc2cd41f52dc48acde53dcb874656b6a6"
+PV = "1.3.8"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES:${PN} += " \
+FILES_${PN} += " \
     ${datadir}/metainfo \
 "

recipes-gottcode/tetzle/tetzle.bb

@@ -1,20 +1,19 @@
 SUMMARY = "Tetzle is a jigsaw puzzle game that uses tetrominoes for the pieces"
 HOMEPAGE = "https://gottcode.org/tetzle/"
-LICENSE = "GPL-3.0-only"
+LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qmake5 pkgconfig qt5-translation gtk-icon-cache mime-xdg
+inherit qmake5 qt5-translation gtk-icon-cache
 
-DEPENDS += "qttools-native qtbase hicolor-icon-theme"
+DEPENDS = "qttools-native qtbase hicolor-icon-theme"
 
 SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
-SRC_URI[md5sum] = "dc3e1545aaba5d7571c84a1a30c04210"
-SRC_URI[sha256sum] = "fbc3c86b5bf64187f89379176bd0085c636605d9594c7af8d0c056760d6cf80a"
-PV = "2.1.6"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
+SRC_URI[md5sum] = "85685c336812e6e46133ab5e82be4a4d"
+SRC_URI[sha256sum] = "982bac58aa37be4ac27a723b84d122af62b8cdce63d9aad180efa48427ce10b0"
+PV = "2.1.5"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 
-FILES:${PN} += " \
+FILES_${PN} += " \
     ${datadir}/metainfo \
 "

recipes-graphics/compton/compton_git.bb

@@ -0,0 +1,35 @@
+SUMMARY = "Compton is a compositor for X"
+LICENSE = "NTP & MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=51f8a6ef7a22968bea284609c6093146"
+
+inherit autotools-brokensep pkgconfig distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+DEPENDS = " \
+    virtual/libx11 \
+    libxcomposite \
+    libxdamage \
+    libxfixes \
+    libxext \
+    libxrender \
+    libxrandr \
+    libpcre \
+    libconfig \
+    libxinerama \
+    libdrm \
+    dbus \
+"
+
+SRC_URI = " \
+    git://github.com/chjj/compton.git \
+    file://0001-Makefile-use-pkgconfig-to-find-libpcre.patch \
+    file://0002-Makefile-don-t-build-manpages.patch \
+"
+SRCREV = "86266e00e2bdac46d0a8dabfc1db3e29af91640e"
+PV = "v0.1-beta2+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+# there are not many machines around supporting gl
+EXTRA_OEMAKE = "NO_VSYNC_OPENGL=1"

recipes-graphics/compton/files/0001-Makefile-use-pkgconfig-to-find-libpcre.patch

@@ -0,0 +1,33 @@
+From 40fff6e760920d6b31dc98dbcbde081845ac26b0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 26 Aug 2015 22:31:35 +0200
+Subject: [PATCH 1/2] Makefile: use pkgconfig to find libpcre
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e66f322..d9737f7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,8 +39,8 @@ endif
+ # Enables support for PCRE regular expression pattern in window conditions
+ ifeq "$(NO_REGEX_PCRE)" ""
+   CFG += -DCONFIG_REGEX_PCRE
+-  LIBS += $(shell pcre-config --libs)
+-  INCS += $(shell pcre-config --cflags)
++  LIBS += $(shell pkg-config --libs libpcre)
++  INCS += $(shell pkg-config --cflags libpcre)
+   # Enables JIT support in libpcre
+   ifeq "$(NO_REGEX_PCRE_JIT)" ""
+     CFG += -DCONFIG_REGEX_PCRE_JIT
+-- 
+2.1.0
+

recipes-graphics/compton/files/0002-Makefile-don-t-build-manpages.patch

@@ -0,0 +1,33 @@
+From c5fbed297f765b222d92c4eca15743c8f8b4741d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 26 Aug 2015 23:04:41 +0200
+Subject: [PATCH 2/2] Makefile: don't build manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+we don't have all these tools neccessary in oe
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ Makefile | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e66f322..94d595c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -126,8 +126,6 @@ INCS += $(shell pkg-config --cflags $(PACKAGES))
+ CFLAGS += -Wall
+ 
+ BINS = compton bin/compton-trans
+-MANPAGES = man/compton.1 man/compton-trans.1
+-MANPAGES_HTML = $(addsuffix .html,$(MANPAGES))
+ 
+ # === Recipes ===
+ .DEFAULT_GOAL := compton
+-- 
+2.1.0
+

recipes-graphics/kcolorpicker/kcolorpicker.bb

@@ -1,17 +0,0 @@
-SUMMARY = "Qt based Color Picker with popup menu"
-HOMEPAGE = "https://github.com/ksnip/kColorPicker"
-LICENSE = "LGPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404"
-
-SRC_URI = "git://github.com/ksnip/kColorPicker.git;branch=master;protocol=https"
-SRCREV = "15e16374e51153006d3400cb88066d5272698743"
-PV = "0.2.0"
-S = "${WORKDIR}/git"
-
-DEPENDS = " \
-    qtbase \
-"
-
-inherit cmake_qt5_extra pkgconfig
-
-EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON"

recipes-graphics/kimageannotator/kimageannotator.bb

@@ -1,19 +0,0 @@
-SUMMARY = "A lightweight compositor for X11"
-HOMEPAGE = "https://github.com/ksnip/kImageAnnotator"
-LICENSE = "LGPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404"
-
-SRC_URI = "git://github.com/ksnip/kImageAnnotator.git;branch=master;protocol=https"
-SRCREV = "6651dc09ccbf277359669141669ccc9e6a9f2cc2"
-PV = "0.6.0"
-S = "${WORKDIR}/git"
-
-DEPENDS = " \
-    qttools-native \
-    qtsvg \
-    kcolorpicker \
-"
-
-inherit cmake_qt5_extra pkgconfig qt5-translation
-
-EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON"

recipes-graphics/picom/picom.bb

@@ -1,36 +0,0 @@
-SUMMARY = "A lightweight compositor for X11"
-HOMEPAGE = "https://github.com/yshui/picom"
-LICENSE = "MPL-2.0 & MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a9a621b5a1b8f702c605093d657b550c"
-
-SRC_URI = "git://github.com/yshui/picom.git;branch=stable/8;protocol=https"
-SRCREV = "dac85eac10082dfc3df463aaa74b811144e22122"
-PV = "8.2"
-S = "${WORKDIR}/git"
-
-DEPENDS = " \
-    libxext \
-    libxdamage \
-    libxfixes \
-    xcb-util-renderutil \
-    libxrender \
-    libxrandr \
-    libxcomposite \
-    xcb-util-image \
-    libxpresent \
-    libxinerama \
-    libdrm \
-    libev \
-    pixman \
-    dbus \
-    libconfig \
-    libpcre \
-    uthash \
-"
-
-inherit meson pkgconfig features_check gtk-icon-cache
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
-PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false,virtual/libgl"

recipes-graphics/qpdfview/qpdfview/0001-Fix-build-with-Qt-5.15.patch

@@ -1,33 +0,0 @@
-From 04d58fcb669c9d6ee79cdd630f04791b61f417cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 8 Jun 2020 17:10:03 +0200
-Subject: [PATCH] Fix build with Qt >= 5.15
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-| ../qpdfview-0.4.18/sources/model.h:46:22: error: field 'boundary' has incomplete type 'QPainterPath'
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- sources/model.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sources/model.h b/sources/model.h
-index 6363c32..dc10a8c 100644
---- a/sources/model.h
-+++ b/sources/model.h
-@@ -27,6 +27,7 @@ along with qpdfview.  If not, see <http://www.gnu.org/licenses/>.
- #include <QtPlugin>
- #include <QWidget>
- #include <QVector>
-+#include <QPainterPath>
- 
- class QAbstractItemModel;
- class QColor;
--- 
-2.26.2
-

recipes-graphics/qpdfview/qpdfview_0.4.16.bb

@@ -0,0 +1,20 @@
+SUMMARY = "Light-weight tabbed PDF, DJVU and PostScript viewer"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS += "cups poppler qtsvg"
+
+SRC_URI = "https://launchpad.net/qpdfview/trunk/${PV}/+download/${BPN}-${PV}.tar.gz"
+SRC_URI[md5sum] = "4b317c4536332a7fe437abe50eca1716"
+SRC_URI[sha256sum] = "fad416e8fefc3057fa1b8d12d964c7eccd16dffe0307a0d6e9d55a543294da7f"
+
+inherit qmake5
+
+QMAKE_PROFILES = "${S}/qpdfview.pro"
+EXTRA_QMAKEVARS_PRE += " \
+    CONFIG+=without_ps \
+    CONFIG+=without_djvu \
+    PLUGIN_INSTALL_PATH=${libdir}/${BPN} \
+"
+
+FILES_${PN} += "${datadir}"

recipes-graphics/qpdfview/qpdfview_0.4.18.bb

@@ -1,23 +0,0 @@
-SUMMARY = "Light-weight tabbed PDF, DJVU and PostScript viewer"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-DEPENDS += "cups poppler qtsvg"
-
-SRC_URI = " \
-    https://launchpad.net/qpdfview/trunk/${PV}/+download/${BPN}-${PV}.tar.gz \
-    file://0001-Fix-build-with-Qt-5.15.patch \
-"
-SRC_URI[md5sum] = "4d63ee0095e939602f9bf4759ae57953"
-SRC_URI[sha256sum] = "cc642e7fa74029373ca9b9fbc29adc4883f8b455130a78ad54746d6844a0396c"
-
-inherit qmake5 pkgconfig mime-xdg
-
-QMAKE_PROFILES = "${S}/qpdfview.pro"
-EXTRA_QMAKEVARS_PRE += " \
-    CONFIG+=without_ps \
-    CONFIG+=without_djvu \
-    PLUGIN_INSTALL_PATH=${libdir}/${BPN} \
-"
-
-FILES:${PN} += "${datadir}"

recipes-graphics/qskinny/qskinny/0001-Fix-linking-for-all-examples.patch

@@ -0,0 +1,69 @@
+From f6f8d9fee3a776f742977545dc62a418ccf82b89 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 2 Nov 2018 12:56:57 +0100
+Subject: [PATCH] Fix linking for all examples
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ examples/automotive/automotive.pro | 4 ----
+ examples/example.pri               | 4 +++-
+ playground/playground.pri          | 4 +++-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/examples/automotive/automotive.pro b/examples/automotive/automotive.pro
+index cb0954e..72e1159 100644
+--- a/examples/automotive/automotive.pro
++++ b/examples/automotive/automotive.pro
+@@ -8,10 +8,6 @@ QSK_SKIN_DIR=$${QSK_ROOT}/skins
+ INCLUDEPATH *= $${QSK_SKIN_DIR}
+ DEPENDPATH *= $${QSK_SKIN_DIR}
+ 
+-QSK_PLUGIN_DIR = $${QSK_OUT_ROOT}/plugins
+-QMAKE_RPATHDIR *= $${QSK_PLUGIN_DIR}/skins
+-LIBS *= -L$${QSK_PLUGIN_DIR}/skins -lsquiekskin -lmaterialskin
+-
+ HEADERS += \
+     ButtonBar.h \
+     SoundControl.h \
+diff --git a/examples/example.pri b/examples/example.pri
+index 221f995..c8d59c2 100644
+--- a/examples/example.pri
++++ b/examples/example.pri
+@@ -24,9 +24,11 @@ DEPENDPATH  *= $${QSK_DIRS}
+ 
+ DESTDIR      = $${QSK_OUT_ROOT}/examples/bin
+ 
+-QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib
++QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib $${QSK_OUT_ROOT}/plugins/skins
+ qskAddLibrary($${QSK_OUT_ROOT}/lib, qsktestsupport)
+ qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny)
++qskAddLibrary($${QSK_OUT_ROOT}/plugins/skins, squiekskin)
++qskAddLibrary($${QSK_OUT_ROOT}/plugins/skins, materialskin)
+ 
+ win32 {
+     contains(QSK_CONFIG, QskDll) {
+diff --git a/playground/playground.pri b/playground/playground.pri
+index 8e61547..11362f9 100644
+--- a/playground/playground.pri
++++ b/playground/playground.pri
+@@ -26,9 +26,11 @@ DEPENDPATH  += $${QSK_DIRS}
+ 
+ DESTDIR      = $${QSK_OUT_ROOT}/playground/bin
+ 
+-QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib
++QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib $${QSK_OUT_ROOT}/plugins/skins
+ qskAddLibrary($${QSK_OUT_ROOT}/lib, qsktestsupport)
+ qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny)
++qskAddLibrary($${QSK_OUT_ROOT}/plugins/skins, squiekskin)
++qskAddLibrary($${QSK_OUT_ROOT}/plugins/skins, materialskin)
+ 
+ win32 {
+     contains(QSK_CONFIG, QskDll) {
+-- 
+2.14.4
+

recipes-graphics/qskinny/qskinny/0002-Do-not-install-to-usr-local.patch

@@ -0,0 +1,31 @@
+From 8a09ea3ea3be54e200480dc03e375aaae2bba4ef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 2 Nov 2018 13:51:51 +0100
+Subject: [PATCH] Do not install to /usr/local
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ qskconfig.pri | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/qskconfig.pri b/qskconfig.pri
+index f78c0c4..1926b5e 100644
+--- a/qskconfig.pri
++++ b/qskconfig.pri
+@@ -10,10 +10,6 @@ QSK_VERSION      = $${QSK_VER_MAJ}.$${QSK_VER_MIN}.$${QSK_VER_PAT}
+ 
+ QSK_INSTALL_PREFIX    = $$[QT_INSTALL_PREFIX]
+ 
+-unix {
+-    QSK_INSTALL_PREFIX    = /usr/local/qskinny-$${QSK_VERSION}
+-}
+-
+ win32 {
+     QSK_INSTALL_PREFIX    = C:/Qskinny-$${QSK_VERSION}
+ }
+-- 
+2.14.4
+

recipes-graphics/qskinny/qskinny_git.bb

@@ -0,0 +1,59 @@
+SUMMARY = "A lightweight framework on top of the Qt scene graph"
+DESCRIPTION = "A lightweight framework on top of the Qt scene graph and only few classes from Qt/Quick. It is usable from C++ and/or QML"
+LICENSE = "LGPLv2.1-qskinny-exception"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ef112951de2dd97ead272458f5b86bdc"
+
+inherit qmake5 qemu-ext
+
+SRC_URI = " \
+    git://github.com/uwerat/qskinny.git \
+    file://0001-Fix-linking-for-all-examples.patch \
+    file://0002-Do-not-install-to-usr-local.patch \
+"
+SRCREV = "84e19c43f800f1d05f23dcb855807e0159b8fa04"
+S = "${WORKDIR}/git"
+PV = "0.0.1+git${SRCPV}"
+
+DEPENDS += " \
+    qtbase \
+    qtdeclarative \
+    qtsvg \
+"
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[qtwebengine] = ",,qtwebengine"
+
+SVG2QVG_CALL_IN_SOURCE = "$${SVG2QVG}"
+QEMUCALL = "${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '')}"
+
+do_configure_prepend() {
+    for pro_file in `find ${S} -name *.pro`; do
+        # wrap cross svg2qvg by qemu
+        sed -i 's|${SVG2QVG_CALL_IN_SOURCE}|${QEMUCALL} ${SVG2QVG_CALL_IN_SOURCE}|g' "$pro_file"
+    done
+}
+
+do_install_append() {
+    # Don't not pollute /usr/include
+    install -d ${D}${includedir}/qskinny
+    for header in `find ${D}/${includedir} -name '*.h*'`; do
+        mv $header ${D}${includedir}/qskinny/
+    done
+    
+    # plugins are not yet used as such -> libdir
+    for lib in `find ${D}/usr/plugins -name '*.so*'`; do
+        mv $lib ${D}${libdir}/
+    done
+    rm -r ${D}/usr/plugins
+}
+
+PACKAGES =+ "${PN}-examples"
+
+FILES_${PN} += " \
+    ${libdir}/lib*skin.so \
+    ${OE_QMAKE_PATH_PLUGINS} \
+"
+
+FILES_${PN}-examples += "${bindir}"
+
+FILES_SOLIBSDEV = "${libdir}/libqsk*${SOLIBSDEV}"

recipes-graphics/scribus/scribus_1.5.2.bb

@@ -0,0 +1,16 @@
+SUMMARY = "Scribus: Open source desktop publishing"
+HOMEPAGE = "https://www.scribus.net/"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5d1d7a95f43e1139c1c42c7414852679"
+
+inherit cmake_qt5 cmake_extra_sanity
+
+DEPENDS += " \
+    cairo \
+"
+
+SRC_URI = " \
+    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-devel/${PV}/${BPN}-${PV}.tar.xz \
+"
+SRC_URI[md5sum] = "031661a8fe0ba0131c360d3e9edc2fc0"
+SRC_URI[sha256sum] = "ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5"

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

@@ -0,0 +1,28 @@
+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-graphics/sddm/sddm/0002-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-Status: Pending
+Upstream-Sttaus: 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 1953c76..549cd4d 100644
+index 2a3c091..927bce2 100644
 --- a/src/greeter/SessionModel.cpp
 +++ b/src/greeter/SessionModel.cpp
-@@ -125,22 +125,11 @@ namespace SDDM {
+@@ -124,22 +124,11 @@ namespace SDDM {
  
              Session *si = new Session(type, session);
              bool execAllowed = true;
@@ -41,8 +41,8 @@ index 1953c76..549cd4d 100644
 -                execAllowed = false;
 -                QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
 -                QString envPath = env.value(QStringLiteral("PATH"));
--                const QStringList pathList = envPath.split(QLatin1Char(':'));
--                for(const QString &path : pathList) {
+-                QStringList pathList = envPath.split(QLatin1Char(':'));
+-                foreach(const QString &path, pathList) {
 -                    QDir pathDir(path);
 -                    fi.setFile(pathDir, si->tryExec());
 -                    if (fi.exists() && fi.isExecutable()) {
@@ -53,5 +53,5 @@ index 1953c76..549cd4d 100644
              }
              // add to sessions list
 -- 
-2.34.1
+2.14.5
 

recipes-graphics/sddm/sddm/sddm-autologin.pam

@@ -1,9 +1,9 @@
 #%PAM-1.0
 auth        required    pam_env.so
+auth        required    pam_tally.so file=/var/log/faillog onerr=succeed
 auth        required    pam_shells.so
 auth        required    pam_nologin.so
 -auth       optional    pam_gnome_keyring.so
--auth       optional    pam_kwallet5.so
 
 account     include     common-account
 
@@ -11,6 +11,4 @@ password    include     common-password
 
 session     include     common-session
 session     required    pam_limits.so
--session    optional    pam_kwallet5.so auto_start
 -session    optional    pam_gnome_keyring.so auto_start
-

recipes-graphics/sddm/sddm/sddm.pam

@@ -2,8 +2,8 @@
 
 auth            requisite       pam_nologin.so
 auth            required        pam_env.so
--auth            optional        pam_kwallet5.so
--auth            optional        pam_gnome_keyring.so
+auth            optional        pam_kwallet5.so
+auth            optional        pam_gnome_keyring.so
 #auth            required        pam_unix.so
 # To deny passwordless login comment next line and uncomment previous line
 auth            required        pam_unix.so nullok
@@ -13,8 +13,8 @@ account         required        pam_unix.so
 session         required        pam_limits.so
 session         required        pam_unix.so
 -session        optional        pam_systemd.so
--session         optional        pam_kwallet5.so auto_start
--session         optional        pam_gnome_keyring.so auto_start
+session         optional        pam_kwallet5.so auto_start
+session         optional        pam_gnome_keyring.so auto_start
 
 password        required        pam_unix.so
 

recipes-graphics/sddm/sddm_git.bb

@@ -1,5 +1,5 @@
 SUMMARY = "SDDM is a modern display manager for X11"
-LICENSE = "GPL-2.0-only & CC-BY-3.0"
+LICENSE = "GPLv2 & CC-BY-3.0"
 LIC_FILES_CHKSUM = " \
     file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b \
     file://LICENSE.CC-BY-3.0;md5=36b7342d5619a3a0d3b581e89803ec25 \
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit cmake_qt5_extra qmake5_base pkgconfig systemd useradd features_check
+inherit cmake_qt5_extra qmake5_base pkgconfig systemd useradd distro_features_check
 
 DEPENDS += "extra-cmake-modules-native qtbase qtdeclarative qttools libxcb"
 
@@ -17,14 +17,15 @@ 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;branch=develop;protocol=https \
-    file://0001-Workaround-missing-sessions.patch \
+    git://github.com/sddm/${BPN}.git;protocol=git;branch=master \
+    file://0001-fix-qml-install-dir.patch \
+    file://0002-Workaround-missing-sessions.patch \
     file://sddm.pam \
     file://sddm-autologin.pam \
     file://sddm.conf \
 "
-SRCREV = "c257a40ba95f56b5f3830b923b1c56aa055cf8ea"
-PV = "0.19.0+git${SRCPV}"
+SRCREV = "de41b8ea555f2e42ba47d83530ad654ca708cf85"
+PV = "0.18.1"
 
 S = "${WORKDIR}/git"
 
@@ -33,7 +34,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
 }
@@ -44,7 +45,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
 
@@ -55,14 +56,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 \
@@ -73,9 +74,10 @@ RDEPENDS:${PN} += " \
     qtbase-plugins \
     qtdeclarative-plugins \
     qtdeclarative-qmlplugins \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-tally', '', d)} \
 "
 
-RRECOMMENDS:${PN += " \
+RRECOMMENDS_${PN += " \
     qtvirtualkeyboard-plugins \
     qtvirtualkeyboard-qmlplugins \
 "

recipes-graphics/touchegg-qt5/files/0001-fix-qt5-build.patch

@@ -0,0 +1,47 @@
+From dee672a83f65a861adf3347d646a6f918f21c107 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 25 Jan 2016 15:07:48 +0100
+Subject: [PATCH] fix qt5 build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/touchegg/util/Include.h | 4 +++-
+ touchegg.pro                | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/touchegg/util/Include.h b/src/touchegg/util/Include.h
+index 4fb27d5..27bccf6 100644
+--- a/src/touchegg/util/Include.h
++++ b/src/touchegg/util/Include.h
+@@ -23,8 +23,10 @@
+     // Qt
+     #include <QtCore>
+     #include <QtGui>
+-    #include <QtGui/QX11Info>
++    #include <QX11Info>
+     #include <QtXml>
++    #include <QApplication>
++    #include <QDesktopWidget>
+ 
+     // Xlib
+     #include <X11/Xlib.h>
+diff --git a/touchegg.pro b/touchegg.pro
+index 696ea1a..4565083 100644
+--- a/touchegg.pro
++++ b/touchegg.pro
+@@ -1,6 +1,6 @@
+ TEMPLATE     = app
+ TARGET       = touchegg
+-QT          += gui core xml
++QT          += gui core xml widgets x11extras
+ LIBS        += -lgeis -lX11 -lXtst -lXext
+ //DEFINES      = QT_NO_DEBUG_OUTPUT
+ 
+-- 
+2.5.0
+

recipes-graphics/touchegg-qt5/touchegg-qt5_git.bb

@@ -0,0 +1,18 @@
+SUMMARY = "Linux multitouch gesture recognizer"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"
+
+inherit qmake5
+
+DEPENDS += "qtbase qtx11extras geis libxtst"
+
+SRC_URI = " \
+    git://github.com/JoseExposito/touchegg.git \
+    file://0001-fix-qt5-build.patch \
+"
+PV = "1.1.1+git${SRCPV}"
+SRCREV = "3a768ebfdc5f89a603504428705f80795d2ccc26"
+S="${WORKDIR}/git"
+
+FILES_${PN} += "${datadir}/touchegg"

recipes-graphics/xorg-lib/xcb-util-cursor_0.1.2.bb

@@ -0,0 +1,9 @@
+require recipes-graphics/xorg-lib/xcb-util.inc
+
+DEPENDS += "xcb-util xcb-util-renderutil xcb-util-image"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ce469b61c70ff8d7cce0547476891974"
+
+SRC_URI[md5sum] = "88e70d92ff5616d406ce5b1b62e0c58b"
+SRC_URI[sha256sum] = "ed65367b810d47ab637011585135f4a84dd12e235dddcd3b26e0cfb3be21fb3a"

recipes-kdab/hotspot/hotspot_git.bb

@@ -1,5 +1,5 @@
 SUMMARY = "The Linux perf GUI for performance analysis"
-LICENSE = "GPL-2.0-or-later | KDAB-Commercial | KDAB-Commercial-US"
+LICENSE = "GPLv2+ | 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;protocol=https;branch=master"
+SRC_URI = "gitsm://github.com/KDAB/hotspot.git"
 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 = "BSD-3-Clause & MIT"
+LICENSE = "GPLv2+ | KDAB-Commercial"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/BSD-3-Clause.txt;md5=f225922a2c12dfa5218fb70c49db3ea6 \
-    file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \
+    file://LICENSE.txt;md5=ec5e1ab8584968655cce6fd650160b26 \
+    file://LICENSE.GPL.txt;md5=9bea831e8733013a5761386750f57271 \
 "
 
 inherit cmake_qt5_extra
@@ -12,14 +12,9 @@ DEPENDS += " \
     qtsvg \
 "
 
-do_install:append() {
-    # these have gone wild / qmake was always pain
-    rm -r ${D}/usr/mkspecs
-}
-
-SRC_URI = "git://github.com/KDAB/KDChart.git;branch=master;protocol=https"
-SRCREV = "aa9de13376a5e9f4c8802091776584614db8677e"
+SRC_URI = "git://github.com/KDAB/KDChart.git"
+SRCREV = "488ae47b2be78b07d196ead7614ab35866c63157"
 S = "${WORKDIR}/git"
-PV = "3.0.0"
+PV = "2.6.50+git${SRCPV}"
 
-FILES:${PN}-dev += "${datadir}/mkspecs"
+FILES_${PN}-dev += "${datadir}/mkspecs"

recipes-kdab/kdreports/kdreports_git.bb

@@ -1,9 +1,11 @@
 SUMMARY = "Qt library for generating printable and exportable reports"
 DESCRIPTION = "Qt library for generating printable and exportable reports from code and from XML descriptions"
-LICENSE = "BSD-3-Clause & MIT"
+LICENSE = "(GPLv2 & LGPLv2.1 ) | KDAB-Commercial | KDAB-Commercial-US"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
-    file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \
+    file://LICENSE.GPL.txt;md5=fa70ea33eec42152e9d40dfb8310b70c \
+    file://LICENSE.LGPL.txt;md5=cce5e510cd6a04c95c4b4910d22559fe \
+    file://LICENSE.US.txt;md5=affebebb336655a41db530c5594f7dff \
+    file://LICENSE.txt;md5=129d14735385614fe7b1d5eee63674a5 \
 "
 
 inherit cmake_qt5_extra
@@ -13,13 +15,7 @@ DEPENDS += " \
     kdcharts \
 "
 
-SRC_URI = "git://github.com/KDAB/KDReports.git;branch=master;protocol=https"
-SRCREV = "a5095bd266b5d4697978e1a3042481edd72c2c3f"
+SRC_URI = "git://github.com/KDAB/KDReports.git"
+SRCREV = "2a7defbef34399838739f87f42c7d36c198b1611"
 S = "${WORKDIR}/git"
-PV = "2.2.0"
-
-do_install:append() {
-    # these have gone wild / qmake was always pain
-    rm -r ${D}/usr/mkspecs
-}
-
+PV = "1.8.50+git${SRCPV}"

recipes-kdab/kdsoap/kdsoap-native.bb

@@ -1,5 +0,0 @@
-require ${BPN}.inc
-
-inherit native
-
-SRC_URI += "file://0001-Just-build-bare-kdwsdl2cpp-for-native.patch"

recipes-kdab/kdsoap/kdsoap.bb

@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-DEPENDS += " \
-    ${BPN}-native \
-    qtbase \
-"
-
-SRC_URI += "file://0002-Do-not-export-kdwsdl2cpp-as-target-it-will-fin-it-s-.patch"
-
-FILES:${PN}-dev += "${datadir}/mkspecs"

recipes-kdab/kdsoap/kdsoap.inc

@@ -1,15 +0,0 @@
-SUMMARY = "A Qt-based client-side and server-side SOAP component"
-LICENSE = "(GPL-2.0-only & LGPL-2.1-only & AGPL-3.0-only) | KDAB-Commercial"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.GPL.txt;md5=63e3028b49eac8f84ab29661f079f159 \
-    file://LICENSE.LGPL.txt;md5=ce198ec102c2f0b1d13f26967a934670 \
-    file://LICENSE.AGPL3-modified.txt;md5=6b6dcd83ea786a77851d959c2797f78c \
-    file://LICENSE.txt;md5=a0def7eadd11e7a9916a16e5d8bc1a82 \
-"
-
-inherit cmake_qt5
-
-SRC_URI = "git://github.com/KDAB/KDSoap.git;protocol=https;branch=master"
-SRCREV = "fb0e905e242c2044fd25683a406eb6d369db052f"
-S = "${WORKDIR}/git"
-PV = "1.9.0"

recipes-kdab/kdsoap/kdsoap/0001-Just-build-bare-kdwsdl2cpp-for-native.patch

@@ -1,117 +0,0 @@
-From 4c0ea920ab34615d3cf83ef018c8485e3c07fa4f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 22 May 2020 09:56:41 +0200
-Subject: [PATCH] Just build bare kdwsdl2cpp for native
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- CMakeLists.txt                     | 4 ++--
- kdwsdl2cpp/common/fileprovider.cpp | 2 +-
- kdwsdl2cpp/src/main.cpp            | 6 +++---
- kdwsdl2cpp/src/settings.cpp        | 2 +-
- kdwsdl2cpp/src/settings.h          | 4 ++--
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index addbafe2..596425e4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -190,9 +190,9 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
-   )
- endif()
- 
--add_subdirectory(src)
-+#add_subdirectory(src)
- add_subdirectory(kdwsdl2cpp)
--if(${PROJECT_NAME}_IS_ROOT_PROJECT)
-+if(false)
- 
-   export(TARGETS kdsoap kdsoap-server kdwsdl2cpp NAMESPACE KDSoap::
-     FILE "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapTargets.cmake"
-diff --git a/kdwsdl2cpp/common/fileprovider.cpp b/kdwsdl2cpp/common/fileprovider.cpp
-index 1f23554d..45124850 100644
---- a/kdwsdl2cpp/common/fileprovider.cpp
-+++ b/kdwsdl2cpp/common/fileprovider.cpp
-@@ -106,7 +106,7 @@ bool FileProvider::get( const QUrl &url, QString &target )
- 
-     QNetworkAccessManager manager;
-     QNetworkRequest request(url);
--#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
-     if (Settings::self()->certificateLoaded()) {
-         QSslConfiguration sslConfig = request.sslConfiguration();
-         sslConfig.setPrivateKey(Settings::self()->sslKey());
-diff --git a/kdwsdl2cpp/src/main.cpp b/kdwsdl2cpp/src/main.cpp
-index 8905b6dc..8ac65f9e 100644
---- a/kdwsdl2cpp/src/main.cpp
-+++ b/kdwsdl2cpp/src/main.cpp
-@@ -67,7 +67,7 @@ static void showHelp(const char *appName)
-             "                            use of the import-path option\n"
-             "  -help-on-missing          When groups or basic types could not be found, display\n"
-             "                            available types (helps with wrong namespaces)\n"
--#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
-             "  -pkcs12file               Load a certificate from a PKCS12 file. You can use this option\n"
-             "                            if the WSDL file (or files refering to it) is served from a \n"
-             "                            location which require certificate based authentication\n"
-@@ -217,7 +217,7 @@ int main(int argc, char **argv)
-             useLocalFilesOnly = true;
-         } else if (opt == QLatin1String("-help-on-missing")) {
-             helpOnMissing = true;
--#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
-         } else if (opt == QLatin1String("-pkcs12file")) {
-             ++arg;
-             if (!argv[arg]) {
-@@ -288,7 +288,7 @@ int main(int argc, char **argv)
-     Settings::self()->setHelpOnMissing(helpOnMissing);
- 
-     KWSDL::Compiler compiler;
--#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
-     if (!pkcs12File.isEmpty()) {
-         if (!Settings::self()->loadCertificate(pkcs12File, pkcs12Password))
-             return -1;
-diff --git a/kdwsdl2cpp/src/settings.cpp b/kdwsdl2cpp/src/settings.cpp
-index 2e25e01a..db7b8aab 100644
---- a/kdwsdl2cpp/src/settings.cpp
-+++ b/kdwsdl2cpp/src/settings.cpp
-@@ -252,7 +252,7 @@ bool Settings::helpOnMissing() const
-     return mHelpOnMissing;
- }
- 
--#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
- bool Settings::loadCertificate(const QString &certPath, const QString & password)
- {
-     QFile certFile(certPath);
-diff --git a/kdwsdl2cpp/src/settings.h b/kdwsdl2cpp/src/settings.h
-index c5ca846f..f177ea77 100644
---- a/kdwsdl2cpp/src/settings.h
-+++ b/kdwsdl2cpp/src/settings.h
-@@ -87,7 +87,7 @@ public:
-     bool helpOnMissing() const;
-     void setHelpOnMissing(bool b);
- 
--#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
-     bool loadCertificate(const QString & certPath, const QString &password = QString());
-     bool certificateLoaded() const;
-     QSslKey sslKey() const;
-@@ -115,7 +115,7 @@ private:
-     bool mKeepUnusedTypes;
-     bool mUseLocalFilesOnly;
-     bool mHelpOnMissing;
--#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-+#if FALSE
-     QSslKey mSslKey;
-     QSslCertificate mCertificate;
-     QList<QSslCertificate> mCaCertificates;
--- 
-2.21.1
-

recipes-kdab/kdsoap/kdsoap/0002-Do-not-export-kdwsdl2cpp-as-target-it-will-fin-it-s-.patch

@@ -1,46 +0,0 @@
-From 1d666d5c6ea5e3b1633c6692572f480e86531a37 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 24 May 2020 00:27:46 +0200
-Subject: [PATCH] Do not export kdwsdl2cpp as target - it will fin it's way
- into cross sysroot
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- CMakeLists.txt            | 2 +-
- kdwsdl2cpp/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index addbafe2..3558dd48 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -194,7 +194,7 @@ add_subdirectory(src)
- add_subdirectory(kdwsdl2cpp)
- if(${PROJECT_NAME}_IS_ROOT_PROJECT)
- 
--  export(TARGETS kdsoap kdsoap-server kdwsdl2cpp NAMESPACE KDSoap::
-+  export(TARGETS kdsoap kdsoap-server NAMESPACE KDSoap::
-     FILE "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapTargets.cmake"
-   )
- 
-diff --git a/kdwsdl2cpp/CMakeLists.txt b/kdwsdl2cpp/CMakeLists.txt
-index 82418be3..61c46688 100644
---- a/kdwsdl2cpp/CMakeLists.txt
-+++ b/kdwsdl2cpp/CMakeLists.txt
-@@ -72,7 +72,7 @@ target_link_libraries(kdwsdl2cpp_lib ${QT_LIBRARIES})
- add_executable(kdwsdl2cpp ${SOURCES_EXE})
- target_link_libraries(kdwsdl2cpp kdwsdl2cpp_lib ${QT_LIBRARIES})
- 
--install(TARGETS kdwsdl2cpp EXPORT "KDSoapTargets"
-+install(TARGETS kdwsdl2cpp
-   RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
-   BUNDLE DESTINATION .
- )
--- 
-2.21.1
-

recipes-kde/apps/analitza/analitza.bb

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

recipes-kde/apps/ark/ark.bb

@@ -1,21 +1,18 @@
 SUMMARY = "Ark is KDE's file archiver"
-LICENSE = "BSD-2-Clause & CC0-1.0 & GPL-2.0-or-later & LGPL-3.0-only & MIT"
+LICENSE = "GPLv2 & LGPLv3"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/BSD-2-Clause.txt;md5=4e290b17e3e05732730de37b44abef90 \
-    file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
-    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
-    file://LICENSES/LGPL-3.0-only.txt;md5=7b8fde44990707e743d3613054065137 \
-    file://LICENSES/MIT.txt;md5=4dd71a82d66fd9e3ca0cc65b8be370c0 \
+    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
+    file://COPYING.icons;md5=6e01bfa20e899e8ad569d5488923cbd2 \
 "
 
-inherit kde-apps gtk-icon-cache mime mime-xdg
+inherit kde-apps gtk-icon-cache
 
 DEPENDS += "\
     libarchive \
-    libzip \
     karchive \
     kauth-native \
     kconfig-native \
+    kcoreaddons-native \
     kcrash \
     kdbusaddons \
     kdoctools-native \
@@ -31,9 +28,13 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "9cc79811d95eb61e491a8ff6f0aebbab9b38b739ac4a5f66fe3807cd22a78065"
+SRC_URI[md5sum] = "7229b67491b61dcec2fc210444099653"
+SRC_URI[sha256sum] = "bc1fcd84632c628a10e8536d56b65a7acbd4235ed0e034fec864b78bdc36f8f1"
+SRC_URI += " \
+    file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch \
+"
 
-FILES:${PN} += " \
+FILES_${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/mime \

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

@@ -0,0 +1,48 @@
+From b7285c71f5b04bc55441217bf963078b38d6bad4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 11 Oct 2015 21:41:27 +0200
+Subject: [PATCH] fix build with QT_NO_SESSIONMANAGER set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+
+---
+ app/main.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/app/main.cpp b/app/main.cpp
+index 0396400..5924683 100644
+--- a/app/main.cpp
++++ b/app/main.cpp
+@@ -206,6 +206,7 @@ int main(int argc, char **argv)
+     // This is needed to prevent Dolphin from freezing when opening an archive.
+     KDBusService dbusService(KDBusService::Multiple | KDBusService::NoExitOnFailure);
+ 
++#ifndef QT_NO_SESSIONMANAGER
+     // Session restoring.
+     if (application.isSessionRestored()) {
+         if (!KMainWindow::canBeRestored(1)) {
+@@ -218,8 +219,9 @@ int main(int argc, char **argv)
+             delete window;
+             return -1;
+         }
+-    } else { // New ark window (no restored session).
+-
++    } else // New ark window (no restored session).
++#endif
++    {
+         // Open any given URLs.
+         const QStringList urls = parser.positionalArguments();
+ 
+-- 
+2.5.5
+

recipes-kde/apps/artikulate/artikulate.bb

@@ -1,30 +0,0 @@
-SUMMARY = "Artikulate is a pronunciation trainer"
-LICENSE = "GPL-2.0-only & CC-BY-SA-4.0"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=93e64b4a83c7e441e48bbdeeea05c977 \
-    file://COPYING.DOC;md5=4b39cb11ffa11c92d3f7a3431390e0d9 \
-"
-
-inherit kde-apps gtk-icon-cache
-
-DEPENDS += " \
-    qtmultimedia \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    kdoctools-native \
-    karchive \
-    kcrash \
-    ki18n \
-    knewstuff \
-    kirigami2 \
-"
-
-PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "d207cbbb37869767810277f0a58ee3372f6d7f4513b73c391aee319c107ede4c"
-
-FILES:${PN} += " \
-    ${datadir}/config.kcfg \
-    ${datadir}/knsrcfiles \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"

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

@@ -1,13 +1,8 @@
 SUMMARY = "Widgets for Baloo"
-LICENSE = "GPL-2.0-only & GPL-3.0-only & LGPL-2.0-only & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only"
+LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
-    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
-    file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031294a26b98c \
-    file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
-    file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \
-    file://LICENSES/LGPL-2.1-or-later.txt;md5=147a320ed8b16b036829a0c71d424153 \
-    file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \
+    file://COPYING.README;md5=f5d7c5af660f94231a1d4e19501bce8f \
+    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
 inherit kde-apps gettext
@@ -24,9 +19,10 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "0baabcbf277a56f4d7b1fb8f7aff2bddf77d1261bbabd6b717c0d26d2929db5a"
+SRC_URI[md5sum] = "2efa693e1c94fa03d0d391ffb489636b"
+SRC_URI[sha256sum] = "edb9284b1a7d73b0c824390aa875593650880eb77c2680a2942c9fd65f436a2d"
 
-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-only & GFDL-1.2"
+LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=3c8ea28d12b8a786603a5394fc50096d \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -19,9 +19,10 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "a0b4f72a32d789d72a0d7f3115777c360216952dd24ec822514ee5490a620f18"
+SRC_URI[md5sum] = "0834d12a9478b0335f1ac17448339084"
+SRC_URI[sha256sum] = "2f950820ebdb52f1c81476b36b5ea07808fe8da154e7757a85ca8ac2c1b37735"
 
-FILES:${PN} += " \
+FILES_${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/icons \
 "

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

@@ -1,71 +0,0 @@
-From 3a31ad05fcc7682bf3b65143af99fdb9b2e1e248 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH 20/22] Fix build with newer Qt
-
-(cherry picked from commit b36d74f13a1421437a725fb74502c993c359392a)
-
-Upstream-Status: Accepted
----
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
--- 
-2.31.1
-
-

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-only & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
 LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=a9cc0417b6424a8311f616fa527d0755 \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -18,8 +18,8 @@ DEPENDS += " \
 SRC_URI = " \
     ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
     file://0001-Do-not-rely-on-python2.patch \
-    file://0001-Fix-build-with-newer-Qt.patch \
 "
+SRC_URI[md5sum] = "78f66c9b8f9d1e61d421eea7ce5241c7"
 SRC_URI[sha256sum] = "8f8983bc8d143832dc14bc2003ba6af1af27688e477c0c791fd61445464f2069"
 
-FILES:${PN} += "${OE_QMAKE_PATH_PLUGINS}"
+FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"

recipes-kde/apps/calligra/kexi/0004-Set-extern-C-after-including-common-headers.patch

@@ -1,53 +0,0 @@
-From 0690fc08719e29d0d026102d54deb6cd667fed2a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 1 May 2021 10:47:22 +0200
-Subject: [PATCH] Set extern "C" after including common headers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Latest gcc/glibc complains:
-| /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/kexi/3.2.0-r0/recipe-sysroot/usr/include/c++/10.3.0/type_traits:101:3: error: template with C linkage
-|  101 |   template<typename...>
-|      |   ^~~~~~~~
-| In file included from /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/kexi/3.2.0-r0/kexi-3.2.0/src/migration/mdb/src/keximdb/mdbmigrate.h:24,
-|                  from /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/kexi/3.2.0-r0/kexi-3.2.0/src/migration/mdb/src/keximdb/mdbmigrate.cpp:21:
-| /home/superandy/tmp/oe-core-glibc/work/cortexa72-mortsgna-linux/kexi/3.2.0-r0/kexi-3.2.0/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h:22:3: note: 'extern "C"' linkage started here
-|    22 |   extern "C" {
-|       |   ^~~~~~~~~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h b/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h
-index 31f48c1..d5e0075 100644
---- a/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h
-+++ b/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h
-@@ -18,9 +18,6 @@
- #ifndef _mdbtools_h_
- #define _mdbtools_h_
- 
--#ifdef __cplusplus
--  extern "C" {
--#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -34,6 +31,10 @@
- #include <string.h>
- #include <glib.h>
- 
-+#ifdef __cplusplus
-+  extern "C" {
-+#endif
-+
- #ifdef HAVE_ICONV
- #include <iconv.h>
- #endif
--- 
-2.30.2
-

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

@@ -1,200 +0,0 @@
-From 3280c5ec9940f329dc75b2b8d9a52285b20209f0 Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-Date: Wed, 5 May 2021 00:09:49 +0200
-Subject: [PATCH] Use plain Marble package instead of KexiMarble
-
-Marble has shipped with a MarbleConfig.cmake file since ~2016. Kexi
-already depends on KF5 versions that are much newer than that.
-
-Upstream-Status: Backport[https://invent.kde.org/office/kexi/-/commit/3280c5ec9940f329dc75b2b8d9a52285b20209f0]
----
- CMakeLists.txt                                |   8 +-
- cmake/modules/FindKexiMarble.cmake            | 115 ------------------
- src/plugins/forms/widgets/CMakeLists.txt      |   2 +-
- .../forms/widgets/mapbrowser/CMakeLists.txt   |   3 +-
- 4 files changed, 5 insertions(+), 123 deletions(-)
- delete mode 100644 cmake/modules/FindKexiMarble.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 82ebc70..17181b5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -199,16 +199,14 @@ endif()
- ## Test for marble
- ##
- set(MARBLE_MIN_VERSION "0.19.2")
--find_package(KexiMarble ${MARBLE_MIN_VERSION})
--set_package_properties(KexiMarble PROPERTIES
-+find_package(Marble ${MARBLE_MIN_VERSION} CONFIG)
-+set_package_properties(Marble PROPERTIES
-     DESCRIPTION "KDE World Globe Widget library"
-     URL "https://marble.kde.org"
-     TYPE RECOMMENDED
-     PURPOSE "Required by Kexi form map widget"
- )
--if(NOT MARBLE_FOUND)
--    set(MARBLE_INCLUDE_DIR "")
--else()
-+if(Marble_FOUND)
-     set(HAVE_MARBLE TRUE)
- endif()
- set_package_properties(GLIB2 PROPERTIES TYPE RECOMMENDED PURPOSE "${_REQUIRED_BY_MDB}")
-diff --git a/cmake/modules/FindKexiMarble.cmake b/cmake/modules/FindKexiMarble.cmake
-deleted file mode 100644
-index 4ec1c5195..000000000
---- a/cmake/modules/FindKexiMarble.cmake
-+++ /dev/null
-@@ -1,115 +0,0 @@
--# - Try to find the Marble Library
--# Once done this will define
--#
--#  MARBLE_FOUND - system has Marble
--#  MARBLE_INCLUDE_DIR - the Marble include directory
--#  MARBLE_LIBRARIES - Libraries needed to use Marble
--#  MARBLE_VERSION - This contains combined MAJOR.MINOR.PATCH version (eg. 0.19.2);
--#                   Can be missing if version could not be found
--#
--#  Versions mapping can be found at: https://marble.kde.org/changelog.php
--#
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
--#
--
--#=============================================================================
--# Copyright 2006-2009 Kitware, Inc.
--# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
--# Copyright 2009-2011 Mathieu Malaterre <mathieu.malaterre@gmail.com>
--#
--# Distributed under the OSI-approved BSD License (the "License");
--# see accompanying file Copyright.txt for details.
--#
--# This software is distributed WITHOUT ANY WARRANTY; without even the
--# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--# See the License for more information.
--#=============================================================================
--
--function(from_hex HEX DEC)
--  string(TOUPPER "${HEX}" HEX)
--  set(_res 0)
--  string(LENGTH "${HEX}" _strlen)
--
--  while (_strlen GREATER 0)
--    math(EXPR _res "${_res} * 16")
--    string(SUBSTRING "${HEX}" 0 1 NIBBLE)
--    string(SUBSTRING "${HEX}" 1 -1 HEX)
--    if (NIBBLE STREQUAL "A")
--      math(EXPR _res "${_res} + 10")
--    elseif (NIBBLE STREQUAL "B")
--      math(EXPR _res "${_res} + 11")
--    elseif (NIBBLE STREQUAL "C")
--      math(EXPR _res "${_res} + 12")
--    elseif (NIBBLE STREQUAL "D")
--      math(EXPR _res "${_res} + 13")
--    elseif (NIBBLE STREQUAL "E")
--      math(EXPR _res "${_res} + 14")
--    elseif (NIBBLE STREQUAL "F")
--      math(EXPR _res "${_res} + 15")
--    else()
--      math(EXPR _res "${_res} + ${NIBBLE}")
--    endif()
--
--    string(LENGTH "${HEX}" _strlen)
--  endwhile()
--
--  set(${DEC} ${_res} PARENT_SCOPE)
--endfunction()
--
--if ( MARBLE_INCLUDE_DIR AND MARBLE_GLOBAL_HEADER AND MARBLE_LIBRARIES )
--   # in cache already
--   set( MARBLE_FIND_QUIETLY TRUE )
--endif ()
--
--find_path( MARBLE_INCLUDE_DIR NAMES marble/MarbleMap.h PATH_SUFFIXES marble)
--find_file( MARBLE_GLOBAL_HEADER NAMES marble/MarbleGlobal.h PATH_SUFFIXES marble)
--find_library( MARBLE_LIBRARIES NAMES marblewidget-qt5 )
--
--if(MARBLE_GLOBAL_HEADER)
--    file(STRINGS ${MARBLE_GLOBAL_HEADER}
--         marble_version_line
--         REGEX "^#define[\t ]+MARBLE_VERSION[\t ]+0x([0-9a-fA-F])+.*")
--
--    string(REGEX REPLACE
--            "^.*MARBLE_VERSION[\t ]+0x([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F]).*$"
--            "\\1;\\2;\\3" marble_version_list "${marble_version_line}")
--
--    list(GET marble_version_list 0 MARBLE_VERSION_MAJOR)
--    from_hex("${MARBLE_VERSION_MAJOR}" MARBLE_VERSION_MAJOR)
--
--    list(GET marble_version_list 1 MARBLE_VERSION_MINOR)
--    from_hex("${MARBLE_VERSION_MINOR}" MARBLE_VERSION_MINOR)
--
--    list(GET marble_version_list 2 MARBLE_VERSION_PATCH)
--    from_hex("${MARBLE_VERSION_PATCH}" MARBLE_VERSION_PATCH)
--
--    set(MARBLE_VERSION "${MARBLE_VERSION_MAJOR}.${MARBLE_VERSION_MINOR}.${MARBLE_VERSION_PATCH}" CACHE STRING "Found Marble version")
--endif()
--
--include( FindPackageHandleStandardArgs )
--
--if(MARBLE_VERSION)
--    if(DEFINED MARBLE_MIN_VERSION AND ${MARBLE_VERSION} VERSION_LESS ${MARBLE_MIN_VERSION})
--        set(MARBLE_FOUND FALSE)
--        unset(MARBLE_INCLUDE_DIR)
--        unset(MARBLE_LIBRARIES)
--    else()
--        find_package_handle_standard_args( Marble
--            REQUIRED_VARS
--                MARBLE_INCLUDE_DIR
--                MARBLE_LIBRARIES
--            VERSION_VAR
--                MARBLE_VERSION
--            FAIL_MESSAGE
--                "Could not find Marble"
--        )
--    endif()
--else()
--    find_package_handle_standard_args( marble
--            DEFAULT_MSG
--            MARBLE_INCLUDE_DIR
--            MARBLE_LIBRARIES )
--endif()
--
--mark_as_advanced(MARBLE_GLOBAL_HEADER MARBLE_VERSION_MAJOR MARBLE_VERSION_MINOR MARBLE_VERSION_PATCH)
-diff --git a/src/plugins/forms/widgets/CMakeLists.txt b/src/plugins/forms/widgets/CMakeLists.txt
-index 107d578a8..109341fe0 100644
---- a/src/plugins/forms/widgets/CMakeLists.txt
-+++ b/src/plugins/forms/widgets/CMakeLists.txt
-@@ -11,7 +11,7 @@ endmacro()
- # the main widgets plugin
- add_subdirectory(main)
- 
--if(MARBLE_FOUND)
-+if(Marble_FOUND)
- #TODO  add_subdirectory(mapbrowser)
- endif()
- 
-diff --git a/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt b/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt
-index 3ff7f4fc8..f5be7fd02 100644
---- a/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt
-+++ b/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt
-@@ -1,7 +1,6 @@
- include_directories(
-     ${CMAKE_SOURCE_DIR}/src/formeditor
-     ${CMAKE_SOURCE_DIR}/src/core
--    ${MARBLE_INCLUDE_DIR}
- )
- 
- set(kexiforms_mapwidgetplugin_SRCS
-@@ -20,8 +19,8 @@ target_link_libraries(kexiforms_mapwidgetplugin
-     kexiextendedwidgets
-     kexiformutils
-     kexidataviewcommon
--    ${MARBLE_LIBRARIES}
- 
-+    Marble
-     Qt5::Xml
- )
- 
--- 
-2.31.1
-

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-only & LGPL-2.0-only & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2 & BSD"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=8608b1f74c58ebcb11718f46e8619749 \
     file://COPYING.LIB;md5=7537f2f34ef162007ae9f34b9f256dcb \
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
 "
 
-inherit kde-apps gtk-icon-cache mime-xdg
+inherit kde-apps gtk-icon-cache
 
 DEPENDS += " \
     qtwebkit \
@@ -33,8 +33,7 @@ DEPENDS += " \
     kcompletion \
     kio \
     ktexteditor \
-    mariadb \
-    postgresql \
+    marble \
 "
 
 SRC_URI = " \
@@ -42,25 +41,28 @@ SRC_URI = " \
     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[md5sum] = "90ac376276be2f5a8f6eca537ca5fd0c"
 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 (try marble again once 3.3.x is out)
+# REVISIT
 #-- The following RECOMMENDED packages have not been found:
 #
 # * KexiMarble (required version >= 0.19.2), KDE World Globe Widget library, <https://marble.kde.org>
 #   Required by Kexi form map widget
+# * MySQL, MySQL Client Library (libmysqlclient), <http://www.mysql.com>
+#   Required by Kexi MySQL migration driver
+# * PostgreSQL, C API to PostgreSQL (libpq), <http://www.postgresql.org>
+#   Required by Kexi PostgreSQL migration driver
 

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-only & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
 LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=3dcc9b0b0118292a0c5d1c18927ef176 \
     file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
@@ -18,9 +18,10 @@ DEPENDS += " \
 "
 
 SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "4964e28440f3a808297efb0cb786bd14"
 SRC_URI[sha256sum] = "67af0c2d74715957bd5373a6a30589ff0a996cb1d267dfd0538dccaa9a768dfa"
 
-FILES:${PN} += " \
+FILES_${PN} += " \
     ${datadir}/kproperty3 \
     ${OE_QMAKE_PATH_PLUGINS} \
 "

recipes-kde/apps/calligra/kreport/0001-Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch

@@ -1,122 +0,0 @@
-From 5d3053ea78b349b81b7a562974ad78f93d169791 Mon Sep 17 00:00:00 2001
-From: Jaroslaw Staniek <staniek@kde.org>
-Date: Tue, 16 Jun 2020 21:59:12 +0200
-Subject: [PATCH] Fix build with GCC 10 (make KReportGroupTracker use C++ file)
-
-BUG:422886
-CCMAIL:adam@piggz.co.uk
-
-FIXED-IN:3.2.1
-
-Upstream-Status: Applied[https://github.com/KDE/kreport/commit/5d3053ea78b349b81b7a562974ad78f93d169791]
----
- src/CMakeLists.txt                            |  5 +---
- .../scripting/KReportGroupTracker.cpp         | 26 +++++++++++++++++++
- src/renderer/scripting/KReportGroupTracker.h  | 25 +++++++++++++++---
- 3 files changed, 48 insertions(+), 8 deletions(-)
- create mode 100644 src/renderer/scripting/KReportGroupTracker.cpp
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1cf0b389..65bcf6e5 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -106,6 +106,7 @@ set(kreport_TARGET_INCLUDE_DIRS
- 
- if(KREPORT_SCRIPTING)
-     list(APPEND kreport_LIB_SRCS
-+        renderer/scripting/KReportGroupTracker.cpp
-         renderer/scripting/KReportScriptHandler.cpp
-         renderer/scripting/KReportScriptConstants.cpp
-         renderer/scripting/KReportScriptDebug.cpp
-@@ -133,10 +134,6 @@ if(KREPORT_SCRIPTING)
-         items/text/KReportScriptText.cpp
-     )
- 
--    qt_wrap_cpp(KReport kreport_LIB_SRCS
--        renderer/scripting/KReportGroupTracker.h
--    )
--
-     list(APPEND kreport_INCLUDE_DIRS
-         ${CMAKE_CURRENT_SOURCE_DIR}/renderer/scripting
-     )
-diff --git a/src/renderer/scripting/KReportGroupTracker.cpp b/src/renderer/scripting/KReportGroupTracker.cpp
-new file mode 100644
-index 00000000..9274d4a5
---- /dev/null
-+++ b/src/renderer/scripting/KReportGroupTracker.cpp
-@@ -0,0 +1,26 @@
-+/* This file is part of the KDE project
-+ * Copyright (C) 2015 by Adam Pigg (adam@piggz.co.uk)
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include "KReportGroupTracker.h"
-+
-+KReportGroupTracker::KReportGroupTracker()
-+{
-+}
-+
-+KReportGroupTracker::~KReportGroupTracker()
-+{
-+}
-diff --git a/src/renderer/scripting/KReportGroupTracker.h b/src/renderer/scripting/KReportGroupTracker.h
-index e434e05a..4c0852ea 100644
---- a/src/renderer/scripting/KReportGroupTracker.h
-+++ b/src/renderer/scripting/KReportGroupTracker.h
-@@ -1,3 +1,20 @@
-+/* This file is part of the KDE project
-+ * Copyright (C) 2015 by Adam Pigg (adam@piggz.co.uk)
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
- #ifndef KREPORTGROUPTRACKER_H
- #define KREPORTGROUPTRACKER_H
- 
-@@ -7,16 +24,16 @@
- /*!
-  * @brief Keeps track of groups as the data for the group changes
-  */
--class KREPORT_EXPORT KReportGroupTracker : public QObject {
-+class KREPORT_EXPORT KReportGroupTracker : public QObject
-+{
-     Q_OBJECT
- 
- protected:
--    KReportGroupTracker() {}
--    ~KReportGroupTracker() override{}
-+    KReportGroupTracker();
-+    ~KReportGroupTracker() override;
- 
- public:
-     Q_SLOT virtual void setGroupData(const QMap<QString, QVariant> &groupData) = 0;
- };
- 
- #endif // KREPORTGROUPTRACKER_H
--
--- 
-2.26.2
-

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-only & GFDL-1.2 & BSD-3-Clause"
+LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
 LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=1634220ce20ef95161c3b8401908638c \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -26,11 +26,11 @@ DEPENDS += " \
 SRC_URI = " \
     ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
     file://0001-Do-not-rely-on-python2.patch \
-    file://0001-Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch \
 "
+SRC_URI[md5sum] = "f11fa519d7f5519c8e48906fa96cab2f"
 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-or-later"
-LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
 
 inherit kde-apps gettext
 
@@ -18,9 +18,10 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "703c4666d5fb9a48cca01b52ca5bc4aacbcba3a82c1656487f40334513851517"
+SRC_URI[md5sum] = "3fc039691fae9e401d6e66d1c78b831f"
+SRC_URI[sha256sum] = "82860ef615954e94f3f382ad60fb144fcfcf7777b8a890f281c0cce55da13a55"
 
-FILES:${PN} += " \
+FILES_${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/kservices5 \
     ${OE_QMAKE_PATH_PLUGINS} \

recipes-kde/apps/dolphin/dolphin.bb

@@ -1,21 +1,21 @@
 SUMMARY = "KDE File Manager"
-LICENSE = "GPL-2.0-only & GFDL-1.2"
+LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps gettext mime-xdg
+inherit kde-apps gettext
 
 DEPENDS += " \
     kauth-native \
     kconfig-native \
     kcoreaddons-native \
     kdoctools-native \
-    kcmutils-native \
     sonnet-native \
     \
     kinit \
+    kcmutils \
     knewstuff \
     ki18n \
     kdbusaddons \
@@ -36,20 +36,22 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "971489a59cdd6b297e2142eb3315847addafbc4e3504e1609fe5e1d119cf15a3"
+SRC_URI[md5sum] = "41fa8934aa3f10bb422d79d952db0e6e"
+SRC_URI[sha256sum] = "de71f52324c15d692448ac4c79c1e0fcf35df5c03349a8bcbebfae20d9f69d4e"
+SRC_URI += " \
+    file://0001-fix-build-for-qtbase-without-session-management.patch \
+    file://0002-Revert-Make-target_link_libraries-for-kdeinit_dolphi.patch \
+"
 
 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 \
     ${libdir}/libkdeinit5_dolphin.so \
     ${OE_QMAKE_PATH_PLUGINS} \
-    ${systemd_user_unitdir} \
 "

recipes-kde/apps/dolphin/files/0001-fix-build-for-qtbase-without-session-management.patch

@@ -0,0 +1,50 @@
+From b9abe385e2563d7178fbf982ec6977b9f3e625bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 28 Aug 2015 23:22:18 +0200
+Subject: [PATCH] fix build for qtbase without session management
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/dolphinmainwindow.cpp | 2 ++
+ src/main.cpp              | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
+index f7a7613..127cd85 100644
+--- a/src/dolphinmainwindow.cpp
++++ b/src/dolphinmainwindow.cpp
+@@ -434,9 +434,11 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
+     // Find out if Dolphin is closed directly by the user or
+     // by the session manager because the session is closed
+     bool closedByUser = true;
++#ifndef QT_NO_SESSIONMANAGER
+     if (qApp->isSavingSession()) {
+         closedByUser = false;
+     }
++#endif
+ 
+     if (m_tabWidget->count() > 1 && GeneralSettings::confirmClosingMultipleTabs() && closedByUser) {
+         // Ask the user if he really wants to quit and close all tabs.
+diff --git a/src/main.cpp b/src/main.cpp
+index b4ca2c6..5c058a9 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -168,6 +168,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
+ 
+     mainWindow->show();
+ 
++#ifndef QT_NO_SESSIONMANAGER
+     if (app.isSessionRestored()) {
+         const QString className = KXmlGuiWindow::classNameOfToplevel(1);
+         if (className == QLatin1String("DolphinMainWindow")) {
+@@ -176,6 +177,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
+            qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
+         }
+     }
++#endif
+ 
+     KDBusService dolphinDBusService;
+     DBusInterface interface;

recipes-kde/apps/dolphin/files/0002-Revert-Make-target_link_libraries-for-kdeinit_dolphi.patch

@@ -0,0 +1,24 @@
+From d6c810a4e95af9f4d8c4176eaa622e1507ab5613 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 29 Oct 2018 22:19:12 +0100
+Subject: [PATCH] Revert "Make target_link_libraries for kdeinit_dolphin
+ PRIVATE"
+
+This reverts commit 8e6f4eecd318041d2e4e6386d1660742dd4ddd89.
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5aff4b0fa..9dc77c3da 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -297,7 +297,7 @@ ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS})
+ kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
+ 
+ 
+-target_link_libraries(kdeinit_dolphin PRIVATE
++target_link_libraries(kdeinit_dolphin
+     dolphinstatic
+     dolphinprivate
+     KF5::Crash

recipes-kde/apps/dragon/dragon.bb

@@ -1,13 +1,11 @@
 SUMMARY = "Simple KDE multimedia player"
-LICENSE = "GFDL-1.2 & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only"
+LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
-    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
-    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
-    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps gettext mime-xdg
+inherit kde-apps gettext
 
 DEPENDS += " \
     phonon \
@@ -31,11 +29,12 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "ea699d4c7c780063aa0598a2050f78f3ce93de86c3818f56541e59d20fa9e6ad"
+SRC_URI[md5sum] = "3852d3814d21ed1c8f1e98d188cb82f2"
+SRC_URI[sha256sum] = "f9172f6ddf75cf8e4be19d50f80994d59545fdea966674fb67abe7a7c934810a"
 
 CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
 
-FILES:${PN} += " \
+FILES_${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/solid \
     ${datadir}/icons \

recipes-kde/apps/filelight/filelight.bb

@@ -1,12 +1,11 @@
 SUMMARY = "KDE graphical diskspace analyser"
-LICENSE = "GFDL-1.2 & GPL-2.0-only & GPL-3.0-only"
+LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/GFDL-1.2-or-later.txt;md5=9f58808219e9a42ff1228309d6f83dc6 \
-    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
-    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
+    file://COPYING;md5=e098acff086ea3d1264fc89b51242144 \
+    file://COPYING-DOCS;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps gettext mime-xdg
+inherit kde-apps gettext
 
 DEPENDS += "\
     kauth-native \
@@ -14,9 +13,6 @@ DEPENDS += "\
     kcoreaddons-native \
     kdoctools-native \
     sonnet-native \
-    kpackage-native \
-    qtquickcontrols2 \
-    kdeclarative \
     kio \
     kparts \
     solid \
@@ -25,9 +21,13 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "d28b9b9e6628bc4f97398e04872f57d9b46c1a7259a5d68f8311e50db3a74f6e"
+SRC_URI[md5sum] = "6fa0d265e40841fca313aa631de1931b"
+SRC_URI[sha256sum] = "95fa38574292a2aa8d3d90749fbbb61c5005889ef1df1aaa04d2d789bbf4fb00"
+SRC_URI += " \
+    file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
+"
 
-FILES:${PN} += " \
+FILES_${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/icons \
     ${OE_QMAKE_PATH_PLUGINS} \

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

@@ -0,0 +1,40 @@
+From d83637a54457d77687088f45a9036b9a2a7bcf11 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 24 Apr 2015 11:35:45 +0200
+Subject: [PATCH] fix build for qtbase build without session support
+ QT_NO_SESSIONMANAGER
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/main.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 2463a29..1709717 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -78,6 +78,7 @@ int main(int argc, char *argv[])
+     options.process(app);
+     about.processCommandLine(&options);
+ 
++#ifndef QT_NO_SESSIONMANAGER
+     if (!app.isSessionRestored()) {
+         MainWindow *mw = new MainWindow();
+ 
+@@ -89,7 +90,9 @@ int main(int argc, char *argv[])
+ 
+         mw->show();
+     }
+-    else RESTORE(MainWindow);
++    else
++#endif
++		RESTORE(MainWindow);
+ 
+     return app.exec();
+ }
+-- 
+1.9.3
+

recipes-kde/apps/granatier/granatier.bb

@@ -1,10 +1,9 @@
 SUMMARY = "Granatier is a clone of the classic Bomberman game"
 DESCRIPTION = "Granatier is a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"
-LICENSE = "GFDL-1.2+ & GPL-2.0-or-later & LGPL-2.0-only"
+LICENSE = "GPLv2 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
-    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
-    file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031294a26b98c \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
 inherit kde-apps gtk-icon-cache
@@ -25,9 +24,10 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "16527c0b596de555a19b5f67672bf1a463a4a934c85d578aef23b0bae856d458"
+SRC_URI[md5sum] = "1429dd72178fbefc8b5d704a01047c71"
+SRC_URI[sha256sum] = "eac24bb0b0bcf7e12e4059187e0fd542503bae620637a4f35a339e6f63ab3890"
 
-FILES:${PN} += " \
+FILES_${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/gwenview/files/0001-Avoid-try_run.patch

@@ -0,0 +1,115 @@
+From e5170c60d0443d8f50b5bf6a85bea64bea29fbc0 Mon Sep 17 00:00:00 2001
+From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
+Date: Wed, 6 Apr 2016 19:42:07 +0000
+Subject: [PATCH 3/3] Avoid try_run
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When cross compiling, the executable compiled in the first step usually
+cannot be run on the build host. For this reason, we use try_compile()
+to determine what version of libjpeg is available.
+
+Upstream-Status: Pending
+
+Signed-off-by: Luis Gustavo S. Barreto <gustavo@ossystems.com.br>
+
+Adjusted to 19.04
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
+---
+ lib/CMakeLists.txt | 75 ++++++++++++++++++++++++++--------------------
+ 1 file changed, 42 insertions(+), 33 deletions(-)
+
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 2a6a08d..c8696ba 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -12,42 +12,51 @@ message(STATUS "Looking for libjpeg version in ${JPEG_INCLUDE_DIR}/jpeglib.h")
+ # found in (between libjpeg, libjpeg-turbo and various multilib header
+ # forwarding schemes seen in distros), have a simple program print out the
+ # right version.
+-set(JPEGLIB_VERSION_CHECK_PATH "${CMAKE_CURRENT_BINARY_DIR}/jpeglib-version-check.c")
+-file(WRITE ${JPEGLIB_VERSION_CHECK_PATH} "
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <jpeglib.h>
+-
+-int main(void) { printf(\"%d\\\n\", JPEG_LIB_VERSION); return 0; }
+-")
+-
+-try_run(JPEGLIB_RUN_RESULT JPEGLIB_COMPILE_RESULT
+-    ${CMAKE_CURRENT_BINARY_DIR} ${JPEGLIB_VERSION_CHECK_PATH}
+-    CMAKE_FLAGS -DINCLUDE_DIRECTORIES:PATH=${JPEG_INCLUDE_DIR}
+-    RUN_OUTPUT_VARIABLE jpeglib_version)
+-
+-if ((${JPEGLIB_COMPILE_RESULT} EQUAL FALSE) OR ("${JPEGLIB_RUN_RESULT}" EQUAL FAILED_TO_RUN) OR "${jpeglib_version}" STREQUAL "")
++function(JPEGVersionCheck Ret Op Version)
++    set(JPEGLIB_VERSION_CHECK_PATH "${CMAKE_CURRENT_BINARY_DIR}/jpeglib-version-check.c")
++    file(WRITE ${JPEGLIB_VERSION_CHECK_PATH} "
++    #include <stddef.h>
++    #include <stdio.h>
++    #include <jpeglib.h>
++    int main()
++    {
++    #if (JPEG_LIB_VERSION ${Op} ${Version})
++    #error JPEG_LIB_VERSION ${Op} ${Version}
++    #endif
++    return 0;
++    }
++    ")
++    try_compile(COMPILE_RESULT_VAR
++     "${CMAKE_BINARY_DIR}" "${JPEGLIB_VERSION_CHECK_PATH}"
++      COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS}"
++      OUTPUT_VARIABLE COMPILE_OUT)
++    set(${Ret} ${COMPILE_OUT} PARENT_SCOPE)
++endfunction()
++
++find_package(JPEG REQUIRED)
++if(JPEG_FOUND)
++    JPEGVersionCheck(JPEG_LIB_VERSION < 80)
++    if (${JPEG_LIB_VERSION} MATCHES "#error")
++      set(GV_JPEG_DIR libjpeg-62)
++    endif()
++    JPEGVersionCheck(JPEG_LIB_VERSION == 80)
++    if (${JPEG_LIB_VERSION} MATCHES "#error")
++      set(GV_JPEG_DIR libjpeg-80)
++    endif()
++    JPEGVersionCheck(JPEG_LIB_VERSION == 90)
++    if (${JPEG_LIB_VERSION} MATCHES "#error")
++      set(GV_JPEG_DIR libjpeg-90)
++    endif()
++
++    if ("${GV_JPEG_DIR}" STREQUAL "")
++        message(FATAL_ERROR "Unknown libjpeg version")
++    else()
++        message(STATUS "using ${GV_JPEG_DIR}")
++    endif()
++else(JPEG_FOUND)
+     message(FATAL_ERROR "Could not find jpeglib.h. This file comes with libjpeg.")
+ endif()
+ 
+-if ("${jpeglib_version}" LESS 80)
+-    set(GV_JPEG_DIR libjpeg-62)
+-endif()
+-
+-if ("${jpeglib_version}" EQUAL 80)
+-    set(GV_JPEG_DIR libjpeg-80)
+-endif()
+-
+-if ("${jpeglib_version}" EQUAL 90)
+-    set(GV_JPEG_DIR libjpeg-90)
+-endif()
+-
+-if ("${GV_JPEG_DIR}" STREQUAL "")
+-    message(FATAL_ERROR "Unknown libjpeg version: ${jpeglib_version}")
+-endif()
+-
+-message(STATUS "libjpeg version: ${jpeglib_version}")
+-
+ add_definitions(-Dlibjpeg_EXPORTS)
+ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/${GV_JPEG_DIR}
+-- 
+2.20.1
+

recipes-kde/apps/gwenview/gwenview.bb

@@ -1,8 +1,8 @@
 SUMMARY = "A fast and easy to use image viewer for KDE"
-LICENSE = "GPL-2.0-only"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b"
 
-inherit kde-apps gettext mime-xdg
+inherit kde-apps gettext
 
 DEPENDS += " \
     kdelibs4support-native \
@@ -22,18 +22,19 @@ DEPENDS += " \
     kfilemetadata \
     baloo \
     libkdcraw \
-    kimageannotator \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "f125eb729dd81ea265471c9bbca54fe6a7e87348c9a782b321331da72a02aa6e"
+SRC_URI[md5sum] = "925dd075bdec3aaa61dfac125b7dd077"
+SRC_URI[sha256sum] = "7e7ad69eaa7a6b2d0549e94d1dab0d012107c822d66483d54aa8268900820255"
 
-EXTRA_OECMAKE += " \
-    -DJPEGLIB_RUN_RESULT=true \
-    -DJPEGLIB_RUN_RESULT__TRYRUN_OUTPUT=0 \
+SRC_URI += " \
+    file://0001-Avoid-try_run.patch \
 "
 
-FILES:${PN} += " \
+CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
+
+FILES_${PN} += " \
     ${datadir}/k*5 \
     ${datadir}/icons \
     ${datadir}/solid \