Update sddm to 0.19~git-hash for Qt 5.15.3 compatibility
This commit is contained in:
@@ -24,8 +24,7 @@ DEPENDS = " \
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/sddm/${BPN};nobranch=1;protocol=https \
|
||||
file://0001-fix-qml-install-dir.patch \
|
||||
file://0002-Workaround-missing-sessions.patch \
|
||||
file://0001-Workaround-missing-sessions.patch \
|
||||
file://sddm.conf \
|
||||
file://sddm.pam \
|
||||
file://sddm-autologin.pam \
|
||||
|
||||
@@ -13,7 +13,7 @@ The current approach is wrong in many ways:
|
||||
tries to find executables based on PATH environment. Problem at least for my
|
||||
environment: There is no PATH variable set by systemd. So for session files
|
||||
without path: Do not perform further checks / just trust for now.
|
||||
|
||||
|
||||
Upstream-Sttaus: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
@@ -22,11 +22,11 @@ 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;
|
||||
- QFileInfo fi(si->tryExec());
|
||||
@@ -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()) {
|
||||
@@ -52,6 +52,6 @@ index 2a3c091..927bce2 100644
|
||||
}
|
||||
}
|
||||
// add to sessions list
|
||||
--
|
||||
2.14.5
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
# SPDX-FileCopyrightText: none
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
|
||||
require ${PN}.inc
|
||||
SRCREV = "v${PV}"
|
||||
7
recipes-support/sddm/sddm_0.19.0.bb
Normal file
7
recipes-support/sddm/sddm_0.19.0.bb
Normal file
@@ -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}"
|
||||
Reference in New Issue
Block a user