sddm: update to latest sources

remove our hack/test patches for [1] as it was fixed mainline

[1] https://github.com/sddm/sddm/issues/390

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-06-23 13:35:49 +02:00
parent 1b5c557997
commit e546985bdc
3 changed files with 1 additions and 126 deletions

View File

@@ -1,91 +0,0 @@
From 1a0bbae083aa2b73615ee006708f8bd5433ec8a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 29 Apr 2015 11:01:47 +0200
Subject: [PATCH] XorgDisplayServer.cpp: create pipe earlier to extract display
number
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
addCookie() requires m_display properly set otherwise we get
| sddm[309]: /usr/bin/xauth: (stdin):1: bad "remove" command line
| sddm[309]: /usr/bin/xauth: (stdin):2: bad "add" command line
Motivated by [1]
https://github.com/sddm/sddm/issues/390
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/daemon/XorgDisplayServer.cpp | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
index 407dd3e..4b3ca01 100644
--- a/src/daemon/XorgDisplayServer.cpp
+++ b/src/daemon/XorgDisplayServer.cpp
@@ -116,6 +116,26 @@ namespace SDDM {
if (m_started)
return false;
+ //create pipe for communicating with X server
+ //0 == read from X, 1== write to from X
+ int pipeFds[2];
+ if (pipe(pipeFds) != 0) {
+ qCritical("Could not create pipe to start X server");
+ }
+
+ QFile readPipe;
+
+ if (!readPipe.open(pipeFds[0], QIODevice::ReadOnly)) {
+ qCritical("Failed to open pipe to start X Server ");
+
+ close(pipeFds[0]);
+ return false;
+ }
+ QByteArray displayNumber = readPipe.readLine();
+ displayNumber.prepend(QByteArray(":"));
+ displayNumber.remove(displayNumber.size() -1, 1); //trim trailing whitespace
+ m_display = displayNumber;
+
// generate auth file
addCookie(m_authPath);
changeOwner(m_authPath);
@@ -150,13 +170,6 @@ namespace SDDM {
env.insert("XCURSOR_THEME", mainConfig.Theme.CursorTheme.get());
process->setProcessEnvironment(env);
- //create pipe for communicating with X server
- //0 == read from X, 1== write to from X
- int pipeFds[2];
- if (pipe(pipeFds) != 0) {
- qCritical("Could not create pipe to start X server");
- }
-
// start display server
QStringList args;
args << "-auth" << m_authPath
@@ -180,19 +193,6 @@ namespace SDDM {
return false;
}
- QFile readPipe;
-
- if (!readPipe.open(pipeFds[0], QIODevice::ReadOnly)) {
- qCritical("Failed to open pipe to start X Server ");
-
- close(pipeFds[0]);
- return false;
- }
- QByteArray displayNumber = readPipe.readLine();
- displayNumber.prepend(QByteArray(":"));
- displayNumber.remove(displayNumber.size() -1, 1); //trim trailing whitespace
- m_display= displayNumber;
-
// close our pipe
close(pipeFds[0]);
--
1.9.3

View File

@@ -1,33 +0,0 @@
From 870f32a2cdd47078c463b0f35c9324a1cfca451c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 8 May 2015 11:26:32 +0200
Subject: [PATCH] temporary hack
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
see [1] for further details
https://github.com/sddm/sddm/issues/390
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/daemon/DisplayServer.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/daemon/DisplayServer.h b/src/daemon/DisplayServer.h
index 97cd772..fa65987 100644
--- a/src/daemon/DisplayServer.h
+++ b/src/daemon/DisplayServer.h
@@ -53,7 +53,7 @@ namespace SDDM {
protected:
bool m_started { false };
- QString m_display { "" };
+ QString m_display { ":0" };
private:
Display *m_displayPtr { nullptr };
--
1.9.3

View File

@@ -17,11 +17,10 @@ DEPENDS += "libpam"
SRC_URI = " \
git://github.com/sddm/${BPN}.git;protocol=git;branch=master \
file://0001-fix-qml-install-dir.patch \
file://0002-temporary-hack.patch \
file://sddm.pam \
file://sddm.conf \
"
SRCREV = "07866210800743a5930f6e77a4ad6cb85b8e51b7"
SRCREV = "19780278b30ac5f50e78f4acd3f01f79b759b9cc"
PV = "0.11.0+git${SRCPV}"
S = "${WORKDIR}/git"