Hello community, here is the log from the commit of package sddm for openSUSE:Factory checked in at 2015-08-29 20:03:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sddm (Old) and /work/SRC/openSUSE:Factory/.sddm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sddm" Changes: -------- --- /work/SRC/openSUSE:Factory/sddm/sddm.changes 2015-06-02 10:00:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes 2015-08-29 20:03:51.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 26 07:45:11 UTC 2015 - [email protected] + +- Added patch from upstream sddm-wait-for-display-script.patch: + avoid a black screen (boo#942815) + +------------------------------------------------------------------- New: ---- sddm-wait-for-display-script.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm.spec ++++++ --- /var/tmp/diff_new_pack.XL9uhb/_old 2015-08-29 20:03:52.000000000 +0200 +++ /var/tmp/diff_new_pack.XL9uhb/_new 2015-08-29 20:03:52.000000000 +0200 @@ -42,6 +42,8 @@ # PATCH-FIX-OPENSUSE sddm-service-handle-plymouth.patch -- sddm has some rudimentary support for plymouth handling, which only works with plymouth-quit.service # (the servce is not enabled on openSUSE). For users of sddm.service, we need to issue plymouth quit command by hand in this case Patch4: sddm-service-handle-plymouth.patch +# PATCH-FIX-OPENSUSE sddm-wait-for-display-script.patch -- From upstream: wait for the display script finishing, avoid a black screen (boo#942815) +Patch5: sddm-wait-for-display-script.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -101,6 +103,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %cmake \ ++++++ sddm-wait-for-display-script.patch ++++++ >From 7ed4ab11656c4b75f278b34883f4e28598b2b13a Mon Sep 17 00:00:00 2001 From: Robert Xu <[email protected]> Date: Wed, 14 Jan 2015 20:00:36 -0600 Subject: [PATCH 1/2] wait for the display script to complete Signed-off-by: Pier Luigi Fiorini <[email protected]> --- src/daemon/XorgDisplayServer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp index 2b431ca..b0da10f 100644 --- a/src/daemon/XorgDisplayServer.cpp +++ b/src/daemon/XorgDisplayServer.cpp @@ -290,6 +290,7 @@ namespace SDDM { // start display setup script qDebug() << "Running display setup script " << displayCommand; displayScript->start(displayCommand); + displayScript->waitForFinished(-1); } void XorgDisplayServer::changeOwner(const QString &fileName) { -- 2.5.0 >From f083c1e9c7f675bd46589e522e1747e9ee77d2a3 Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini <[email protected]> Date: Wed, 24 Jun 2015 22:13:33 +0200 Subject: [PATCH 2/2] Wait for display setup script no more than 30s Kill the script if it takes long. --- src/daemon/XorgDisplayServer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp index b0da10f..15180e0 100644 --- a/src/daemon/XorgDisplayServer.cpp +++ b/src/daemon/XorgDisplayServer.cpp @@ -290,7 +290,10 @@ namespace SDDM { // start display setup script qDebug() << "Running display setup script " << displayCommand; displayScript->start(displayCommand); - displayScript->waitForFinished(-1); + + // wait for finished + if (!displayScript->waitForFinished(30000)) + displayScript->kill(); } void XorgDisplayServer::changeOwner(const QString &fileName) { -- 2.5.0
