Update sddm to 0.19~git-hash for Qt 5.15.3 compatibility

(cherry picked from commit c595777603)

classes/cmake_plasma.bbclass

@@ -8,10 +8,12 @@ inherit ki18n
 inherit kcoreaddons
 inherit kconfig
 inherit kauth
+inherit kcmutils
 inherit kdoctools
 
 EXTRA_OECMAKE += " \
     -DBUILD_TESTING=OFF \
+    -DOE_KF5_PATH_HOST_ROOT=${STAGING_DIR_HOST} \
 "
 
 DEPENDS += " \

recipes-application/network/kdeconnect-kde.inc

@@ -19,7 +19,6 @@ DEPENDS += " \
     kiconthemes \
     knotifications \
     kio \
-    kcmutils \
     kirigami \
     kpeople \
     kpeoplevcard \
@@ -32,6 +31,7 @@ inherit kcoreaddons
 inherit kconfig
 inherit kauth
 inherit mime-xdg
+inherit kcmutils
 
 EXTRA_OECMAKE += "-DEXPERIMENTALAPP_ENABLED=ON"
 EXTRA_OECMAKE += "-DSMSAPP_ENABLED=OFF"

recipes-plasma/breeze.inc

@@ -12,7 +12,6 @@ PR = "r0"
 
 DEPENDS = " \
     fftw \
-    kcmutils \
     kconfigwidgets \
     kcoreaddons \
     kdecoration \
@@ -23,6 +22,7 @@ DEPENDS = " \
 "
 
 inherit cmake_plasma
+inherit kcmutils
 
 FILES:${PN} += " \
     ${libdir}/qml/QtQuick/Controls/Styles \

recipes-plasma/discover.inc

@@ -12,7 +12,6 @@ PR = "r0"
 DEPENDS = " \
     attica \
     karchive \
-    kcmutils \
     kconfig \
     kcoreaddons \
     kcrash \
@@ -30,6 +29,7 @@ DEPENDS = " \
 
 inherit cmake_plasma
 inherit mime-xdg
+inherit kcmutils
 
 FILES:${PN} += " \
     ${libdir}/qml/org/kde/discovernotifier \

recipes-plasma/kde-cli-tools.inc

@@ -37,6 +37,7 @@ DEPENDS = " \
 
 inherit cmake_plasma
 inherit kdoctools
+inherit kcmutils
 inherit mime-xdg
 
 FILES_SOLIBSDEV = ""

recipes-plasma/kscreen.inc

@@ -15,7 +15,6 @@ DEPENDS = " \
     kdbusaddons \
     plasma-framework \
     kconfigwidgets \
-    kcmutils \
     kglobalaccel \
     kwidgetsaddons \
     kxmlgui \
@@ -23,6 +22,7 @@ DEPENDS = " \
 "
 
 inherit cmake_plasma
+inherit kcmutils
 
 FILES:${PN} += " \
     ${datadir}/kded_kscreen \

recipes-plasma/kscreenlocker.inc

@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PR = "r0"
 
 DEPENDS = " \
-    kcmutils \
     kcrash \
     kdeclarative \
     kglobalaccel \
@@ -33,6 +32,7 @@ SRC_URI:append = " \
 "
 
 inherit cmake_plasma
+inherit kcmutils
 
 do_install:append() {
     install -d ${D}${sysconfdir}/pam.d

recipes-plasma/kwin.inc

@@ -49,6 +49,7 @@ SRC_URI:append = " \
 "
 
 inherit cmake_plasma kdoctools
+inherit kcmutils
 
 do_install:append() {
     # dirty workaround for aurora crash on Wayland

recipes-plasma/plasma-phone-components.inc

@@ -29,6 +29,7 @@ DEPENDS = " \
 "
 
 inherit cmake_plasma
+inherit kcmutils
 
 FILES:${PN} += " \
     ${libdir}/qml/QtQuick/VirtualKeyboard/Styles/Plasma/* \

recipes-plasma/plasma-workspace.inc

@@ -15,7 +15,6 @@ DEPENDS = " \
     breeze \
     kactivities \
     kactivitiesstats \
-    kcmutils \
     kcoreaddons \
     kcrash \
     kdbusaddons \
@@ -54,8 +53,8 @@ DEPENDS = " \
 "
 
 inherit cmake_plasma
-inherit kdoctools
 inherit mime-xdg
+inherit kcmutils
 
 EXTRA_OECMAKE += " -DBUILD_xembed-sni-proxy=OFF"
 

recipes-plasma/systemsettings.inc

@@ -29,7 +29,6 @@ DEPENDS += " \
 "
 
 inherit cmake_plasma
-inherit kdoctools
 
 FILES:${PN} += " \
     ${datadir}/kpackage/genericqml/org.kde.systemsettings.sidebar \

recipes-playground/kirigami-addons_0.2.bb

@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${BPN}.inc
-SRCREV = "v${PV}"
+SRCREV = "72e9a61e4b55f2558b8bfaeca8b533cf6275a4f5"

recipes-playground/kjournald.inc

@@ -21,6 +21,7 @@ SRC_URI = "git://invent.kde.org/libraries/${BPN};nobranch=1;protocol=https"
 S = "${WORKDIR}/git"
 
 inherit cmake_kdeapp
+inherit pkgconfig
 
 PACKAGES += " \
     ${PN}-browser \

recipes-playground/kweathercore_0.5.bb

@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${BPN}.inc
-SRCREV = "v${PV}"
+SRCREV = "b6ef51c830b85a080e09ca205bae667890601df1"

recipes-support/libpinyin.inc

@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SUMMARY = "Library to deal with pinyin."
 
 SRC_URI = " \
-    git://github.com/libpinyin/libpinyin.git;nobranch=1 \
-    https://deac-ams.dl.sourceforge.net/project/libpinyin/models/model19.text.tar.gz;sha256sum=56422a4ee5966c2c809dd065692590ee8def934e52edbbe249b8488daaa1f50b;subdir=git;unpack=0 \
+    git://github.com/libpinyin/libpinyin.git;nobranch=1;protocol=https \
+    https://downloads.sourceforge.net/project/libpinyin/models/model19.text.tar.gz;sha256sum=56422a4ee5966c2c809dd065692590ee8def934e52edbbe249b8488daaa1f50b;subdir=git;unpack=0 \
     file://0000-Utilize-bitbake-download-and-use-tools-from-PATH.patch \
     file://0001-Optionally-install-utilities.patch \
     file://0002-Provide-option-to-use-pre-downloaded-archive.patch \

recipes-support/sddm/sddm.inc

@@ -23,9 +23,8 @@ DEPENDS = " \
 "
 
 SRC_URI = " \
-    git://github.com/sddm/${BPN};nobranch=1 \
-    file://0001-fix-qml-install-dir.patch \
-    file://0002-Workaround-missing-sessions.patch \
+    git://github.com/sddm/${BPN};nobranch=1;protocol=https \
+    file://0001-Workaround-missing-sessions.patch \
     file://sddm.conf \
     file://sddm.pam \
     file://sddm-autologin.pam \

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

@@ -22,10 +22,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 4 insertions(+), 15 deletions(-)
 
 diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp
-index 2a3c091..927bce2 100644
+index 1953c76..549cd4d 100644
 --- a/src/greeter/SessionModel.cpp
 +++ b/src/greeter/SessionModel.cpp
-@@ -124,22 +124,11 @@ namespace SDDM {
+@@ -125,22 +125,11 @@ namespace SDDM {
 
              Session *si = new Session(type, session);
              bool execAllowed = true;
@@ -41,8 +41,8 @@ index 2a3c091..927bce2 100644
 -                execAllowed = false;
 -                QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
 -                QString envPath = env.value(QStringLiteral("PATH"));
--                QStringList pathList = envPath.split(QLatin1Char(':'));
--                foreach(const QString &path, pathList) {
+-                const QStringList pathList = envPath.split(QLatin1Char(':'));
+-                for(const QString &path : pathList) {
 -                    QDir pathDir(path);
 -                    fi.setFile(pathDir, si->tryExec());
 -                    if (fi.exists() && fi.isExecutable()) {
@@ -53,5 +53,5 @@ index 2a3c091..927bce2 100644
              }
              // add to sessions list
 --
-2.14.5
+2.34.1
 

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

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

recipes-support/sddm/sddm_0.18.1.bb

@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRCREV = "v${PV}"

recipes-support/sddm/sddm_0.19.0.bb

@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+# use unreleased tag for fixing build with Qt 5.15.3
+SRCREV = "c257a40ba95f56b5f3830b923b1c56aa055cf8ea"
+PV = "0.19.0+git${SRCPV}"