kde-plasma: upgrade 5.22.3 -> 5.22.4

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

README.md

@@ -17,8 +17,8 @@ Policies
 * **Please do not send private emails to maintainer - they will not be answered anymore**. For bug-reports/questions/suggestions.. use [issues](https://github.com/schnitzeltony/meta-qt5-extra/issues).
 * Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
   * Use 4 spaces for indentation always (shell and python code)
-  * For splitting of long list values use four-space indentation on sucessive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
-  * Pull-requests with patches fixing issues for musl, clang or gold-linker are accepeted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.
+  * 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.

classes/kde-apps.bbclass

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

classes/kde-base.bbclass

@@ -1,4 +1,7 @@
-DEPENDS += "qtbase extra-cmake-modules-native"
+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 "
 
 KDE_MIRROR = "http://download.kde.org"
 

classes/kde-kf5.bbclass

@@ -1,6 +1,6 @@
 inherit kde-base
 
-KF5_VERSION = "5.73.0"
+KF5_VERSION = "5.84.0"
 
 def kde_verdir(v):
     return oe.utils.trim_version(v, 2)

classes/kde-plasma.bbclass

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

classes/liri.bbclass

@@ -13,7 +13,7 @@ DEPENDS += " \
     qtwayland \
 "
 
-inherit cmake_qt5_extra pkgconfig qt5-translation
+inherit cmake_qt5_extra pkgconfig
 
 EXTRA_OECMAKE += " \
     -DINSTALL_LIBDIR:PATH=${baselib} \

classes/lxqt.bbclass

@@ -1,4 +1,4 @@
-inherit cmake_qt5_extra qt5-translation
+inherit cmake_qt5_extra
 
 HOMEPAGE = "http://lxqt.org/"
 

classes/qt5-translation.bbclass

@@ -7,17 +7,15 @@ QT_TRANSLATION_FILES ??= "${datadir}/*/translations/*.qm ${datadir}/*/translatio
 
 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 = (d.getVar('PACKAGES') or "").split()
+    packages = collections.deque((d.getVar('PACKAGES') or "").split())
 
     datadir = d.getVar('datadir')
     if not datadir:
@@ -41,7 +39,7 @@ python qt_do_split_locales() {
                 locales.append(locale)
 
     if not locales:
-        bb.debug(1, "No locale files in this package")
+        bb.warn("No locale files for recipe %s. Remove qt5-translation from inherit?" % d.getVar('PN'))
         return
 
     summary = d.getVar('SUMMARY') or pn
@@ -51,7 +49,7 @@ python qt_do_split_locales() {
     for l in sorted(locales):
         ln = legitimize_package_name(l)
         pkg = pn + '-locale-' + ln
-        packages.append(pkg)
+        packages.appendleft(pkg)
         files = ''
         for transvar in d.getVar('QT_TRANSLATION_FILES').split():
             files = '%s %s' % (files, transvar.replace('*.qm', '*_%s.qm' % l))
@@ -63,7 +61,7 @@ python qt_do_split_locales() {
         if locale_section:
             d.setVar('SECTION_' + pkg, locale_section)
 
-    d.setVar('PACKAGES', ' '.join(packages))
+    d.setVar('PACKAGES', ' '.join(list(packages)))
 }
 
 PACKAGESPLITFUNCS_prepend = "qt_do_split_locales "

conf/layer.conf

@@ -19,7 +19,7 @@ LAYERDEPENDS_meta-qt5-extra = " \
     gnome-layer \
     meta-python \
 "
-LAYERSERIES_COMPAT_meta-qt5-extra = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_meta-qt5-extra = "dunfell gatesgarth hardknott"
 
 LICENSE_PATH += "${LAYERDIR}/files/licenses"
 

extends-meta-qt5/qtbase_git.bbappend

@@ -14,9 +14,8 @@ PACKAGECONFIG_GL_use-mainline-bsp = "${QT5_EXTRA_QTBASE_IMX_MAINLINE_GL} gbm kms
 # override QT5_EXTRA_QTBASE_IMX_MAINLINE_GL with 'gles2'
 QT5_EXTRA_QTBASE_IMX_MAINLINE_GL ??= ""
 
-# session management only for x11 environment
-PACKAGECONFIG_DISTRO += " \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "sm", "", d)} \
+PACKAGECONFIG_DISTRO_append = " \
+    sm \
     accessibility \
     sql-sqlite \
     cups \

extends-meta-qt5/quazip.bb

@@ -1,13 +1,13 @@
 SUMMARY = "Qt/C++ wrapper for ZIP/UNZIP package"
 HOMEPAGE = "https://github.com/stachenov/quazip"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=910d778aab53617cbaf13c4e1810e289"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4c01c380a79ed7138aa9049e29df9c6a"
 
 DEPENDS = "qtbase zlib"
 
-SRC_URI = "git://github.com/stachenov/quazip.git;branch=v0.9.x"
-SRCREV = "6938d8b108b09ebb14ef25542abd2d9108f8e036"
-PV = "0.9.1"
+SRC_URI = "git://github.com/stachenov/quazip.git"
+SRCREV = "100578f686b7da029a19c0bc9ad3c93f80adb2bb"
+PV = "1.1"
 S = "${WORKDIR}/git"
 
 inherit cmake_qt5

files/licenses/Bison-exception-2.2

@@ -0,0 +1,5 @@
+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/MIT-CMU

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

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

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

recipes-gottcode/connectagram/connectagram.bb

@@ -1,6 +1,6 @@
 SUMMARY = "Connectagram is a word unscrambling game"
 HOMEPAGE = "https://gottcode.org/connectagram/"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qmake5 qt5-translation gtk-icon-cache
@@ -11,6 +11,7 @@ SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
 SRC_URI[md5sum] = "6ec03e98a79b8404a414353a3538aec7"
 SRC_URI[sha256sum] = "a711da70bd08383dd06b5f7ccbd92dcd201165426dfd20343c64f584a23f9de1"
 PV = "1.2.11"
+UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 

recipes-gottcode/focuswriter/focuswriter.bb

@@ -1,6 +1,6 @@
 SUMMARY = "FocusWriter is a simple, distraction-free writing environment"
 HOMEPAGE = "http://gottcode.org/gottet/"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qmake5 qt5-translation gtk-icon-cache mime-xdg
@@ -17,6 +17,7 @@ SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
 SRC_URI[md5sum] = "ba9e316b4bc0c4568d71f7dc3cd64fff"
 SRC_URI[sha256sum] = "34f576a49c9fe64aedad66e02efafc29c840b6c3ddc98a42d87dfda499710541"
 PV = "1.7.6"
+UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 

recipes-gottcode/gottet/gottet.bb

@@ -1,6 +1,6 @@
 SUMMARY = "A tetris clone using the Qt GUI toolkit"
 HOMEPAGE = "http://gottcode.org/gottet/"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qmake5 qt5-translation gtk-icon-cache
@@ -11,6 +11,7 @@ SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
 SRC_URI[md5sum] = "9e0c5cf63233376228dc7888515e6556"
 SRC_URI[sha256sum] = "6c979caa5b3fa6854ca8367ca0595814fcc101f0bdfad02d64219dd9049abb2b"
 PV = "1.1.9"
+UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 

recipes-gottcode/hexalate/hexalate.bb

@@ -1,6 +1,6 @@
 SUMMARY = "A color matching game"
 HOMEPAGE = "http://gottcode.org/hexalate/"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qmake5 qt5-translation gtk-icon-cache
@@ -11,6 +11,7 @@ SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
 SRC_URI[md5sum] = "4c318906a2782aed37a1e7244f73f97c"
 SRC_URI[sha256sum] = "5d3198523960d4df394d2092cd7e7b9003878a70a2934dbada60947651b1c88d"
 PV = "1.1.6"
+UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 

recipes-gottcode/kapow/kapow.bb

@@ -1,6 +1,6 @@
 SUMMARY = "Kapow is a punch clock program to easily keep track of your hours"
 HOMEPAGE = "https://gottcode.org/kapow/"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qmake5 qt5-translation gtk-icon-cache
@@ -11,6 +11,7 @@ SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
 SRC_URI[md5sum] = "51900b071ef71da4c86ee38bda161e72"
 SRC_URI[sha256sum] = "6ba62239f5717422d899573ff50f8a967aea8fbbd79ac57406d6b86a333d027c"
 PV = "1.5.10"
+UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 

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

@@ -1,6 +1,6 @@
 SUMMARY = "Peg-E is a peg solitaire game"
 HOMEPAGE = "http://gottcode.org/peg-e/"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qmake5 qt5-translation gtk-icon-cache
@@ -11,6 +11,7 @@ SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
 SRC_URI[md5sum] = "ea2659e5cf6e0d981189cbe2751588df"
 SRC_URI[sha256sum] = "06d6a07c056b82372cdd6ac258dbfedab397ad4f13b70117f548b8218201ff17"
 PV = "1.2.8"
+UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 

recipes-gottcode/simsu/simsu.bb

@@ -1,6 +1,6 @@
 SUMMARY = "Simsu is a basic Sudoku game"
 HOMEPAGE = "http://gottcode.org/simsu/"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qmake5 qt5-translation gtk-icon-cache
@@ -11,6 +11,7 @@ SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
 SRC_URI[md5sum] = "dc33b6c8c0cc5c60e47e1c094f99c467"
 SRC_URI[sha256sum] = "b5df8994ff7bc35e775c466c8214e4362d1f720757383c9cd412693fcb6f143b"
 PV = "1.3.9"
+UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 

recipes-gottcode/tetzle/tetzle.bb

@@ -1,6 +1,6 @@
 SUMMARY = "Tetzle is a jigsaw puzzle game that uses tetrominoes for the pieces"
 HOMEPAGE = "https://gottcode.org/tetzle/"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qmake5 qt5-translation gtk-icon-cache mime-xdg
@@ -11,6 +11,7 @@ SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
 SRC_URI[md5sum] = "dc3e1545aaba5d7571c84a1a30c04210"
 SRC_URI[sha256sum] = "fbc3c86b5bf64187f89379176bd0085c636605d9594c7af8d0c056760d6cf80a"
 PV = "2.1.6"
+UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
 

recipes-graphics/compton/compton_git.bb

@@ -1,35 +0,0 @@
-SUMMARY = "Compton is a compositor for X"
-LICENSE = "NTP & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=51f8a6ef7a22968bea284609c6093146"
-
-inherit autotools-brokensep pkgconfig 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

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

@@ -1,33 +0,0 @@
-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/picom/picom.bb

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

recipes-graphics/scribus/scribus_1.5.2.bb

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

recipes-graphics/scribus/scribus_1.5.7.bb

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

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

@@ -1,6 +1,5 @@
 #%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

recipes-graphics/sddm/sddm_git.bb

@@ -74,7 +74,6 @@ RDEPENDS_${PN} += " \
     qtbase-plugins \
     qtdeclarative-plugins \
     qtdeclarative-qmlplugins \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-tally', '', d)} \
 "
 
 RRECOMMENDS_${PN += " \

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

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

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

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

recipes-kdab/kdcharts/kdcharts_git.bb

@@ -1,8 +1,8 @@
 SUMMARY = "A Qt tool for creating business and scientific charts"
 LICENSE = "GPLv2+ | KDAB-Commercial"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.txt;md5=ec5e1ab8584968655cce6fd650160b26 \
-    file://LICENSE.GPL.txt;md5=9bea831e8733013a5761386750f57271 \
+    file://LICENSE.txt;md5=d5e1956ab398a4ae39e2470a9abd4889 \
+    file://LICENSE.GPL.txt;md5=6af452a21ffa624c438c2cde4423a893 \
 "
 
 inherit cmake_qt5_extra
@@ -12,9 +12,14 @@ 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"
-SRCREV = "488ae47b2be78b07d196ead7614ab35866c63157"
+SRCREV = "95547e8a2f6c362db1dd071a2df00b0e75e05da0"
 S = "${WORKDIR}/git"
-PV = "2.6.50+git${SRCPV}"
+PV = "2.7.2"
 
 FILES_${PN}-dev += "${datadir}/mkspecs"

recipes-kdab/kdreports/kdreports_git.bb

@@ -1,11 +1,8 @@
 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 = "(GPLv2 & LGPLv2.1 ) | KDAB-Commercial | KDAB-Commercial-US"
+LICENSE = "(LGPL-2.1 | LGPL-3.0) & (GPL-2.0 | GPL-3.0 ) | KDAB-Commercial"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.GPL.txt;md5=fa70ea33eec42152e9d40dfb8310b70c \
-    file://LICENSE.LGPL.txt;md5=cce5e510cd6a04c95c4b4910d22559fe \
-    file://LICENSE.US.txt;md5=affebebb336655a41db530c5594f7dff \
-    file://LICENSE.txt;md5=129d14735385614fe7b1d5eee63674a5 \
+    file://LICENSE.txt;md5=d988404a6396edf41e7f8cbb2db3c185 \
 "
 
 inherit cmake_qt5_extra
@@ -16,6 +13,12 @@ DEPENDS += " \
 "
 
 SRC_URI = "git://github.com/KDAB/KDReports.git"
-SRCREV = "2a7defbef34399838739f87f42c7d36c198b1611"
+SRCREV = "47728293e7842140d36a7861cf4316f2c1cbd795"
 S = "${WORKDIR}/git"
-PV = "1.8.50+git${SRCPV}"
+PV = "1.9.0"
+
+do_install_append() {
+    # these have gone wild / qmake was always pain
+    rm -r ${D}/usr/mkspecs
+}
+

recipes-kdab/kdsoap/kdsoap.inc

@@ -1,5 +1,5 @@
 SUMMARY = "A Qt-based client-side and server-side SOAP component"
-LICENSE = "(GPLv2 & LGPLv2.1 & AGPL-3.0) | KDAB-Commercial"
+LICENSE = "(GPLv2 & LGPL-2.1 & AGPL-3.0) | KDAB-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL.txt;md5=63e3028b49eac8f84ab29661f079f159 \
     file://LICENSE.LGPL.txt;md5=ce198ec102c2f0b1d13f26967a934670 \

recipes-kde/apps/analitza/analitza.bb

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

recipes-kde/apps/ark/ark.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Ark is KDE's file archiver"
-LICENSE = "GPLv2 & LGPLv3"
+LICENSE = "GPL-2.0 & LGPL-3.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
     file://COPYING.icons;md5=78d89b1a70de936b57b7231c94b75ca6 \
@@ -28,8 +28,7 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "ec061ac07687b5a3541af293e3bc2aa7bedcfe0ef38ba6e57e2704068a726ffc"
-SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
+SRC_URI[sha256sum] = "6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \

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

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

@@ -0,0 +1,30 @@
+SUMMARY = "Artikulate is a pronunciation trainer"
+LICENSE = "GPL-2.0 & 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] = "c0f18f4c239881ec0cd8e7d5b4feeaa195224bcf558dc7ac65f4a92c4934d67a"
+
+FILES_${PN} += " \
+    ${datadir}/config.kcfg \
+    ${datadir}/knsrcfiles \
+    ${OE_QMAKE_PATH_PLUGINS} \
+"

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

@@ -1,5 +1,5 @@
 SUMMARY = "Widgets for Baloo"
-LICENSE = "LGPLv2"
+LICENSE = "LGPL-2.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING.README;md5=f5d7c5af660f94231a1d4e19501bce8f \
     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
@@ -19,7 +19,7 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "e1d14b8dba911ebc1cee76dbcd44fa200418ba959d86ce567093b5fc3b700a07"
+SRC_URI[sha256sum] = "b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc"
 
 FILES_${PN} += " \
     ${datadir}/kservices5 \

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

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 = "LGPLv2 & GFDL-1.2 & BSD"
+LICENSE = "LGPL-2.0 & GFDL-1.2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=a9cc0417b6424a8311f616fa527d0755 \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \

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

@@ -0,0 +1,53 @@
+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_3.2.0.bb

@@ -1,6 +1,6 @@
 SUMMARY = "Kexi is a visual database applications creator"
 HOMEPAGE = "https://www.calligra.org/kexi/"
-LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2 & BSD"
+LICENSE = "GPL-2.0 & LGPL-2.0 & GFDL-1.2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=8608b1f74c58ebcb11718f46e8619749 \
     file://COPYING.LIB;md5=7537f2f34ef162007ae9f34b9f256dcb \
@@ -41,6 +41,7 @@ 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 \
 "
 SRC_URI[sha256sum] = "7a813f9ea815a09c1e733d0e7dc879c64eee85f075389e87e6aab99cf0c1c1ff"
 

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 = "LGPLv2 & GFDL-1.2 & BSD"
+LICENSE = "LGPL-2.0 & GFDL-1.2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=3dcc9b0b0118292a0c5d1c18927ef176 \
     file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \

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 = "LGPLv2 & GFDL-1.2 & BSD"
+LICENSE = "LGPL-2.0 & GFDL-1.2 & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=1634220ce20ef95161c3b8401908638c \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \

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

@@ -1,5 +1,5 @@
 SUMMARY = "Plugins for Dolphin"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
 
 inherit kde-apps gettext
@@ -18,7 +18,7 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "7eabeb295ae2932958992bf7273afcb8164fbe90a2574064983fb2ecbc57eeaf"
+SRC_URI[sha256sum] = "9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \

recipes-kde/apps/dolphin/dolphin.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KDE File Manager"
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GPL-2.0 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -36,7 +36,7 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "bd13574610fc2108b9b04249cff70ca99958fe57a42fbf260ed16e5e377071bc"
+SRC_URI[sha256sum] = "e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264"
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
@@ -50,4 +50,5 @@ FILES_${PN} += " \
     ${datadir}/dbus-1 \
     ${libdir}/libkdeinit5_dolphin.so \
     ${OE_QMAKE_PATH_PLUGINS} \
+    ${systemd_user_unitdir} \
 "

recipes-kde/apps/dragon/dragon.bb

@@ -1,8 +1,10 @@
 SUMMARY = "Simple KDE multimedia player"
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GFDL-1.2 & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+    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 \
 "
 
 inherit kde-apps gettext mime-xdg
@@ -29,7 +31,7 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "cf7cce288fdeb12a0c86739741c6b901859e9b36d8fc9e7478c46f53cc74dd6c"
+SRC_URI[sha256sum] = "c69bbfb477d23e83944099ff58e79866c754b548aeb873e66dace6f19aef8070"
 
 CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
 

recipes-kde/apps/filelight/filelight.bb

@@ -1,8 +1,9 @@
 SUMMARY = "KDE graphical diskspace analyser"
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GFDL-1.2 & GPL-2.0-only & GPL-3.0-only"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=e098acff086ea3d1264fc89b51242144 \
-    file://COPYING-DOCS;md5=ad1419ecc56e060eccf8184a87c4285f \
+    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 \
 "
 
 inherit kde-apps gettext mime-xdg
@@ -21,7 +22,7 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "65f5f90d56d3449722647286324f8aae54754ec2a46c9aaa2e3bad92bae3433e"
+SRC_URI[sha256sum] = "e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \

recipes-kde/apps/granatier/granatier.bb

@@ -1,9 +1,10 @@
 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 = "GPLv2 & GFDL-1.2"
+LICENSE = "GFDL-1.2+ & GPL-2.0-or-later & LGPL-2.0-only"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+    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 \
 "
 
 inherit kde-apps gtk-icon-cache
@@ -24,7 +25,7 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "bb79b84b485bb194bf4edaa833e7705ec9fc0275301c70df78498b872de9ee57"
+SRC_URI[sha256sum] = "a8a3fcc075cbae3047dfbf4e2b46e5b46f1dd0a4d37295d6246085ca37b8e49f"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \

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

@@ -1,115 +0,0 @@
-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,5 +1,5 @@
 SUMMARY = "A fast and easy to use image viewer for KDE"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b"
 
 inherit kde-apps gettext mime-xdg
@@ -25,11 +25,12 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "580df49eb6852db4b1229f0326372dc7da7a08140d552da59a62ece08b03cc9d"
+SRC_URI[sha256sum] = "726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2"
 
-SRC_URI += "file://0001-Avoid-try_run.patch"
-
-CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
+EXTRA_OECMAKE += " \
+    -DJPEGLIB_RUN_RESULT=true \
+    -DJPEGLIB_RUN_RESULT__TRYRUN_OUTPUT=0 \
+"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \

recipes-kde/apps/kalgebra/kalgebra.bb

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

recipes-kde/apps/kalzium/kalzium.bb

@@ -1,12 +1,15 @@
 SUMMARY = "Periodic Table of Elements"
-LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2"
+LICENSE = "GPL-2.0 & GFDL-1.2 & LGPL-2.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
     file://COPYING.DOC;md5=d8855fca80aa0b428deafa405d0ea17a \
 "
 
-inherit kde-apps gettext pkgconfig gtk-icon-cache mime-xdg
+# avogadrolibs -> glew
+REQUIRED_DISTRO_FEATURES = "opengl"
+
+inherit kde-apps gettext pkgconfig gtk-icon-cache mime-xdg features_check
 
 DEPENDS += " \
     qtsvg \
@@ -34,10 +37,11 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "474f74cbb478d3f5f69b5785711ed969ac15d5e92aee5308c6118a9d12611016"
+SRC_URI[sha256sum] = "1549b5e08caa3ef7cab5375cfb8677dfc02a28a15136bef1edaf93c9fcadad15"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/kxmlgui5 \
+    ${datadir}/knsrcfiles \
     ${datadir}/libkdeedu \
 "

recipes-kde/apps/kapman/kapman.bb

@@ -2,10 +2,10 @@ SUMMARY = "Kapman is a clone of the well known game Pac-Man"
 DESCRIPTION = "Kapman is a clone of the well known game Pac-Man.\
 \
 You must run through the maze to eat all pills without being captured by a ghost. By eating an energizer, Kapman gets the ability to eat ghosts for a few seconds. When a stage is cleared of pills and energizer the player is taken to the next stage with slightly increased game speed."
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GFDL-1.2+ & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
 "
 
 inherit kde-apps gettext
@@ -26,7 +26,7 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "932bd697f2ca0e44af6be983dae3e13df9435642b91f0e1ebba7fd50291c2cbd"
+SRC_URI[sha256sum] = "3d2c38d8ca6a3addb3f5059fa35a5cf09c4802ee78a45dc4ddbd9ccfdf9927ac"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/kate/kate.bb

@@ -1,9 +1,14 @@
 SUMMARY = "An advanced editor component which is used in numerous KDE applications requiring a text editing component"
-LICENSE = "GPLv2 & LGPLv3 & GPLv3"
+LICENSE = "GPL-2.0+ & GPL-3.0 & LGPL-2.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-3.0 & MIT & The-Qt-Company-GPL-Exception-1.0"
 LIC_FILES_CHKSUM = " \
-    file://COPYING.LIB;md5=334069b3769dfd935f3e668e638a26ad \
-    file://COPYING-GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://COPYING-LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=06c4b774de9d70e39292959b3e6757be \
 "
 
 inherit kde-apps gettext mime-xdg
@@ -34,7 +39,7 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "718e8230edfa16f93f54380c4e214a0f25f8a398fe74ad23f12b7dcffae419d0"
+SRC_URI[sha256sum] = "b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb"
 
 FILES_SOLIBSDEV = ""
 

recipes-kde/apps/katomic/katomic.bb

@@ -1,9 +1,9 @@
 SUMMARY = "Katomic is a fun and educational game built around molecular geometry"
 DESCRIPTION = "KAtomic is a fun educational game built around molecular geometry. It employs simplistic two-dimensional looks at different chemical elements."
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GFDL-1.2+ & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
 "
 
 inherit kde-apps gtk-icon-cache
@@ -27,12 +27,12 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "bb94e81cb1122b57d2601f701bc51ff8fa27ac07a5de34e5c49928d50d46ed85"
+SRC_URI[sha256sum] = "c1477c5a8c98c0fd5642316964e366616527ea97ffa475ddde36ce21c811d9b6"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \
     ${datadir}/kconf_update \
-    ${datadir}/icons \
+    ${datadir}/knsrcfiles \
 "
 
 RDEPENDS_${PN} += "perl"

recipes-kde/apps/kblocks/kblocks.bb

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

recipes-kde/apps/kbounce/kbounce.bb

@@ -1,10 +1,9 @@
 SUMMARY = "KBounce is a single player arcade game with the elements of puzzle"
 DESCRIPTION = "KBounce is a single player arcade game with the elements of puzzle. It is played on a field, surrounded by wall, with two or more balls bouncing around within the walls. The object of the game is to build new walls to decrease the size of the active field."
-LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2"
+LICENSE = "GFDL-1.2+ & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
 "
 
 inherit kde-apps gettext
@@ -28,7 +27,7 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "371fbaf7c1faeacf1c74441ec1a58f1ced862f741e67123d2eb105f1d4f9b8e2"
+SRC_URI[sha256sum] = "3602903c8414a617461b308fb6c033a95facf14007d40b4105c601e4faba6046"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/kbreakout/kbreakout.bb

@@ -1,9 +1,9 @@
 SUMMARY = "KBreakout: Destroy as many bricks as possible without losing the ball"
 DESCRIPTION = "KBreakout is a Breakout-like game. Its objective is to destroy as many bricks as possible without losing the ball"
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GFDL-1.2+ & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
 "
 
 inherit kde-apps gettext
@@ -23,7 +23,7 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "b58b9dd26eff3960bc664076ddf4d0c81c7dfd5380be1d058b86de2d3f55d2ef"
+SRC_URI[sha256sum] = "519bba779a8b5211b9aa33398787dc5203ba9a6fd5330096c40a0ca8ea1e03a0"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/kcachegrind/kcachegrind.bb

@@ -1,9 +1,12 @@
 SUMMARY = "GUI to profilers such as Valgrind"
 HOMEPAGE = "https://kcachegrind.github.io/html/Home.html"
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GFDL-1.2 & GPL-2.0-only & LGPL-2.1-only & LGPL-3.0-only & Qt-LGPL-exception-1.1"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
-    file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
+    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
+    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \
+    file://LICENSES/Qt-LGPL-exception-1.1.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
 "
 
 inherit kde-apps gettext gtk-icon-cache mime-xdg
@@ -22,7 +25,7 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "e6b84a323a21ae7975ccc07154bcdc6eef1bc92818b800cfc5d546ada7f0387c"
+SRC_URI[sha256sum] = "25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926"
 
 FILES_${PN} += " \
     ${datadir}/kxmlgui5 \

recipes-kde/apps/kcalc/kcalc.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KDE's calculator application"
-LICENSE = "GPLv2 & LGPLv2.1"
+LICENSE = "GPL-2.0 & LGPL-2.1"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
     file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
@@ -23,7 +23,7 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "76b6c8e44c789090c0155f79878df8f27c96d2df4273443b0f05a42ec81902cf"
+SRC_URI[sha256sum] = "cf389a1c4db1c7da8b5b7ecec030e9c68df5d950c581d91f3931b7f6d2a7cacf"
 
 FILES_SOLIBSDEV = ""
 

recipes-kde/apps/kcharselect/kcharselect.bb

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

recipes-kde/apps/kcolorchooser/kcolorchooser.bb

@@ -16,7 +16,7 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "f314c31932704e7136b5fff89efe95e84e4215f3902089f9d838411f0fbc0c72"
+SRC_URI[sha256sum] = "12987b375ab326e5cf8e6cdd848a067d4d8c7df88e3efd0a67f5e8e5c112b191"
 
 FILES_${PN} += " \
     ${datadir}/icons \

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

@@ -1,6 +1,6 @@
 From d7cf023376cb834f9becb63f2648c63c5ec3fd12 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 17 Aug 2019 23:17:45 +0200
+Date: Sun, 25 Apr 2021 00:26:18 +0200
 Subject: [PATCH] CMakeLists.txt: make MLT_PREFIX configurable
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ee77dae..29c4efd 100644
+index 0144610..f6b2105 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -76,7 +76,7 @@ if(WIN32)
+@@ -71,7 +71,7 @@ if(WIN32)
      find_package(DrMinGW)
      set(MLT_PREFIX "..")
  else()
 -    set(MLT_PREFIX ${MLT_ROOT_DIR})
 +    set(MLT_PREFIX ${MLT_ROOT_DIR} CACHE STRING "mlt prefix")
-     find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
  endif()
  
+ if(KF5FileMetaData_FOUND)
 -- 
-2.21.0
+2.30.2
 

recipes-kde/apps/kdenlive/kdenlive.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Kdenlive is an intuitive and powerful multi-track video editor"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=38adfe5a9f2953129da1774430b28adf \
 "
@@ -14,7 +14,8 @@ DEPENDS += "\
     kauth-native \
     mlt \
     qtsvg \
-    qtwebkit \
+    qtwebengine \
+    qtnetworkauth \
     karchive \
     sonnet-native \
     kbookmarks \
@@ -35,10 +36,11 @@ DEPENDS += "\
     xapian-core \
     purpose \
     kdeclarative \
+    v4l-utils \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "535df45a148f0f94271e045ef0c93575fded83da7a2b727aeaf90e61e1d7c418"
+SRC_URI[sha256sum] = "754fae49644afbc8ecc0f5a4d579f09738f189a7626c99f862e5e4cdb6426df1"
 
 SRC_URI += " \
     file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \

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

@@ -1,5 +1,5 @@
 SUMMARY = "KDevelop-PG-Qt is a parser generator"
-LICENSE = "LGPLv2"
+LICENSE = "LGPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=15ce55ef03e0531acfa5ca508b9f85b2"
 
 inherit kde-base

recipes-kde/apps/kdevelop/kdevelop.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Cross-platform IDE for C, C++, Python, QML/JavaScript and PHP"
-LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2"
+LICENSE = "GPL-2.0 & GFDL-1.2 & LGPL-2.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
     file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
@@ -55,15 +55,18 @@ DEPENDS += " \
     threadweaver \
 "
 
-PV = "5.6.0"
+PV = "5.6.2"
 SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "38adc7d4c4cf2f0fb4191650001e979b5e1b5a3476db28737020baf2fb56f532"
+SRC_URI[sha256sum] = "0f86bc3fe53f761c1e3e3f7544577a0c41433be8bff310cf2e729f76f4363bf6"
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
 do_configure_append() {
     # although the name is missleading I still love cmake_extra_sanity.bbclass...
-    sed -i 's:${STAGING_DIR_NATIVE}::g' ${B}/plugins/clang/libclang_include_path.h
+    sed -i \
+        -e 's:${STAGING_DIR_NATIVE}::g' \
+        -e 's:${STAGING_DIR_HOST}::g' \
+        ${B}/plugins/clang/libclang_include_path.h
 }
 
 # Yeah nasty but...

recipes-kde/apps/kdevelop/libkomparediff2.bb

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

recipes-kde/apps/kdf/kdf.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KDiskFree displays the file devices' information"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
 "
@@ -22,7 +22,7 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "b33c043c18ae7b80b40e73c0a34759540724fa81815a6afa1e91e3ad44aec27e"
+SRC_URI[sha256sum] = "1c5701339e2be1161a22e1ded046a096e24f84c4e59e36bc8b82f8508324a7ca"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \

recipes-kde/apps/kdialog/kdialog.bb

@@ -0,0 +1,26 @@
+SUMMARY = "Tool to show nice dialog boxes from shell scripts"
+LICENSE = "GPL-2.0-or-later & GFDL-1.3"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
+    file://COPYING.DOC;md5=10b9de612d532fdeeb7fe8fcd1435cc6 \
+"
+
+inherit kde-apps gettext
+
+DEPENDS += " \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    ktextwidgets \
+    knotifications \
+    kguiaddons \
+    kiconthemes \
+    kwindowsystem \
+    kio \
+    kdbusaddons \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[sha256sum] = "c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6"
+
+FILES_${PN} += "${datadir}/dbus-1"

recipes-kde/apps/kdiamond/kdiamond.bb

@@ -1,12 +1,12 @@
 SUMMARY = "KDiamond is a single player puzzle game"
 DESCRIPTION = "KDiamond is a single player puzzle game. The object of the game is to build lines of three similar diamonds."
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GFDL-1.2+ & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
 "
 
-inherit kde-apps gettext
+inherit kde-apps gettext gtk-icon-cache
 
 DEPENDS += "\
     kauth-native \
@@ -26,9 +26,9 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "7bfc2b24d86c663bff719156ba20cd36017f1df647ee6769b5101aa6ab3e3e21"
+SRC_URI[sha256sum] = "0cdddfe7dbe4b1a25c0ef470b9cad469a7efe04a7b2c8076e24acf375d18267b"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
-    ${datadir}/icons \
+    ${datadir}/knsrcfiles \
 "

recipes-kde/apps/kfind/kfind.bb

@@ -1,8 +1,7 @@
 SUMMARY = "KDE file find utility"
-LICENSE = "GPLv2 & GFDL-1.3"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=10b9de612d532fdeeb7fe8fcd1435cc6 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
 "
 
 inherit kde-apps gettext gtk-icon-cache
@@ -21,7 +20,7 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "2381bbe7793a666fa9463aead1246dc4244409f68375f6d75e1423be15b42d74"
+SRC_URI[sha256sum] = "9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663"
 
 FILES_${PN} += " \
     ${datadir}/icons \

recipes-kde/apps/kgeography/kgeography.bb

@@ -0,0 +1,29 @@
+SUMMARY = "KGeography is a geography learning tool"
+LICENSE = "GPL-2.0 & GFDL-1.2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+    file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += " \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    kdoctools-native \
+    kcrash \
+    kdbusaddons  \
+    kwidgetsaddons  \
+    ki18n \
+    kconfigwidgets \
+    kxmlgui \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[sha256sum] = "f93ffaf4d5b340994b6025324fd972a2f211fbf9e0c83b6201dfb20db0fe539b"
+
+FILES_${PN} += " \
+    ${datadir}/config.kcfg \
+    ${datadir}/kxmlgui5 \
+"

recipes-kde/apps/kgoldrunner/kgoldrunner.bb

@@ -0,0 +1,31 @@
+SUMMARY = "A game of action and puzzle solving"
+LICENSE = "GFDL-1.2+ & GPL-2.0-or-later"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+"
+
+inherit kde-apps gtk-icon-cache
+
+DEPENDS += " \
+    kauth-native \
+    kconfig-native \
+    kcoreaddons-native \
+    kdoctools-native \
+    kconfigwidgets \
+    kcrash \
+    kdbusaddons  \
+    ki18n \
+    kio \
+    kwidgetsaddons \
+    kxmlgui \
+    libkdegames \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[sha256sum] = "1187b43789957fd2d6d826a589741231c60fb15fd2f8e29c29c107b86efc949b"
+
+FILES_${PN} += " \
+    ${datadir}/knsrcfiles \
+    ${datadir}/kxmlgui5 \
+"

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

@@ -1,46 +0,0 @@
-From bf1ddc0831cf20839a4738b6b534e4e50691fd60 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Wed, 4 Feb 2015 13:54:14 +0100
-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>
----
- application.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/application.cpp b/application.cpp
-index 373910a..1e8a247 100644
---- a/application.cpp
-+++ b/application.cpp
-@@ -66,10 +66,12 @@ void Application::activate(const QStringList& args, const QString &workingDirect
- 
-   if( !mMainWindow )
-   {
-+#ifndef QT_NO_SESSIONMANAGER
-     if (qApp->isSessionRestored()) {
-         // The kRestoreMainWindows call will do the rest.
-         return;
-     }
-+#endif
-     mMainWindow = new MainWindow;
-   }
- 
-@@ -112,10 +114,12 @@ extern "C" int Q_DECL_EXPORT kdemain( int argc, char **argv )
- 
-   QObject::connect( &service, &KDBusService::activateRequested, &app, &Application::activate );
- 
-+#ifndef QT_NO_SESSIONMANAGER
-   if ( app.isSessionRestored() )
-   {
-      kRestoreMainWindows<MainWindow>();
-   }
-+#endif
- 
-   return app.exec();
- }
--- 
-2.5.5
-

recipes-kde/apps/khelpcenter/khelpcenter.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Application to show KDE Applications' documentation"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=7108e5acd7ce861dee282297d7c2f38c \
 "
@@ -28,8 +28,7 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "36051a4352a05dd9b74b4e325c0e16e30d6bd8b48d6c3d13980b39a77aab4e2d"
-SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"
+SRC_URI[sha256sum] = "bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6"
 
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""

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

@@ -1,12 +1,15 @@
 SUMMARY = "Additional components to increase the functionality of KIO"
-LICENSE = "GPLv2 & MIT"
+LICENSE = "BSD-3-Clause & GPL-2.0 & GPL-2.0+ & GPL-3.0 & GPL-3.0+ & LGPL-2.0+ & MIT"
 
 LIC_FILES_CHKSUM = " \
-    file://fish/COPYING;md5=30716a35f5010d5fdbe911cc67144b31 \
-    file://info/LICENSE;md5=45306e1027c3de81e7855c7cc3110a0c \
-    file://mtp/LICENCE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://mtp/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://man/LICENSE;md5=d975629b732b61cb58f9595c6baa9379 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/CC0-1.0.txt;md5=6fd064768b8d61c31ddd0540570fbd33 \
+    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://LICENSES/GPL-3.0-or-later.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
 "
 
 inherit kde-apps gettext mime
@@ -51,8 +54,9 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "9d4b9cb5a4002ad2127c5c5c4d25ff95d53de32ea08348e8dc40fe83d950076e"
-SRC_URI += "file://0001-Do-not-find-use-taglib-config.patch"
+SRC_URI[sha256sum] = "4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d"
+
+EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
 do_configure_append() {
     sed -i 's:${S}/smb/kdsoap-ws-discovery-client/src/kdwsdl2cpp:${STAGING_BINDIR_NATIVE}/kdwsdl2cpp:g' ${B}/build.ninja

recipes-kde/apps/kio-extras/kio-extras/0001-Do-not-find-use-taglib-config.patch

@@ -1,37 +0,0 @@
-From b857bad2806372c65cd72d4515e1173834475496 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 17 Nov 2019 19:14:00 +0100
-Subject: [PATCH] Do not find/use taglib-config
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| -- Could NOT find Taglib: Found unsuitable version "ERROR: /usr/bin/taglib-config should not be used, use an alternative such as pkg-config
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- cmake/FindTaglib.cmake | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/cmake/FindTaglib.cmake b/cmake/FindTaglib.cmake
-index d09fb6f..25eb8f6 100644
---- a/cmake/FindTaglib.cmake
-+++ b/cmake/FindTaglib.cmake
-@@ -35,12 +35,6 @@ if(NOT TAGLIB_MIN_VERSION)
-   set(TAGLIB_MIN_VERSION "1.4")
- endif(NOT TAGLIB_MIN_VERSION)
- 
--if(NOT WIN32)
--    find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
--       ${BIN_INSTALL_DIR}
--    )
--endif(NOT WIN32)
--
- #reset vars
- set(TAGLIB_LIBRARIES)
- set(TAGLIB_CFLAGS)
--- 
-2.21.0
-

recipes-kde/apps/kmag/kmag.bb

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

recipes-kde/apps/kmahjongg/kmahjongg.bb

@@ -1,8 +1,8 @@
 SUMMARY = "KBlocks - Falling Blocks Game"
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GFDL-1.2+ & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
 "
 
 inherit kde-apps gtk-icon-cache
@@ -23,7 +23,7 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "98e34794560a062bd22950acc583b77a6f8d1d28aceb863604f5a6c98c6cc80d"
+SRC_URI[sha256sum] = "414d0d3531a2479fb32400397defe1d3e821061590db607c4f8eecd8766d83c2"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \

recipes-kde/apps/kmines/kmines.bb

@@ -1,8 +1,8 @@
 SUMMARY = "KMines is the classic Minesweeper game"
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GFDL-1.2+ & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+    file://LICENSES/GFDL-1.2-or-later.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
 "
 
 inherit kde-apps gtk-icon-cache
@@ -23,7 +23,7 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "6b07a812497a665505b6b1e3a84ac0818f1a5e5757146cdbceec55e94bb41753"
+SRC_URI[sha256sum] = "f9703b5158633c63662b9c7892c049dd57a4fdf66c00f9378745a99ac71ab1a1"
 
 FILES_${PN} += " \
     ${datadir}/icons \

recipes-kde/apps/kmix/kmix.bb

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

recipes-kde/apps/kmplot/kmplot.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Mathematical Function Plotter"
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GPL-2.0 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
     file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
@@ -23,7 +23,7 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "c3bc34a2d1bf4620745009b49b6541a16ac64eb3d1e6cf1ba936b14aa5d02e2b"
+SRC_URI[sha256sum] = "05b7bdc184e7c10b1b293812827bec44a3d773a3eefffd91eb782f08b45abf96"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \

recipes-kde/apps/kolourpaint/kolourpaint.bb

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

recipes-kde/apps/konsole/konsole.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KDE's terminal emulator"
-LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2"
+LICENSE = "GPL-2.0 & GFDL-1.2 & LGPL-2.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
     file://COPYING.DOC;md5=d8855fca80aa0b428deafa405d0ea17a \
@@ -40,7 +40,7 @@ DEPENDS += " \
 
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "af08ac7666f1ba7c407205f32aaaf015329621247502e80d8df4abe103148951"
+SRC_URI[sha256sum] = "bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14"
 
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""

recipes-kde/apps/kpat/kpat.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KPat offers a selection of solitaire card games"
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GPL-2.0 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=dcd3ae65d2d4ac9f347f0614d3fd4794 \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -24,10 +24,11 @@ DEPENDS += " \
     kxmlgui \
     libkdegames \
     freecell-solver \
+    black-hole-solver \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "e4aaed4e876212a926a05d252dab9d01f240d829e383c6072e168a4f78e6d446"
+SRC_URI[sha256sum] = "a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea"
 
 FILES_SOLIBSDEV = ""
 
@@ -35,6 +36,7 @@ FILES_${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/mime \
+    ${datadir}/knsrcfiles \
     ${datadir}/kxmlgui5 \
     ${libdir}/libkcardgame.so \
 "

recipes-kde/apps/kpmcore/kpmcore.bb

@@ -0,0 +1,34 @@
+SUMMARY = "Library for managing partitions"
+LICENSE = "CC0-1.0 & CC-BY-SA-4.0 & GPL-3.0+ & MIT"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/CC0-1.0.txt;md5=6fd064768b8d61c31ddd0540570fbd33 \
+    file://LICENSES/CC-BY-4.0.txt;md5=28bacf04b75cbad10cb7871e0b063188 \
+    file://LICENSES/GPL-3.0-or-later.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
+"
+
+inherit kde-apps pkgconfig gettext
+
+DEPENDS += " \
+    kconfig-native \
+    kauth-native \
+    kcoreaddons-native \
+    qca \
+    ki18n \
+    kiconthemes \
+    kio \
+    kservice \
+    \
+    parted \
+    libatasmart \
+"
+
+PV = "${KDE_APP_VERSION}"
+SRC_URI[sha256sum] = "cb9dd1002d489d6f2dcfdb44aa9581b0203d6386e874a34322de832014e58a03"
+
+FILES_${PN} += " \
+    ${datadir}/k*5 \
+    ${datadir}/dbus-1 \
+    ${datadir}/polkit-1 \
+    ${OE_QMAKE_PATH_PLUGINS} \
+"

recipes-kde/apps/kreversi/kreversi.bb

@@ -1,9 +1,10 @@
 SUMMARY = "KReversi is is a simple strategy game played against the computer"
 DESCRIPTION = "KReversi is is a simple one player strategy game played against the computer"
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GFDL-1.2+ & GPL-2.0-or-later & LGPL-2.0-only"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+    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 \
 "
 
 inherit kde-apps gettext
@@ -30,7 +31,7 @@ DEPENDS += "\
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "22824dca9c8f07145a6fd9b7386867d8a8efff0fda6752f377230381a1cc71c2"
+SRC_URI[sha256sum] = "24099d1a38f8ebd8d8df05463a5a763f18a20ef2183460dac1536060d42f798a"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \

recipes-kde/apps/krita/krita.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Krita is a free digital painting application"
-LICENSE = "GPLv3 & BSD"
+LICENSE = "GPL-3.0 & BSD-3-Clause"
 HOMEPAGE = "https://krita.org/"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
@@ -36,10 +36,13 @@ DEPENDS += " \
     kcrash \
 "
 
-PV = "4.4.0"
+PV = "4.4.5"
 PVEXT = ""
-SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/${BPN}-${PV}${PVEXT}.tar.xz"
-SRC_URI[sha256sum] = "837ff7c94553f2ff2a8876994810b4e14b9296adc9726c0116a6fa8828eeb579"
+SRC_URI = " \
+    ${KDE_MIRROR}/stable/${BPN}/${PV}/${BPN}-${PV}${PVEXT}.tar.xz \
+    file://0001-Make-C++14-default.patch \
+"
+SRC_URI[sha256sum] = "84c53686056d8f7485658004ca454eb275e35221307362e65daaac934a5c3b78"
 S = "${WORKDIR}/${BPN}-${PV}${PVEXT}"
 
 FILES_${PN} += " \

recipes-kde/apps/krita/krita/0001-Make-C++14-default.patch

@@ -0,0 +1,29 @@
+From 1e25a2415bf4c51888188f5df88e7c614d70c927 Mon Sep 17 00:00:00 2001
+From: Boudewijn Rempt <boud@valdyas.org>
+Date: Tue, 15 Dec 2020 13:59:31 +0100
+Subject: [PATCH] Make C++14 default in master
+
+As discussed during the meeting.
+
+Upstream-Status: Accepted [https://invent.kde.org/graphics/krita/-/commit/1e25a2415bf4c51888188f5df88e7c614d70c927]
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 48d445b030..fe9bcb4765 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
+ set(MIN_QT_VERSION 5.9.0)
+ set(MIN_FRAMEWORKS_VERSION 5.44.0)
+ 
+-set( CMAKE_CXX_STANDARD 11 )
++set( CMAKE_CXX_STANDARD 14 )
+ set( CMAKE_CXX_STANDARD_REQUIRED ON )
+ 
+ 
+-- 
+GitLab
+
+

recipes-kde/apps/ksudoku/ksudoku.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KSudoku is a logic-based symbol placement puzzle"
-LICENSE = "GPLv2 & GFDL-1.2"
+LICENSE = "GPL-2.0 & GFDL-1.2"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
@@ -29,7 +29,7 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "6fed393f734eb27d6c36ad7516bf29ff648d319f08d9f8bdc17a8030842d8e33"
+SRC_URI[sha256sum] = "88fe060ea9d9e6f14822c7231a026b34fe7daecf4fd8794cf239b5c1c097c88a"
 
 FILES_${PN} += " \
     ${datadir}/icons \

recipes-kde/apps/ksystemlog/ksystemlog.bb

@@ -1,5 +1,5 @@
 SUMMARY = "KDE SystemLog Application"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b \
 "
@@ -22,6 +22,6 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "63c6a520b63f148de2e3996250a2fef22e1a3ce18e744a699ae21de96a2c4e53"
+SRC_URI[sha256sum] = "70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587"
 
 FILES_${PN} += "${datadir}/kxmlgui5"

recipes-kde/apps/ktorrent/ktorrent.bb

@@ -1,5 +1,5 @@
 SUMMARY = "A powerful BitTorrent client"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
 
 inherit kde-apps gtk-icon-cache mime-xdg
@@ -15,9 +15,8 @@ DEPENDS += " \
     kparts \
 "
 
-PV = "5.2.0"
-SRC_URI = "https://download.kde.org/stable/ktorrent/${PV}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "d1031d745c1ace02d11b59c426610aee779d208e3d1ae81f8559c265173732ff"
+PV = "${KDE_APP_VERSION}"
+SRC_URI[sha256sum] = "c990e4c87dc2d61ae0ffcd6a0c93c5b84287e7a565eeba6abb96c282a649114a"
 
 FILES_${PN} += " \
     ${datadir}/knotifications5 \

recipes-kde/apps/ktorrent/libktorrent.bb

@@ -1,5 +1,5 @@
 SUMMARY = "A BitTorrent protocol implementation"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
 
 inherit kde-apps gettext
@@ -18,9 +18,6 @@ DEPENDS += " \
     solid \
 "
 
-PV = "2.2.0"
-SRC_URI = " \
-    https://download.kde.org/stable/ktorrent/5.2.0/libktorrent-${PV}.tar.xz \
-    file://0001-Find-libgmp-with-pkgconfig.patch \
-"
-SRC_URI[sha256sum] = "77c1ddfb0a56c40227e0624c078836a8c22bf5a2fb4a3c0cbd53ee6b174c126e"
+PV = "${KDE_APP_VERSION}"
+SRC_URI[sha256sum] = "5a4fd6715e14150fc21697f251d923a2e3407ef89ffdad3bc94135454087c3d9"
+SRC_URI += "file://0001-Find-libgmp-with-pkgconfig.patch"

recipes-kde/apps/ktorrent/libktorrent/0001-Find-libgmp-with-pkgconfig.patch

@@ -18,32 +18,19 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fad43c5..3871396 100644
+index 98f8158..858a437 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -55,7 +55,8 @@ find_package(KF5 "${KF5_MIN_VERSION}" REQUIRED COMPONENTS
+@@ -66,7 +66,8 @@ find_package(KF5 "${KF5_MIN_VERSION}" REQUIRED COMPONENTS
  )
  
- find_package(Boost "${Boost_MIN_VERSION}" REQUIRED)
+ find_package(Boost "${Boost_MIN_VERSION}" MODULE REQUIRED)
 -find_package(LibGMP "${LibGMP_MIN_VERSION}" REQUIRED)
 +find_package(PkgConfig REQUIRED)
 +pkg_check_modules(LibGMP REQUIRED gmp>=${LibGMP_MIN_VERSION})
  find_package(LibGcrypt "${LibGcrypt_MIN_VERSION}" REQUIRED)
  find_package(Qca-qt5 CONFIG REQUIRED)
  
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d347e07..0645e95 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -242,7 +242,7 @@ PUBLIC
-     KF5::I18n
-     Qt5::Xml
-     LibGcrypt::LibGcrypt
--    LibGMP::LibGMP
-+    gmp
- )
- 
- if(WIN32)
 diff --git a/KF5TorrentConfig.cmake.in b/KF5TorrentConfig.cmake.in
 index d40dc0b..b593917 100644
 --- a/KF5TorrentConfig.cmake.in
@@ -56,6 +43,19 @@ index d40dc0b..b593917 100644
  find_dependency(LibGcrypt "@LibGcrypt_MIN_VERSION@")
  
  include("${CMAKE_CURRENT_LIST_DIR}/KF5TorrentTargets.cmake")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index cecf522..1a5596b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -237,7 +237,7 @@ PUBLIC
+     KF5::I18n
+     Qt5::Xml
+     LibGcrypt::LibGcrypt
+-    LibGMP::LibGMP
++    gmp
+ )
+ 
+ if(WIN32)
 -- 
-2.21.1
+2.26.2
 

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

@@ -1,43 +0,0 @@
-From 6ec28a23f2850f6e06e3637b8af2bb956f5a448b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 11 Oct 2015 18:21:50 +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>
-
----
- src/manager/kwalletmanager.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/manager/kwalletmanager.cpp b/src/manager/kwalletmanager.cpp
-index 2672c7c..c505d23 100644
---- a/src/manager/kwalletmanager.cpp
-+++ b/src/manager/kwalletmanager.cpp
-@@ -100,12 +100,14 @@ void KWalletManager::configUI() {
-                 break;
-             }
-         }
-+#ifndef QT_NO_SESSIONMANAGER
-         if (!isOpen && qApp->isSessionRestored()) {
-             delete _tray;
-             _tray = nullptr;
-             QTimer::singleShot(0, qApp, SLOT(quit()));
-             return;
-         }
-+#endif
-     } else {
-         _tray = nullptr;
-     }
--- 
-2.1.0
-

recipes-kde/apps/kwalletmanager/kwalletmanager.bb

@@ -1,8 +1,11 @@
 SUMMARY = "KDE Wallet Manager is a tool to manage the passwords on your KDE system"
-LICENSE = "GPLv2 & LGPLv2.1"
+LICENSE = "GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-only & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031294a26b98c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
 "
 
 inherit kde-apps gtk-icon-cache mime-xdg
@@ -24,8 +27,7 @@ DEPENDS += " \
 "
 
 PV = "${KDE_APP_VERSION}"
-SRC_URI[sha256sum] = "7950e250c5351a9b8e3b36165fa2003baa044bb2d3553a32360000a322bddad8"
-SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
+SRC_URI[sha256sum] = "3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \