sddm: upgrade 0.18.1 -> 0.19.0 wip

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

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

@@ -1,10 +1,7 @@
 From 68dbaac218216d001706c1a72d2db4819e3ca8cc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 25 Nov 2018 00:29:17 +0100
+Date: Thu, 5 Nov 2020 21:14:42 +0100
 Subject: [PATCH] Workaround missing sessions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
 
 The current approach is wrong in many ways:
 
@@ -18,40 +15,41 @@ Upstream-Sttaus: Pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- src/greeter/SessionModel.cpp | 19 ++++---------------
- 1 file changed, 4 insertions(+), 15 deletions(-)
+ src/greeter/SessionModel.cpp | 21 +++++----------------
+ 1 file changed, 5 insertions(+), 16 deletions(-)
 
 diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp
-index 2a3c091..927bce2 100644
+index 1953c76..824a1a0 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;
 -            QFileInfo fi(si->tryExec());
 -            if (fi.isAbsolute()) {
 -                if (!fi.exists() || !fi.isExecutable())
-+            if(!si->tryExec().isEmpty()) {
-+                QFileInfo fi(si->tryExec());
-+                if (fi.isAbsolute()) {
-+                    if (!fi.exists() || !fi.isExecutable())
-                     execAllowed = false;
+-                    execAllowed = false;
 -            } else {
 -                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()) {
 -                        execAllowed = true;
 -                        break;
 -                    }
++            if(!si->tryExec().isEmpty()) {
++                QFileInfo fi(si->tryExec());
++                if (fi.isAbsolute()) {
++                    if (!fi.exists() || !fi.isExecutable())
++                        execAllowed = false;
                  }
              }
              // add to sessions list
 -- 
-2.14.5
+2.26.2
 

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

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

recipes-graphics/sddm/sddm_git.bb

@@ -18,14 +18,13 @@ PACKAGECONFIG[pam] = "-DENABLE_PAM=ON, -DENABLE_PAM=OFF, libpam"
 # This is usually done during build but does not work for our cross environment
 SRC_URI = " \
     git://github.com/sddm/${BPN}.git;protocol=git;branch=master \
-    file://0001-fix-qml-install-dir.patch \
-    file://0002-Workaround-missing-sessions.patch \
+    file://0001-Workaround-missing-sessions.patch \
     file://sddm.pam \
     file://sddm-autologin.pam \
     file://sddm.conf \
 "
-SRCREV = "de41b8ea555f2e42ba47d83530ad654ca708cf85"
-PV = "0.18.1"
+SRCREV = "c5e7043291a6d237e33c2f666d9937c93d668594"
+PV = "0.19.0"
 
 S = "${WORKDIR}/git"