Hello community, here is the log from the commit of package sddm for openSUSE:Factory checked in at 2017-07-12 19:32:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sddm (Old) and /work/SRC/openSUSE:Factory/.sddm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sddm" Wed Jul 12 19:32:52 2017 rev:22 rq:509273 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sddm/sddm.changes 2017-06-01 16:23:24.689998477 +0200 +++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes 2017-07-12 19:32:54.158636751 +0200 @@ -1,0 +2,13 @@ +Mon Jul 10 19:30:11 UTC 2017 - [email protected] + +- Replace patch with version merged upstream, to avoid potentially + killing the X server: + * 0001-Also-theme-the-default-cursor-for-the-root-window.patch + +------------------------------------------------------------------- +Fri Jul 7 12:03:41 UTC 2017 - [email protected] + +- Add patch to keep old entries in XAUTHORITY file (boo#1043221): + * 0001-Do-not-truncate-XAUTHORITY-file-on-login.patch + +------------------------------------------------------------------- New: ---- 0001-Do-not-truncate-XAUTHORITY-file-on-login.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm.spec ++++++ --- /var/tmp/diff_new_pack.2Vs7qH/_old 2017-07-12 19:32:55.934386209 +0200 +++ /var/tmp/diff_new_pack.2Vs7qH/_new 2017-07-12 19:32:55.938385645 +0200 @@ -62,6 +62,8 @@ Patch17: 0002-Ignore-session-desktop-files-with-the-Hidden-propert.patch # PATCH-FIX-OPENSUSE Patch18: 0003-Leave-duplicate-symlinks-out-of-the-SessionModel.patch +# PATCH-FIX-UPSTREAM +Patch19: 0001-Do-not-truncate-XAUTHORITY-file-on-login.patch BuildRequires: cmake BuildRequires: extra-cmake-modules >= 1.4.0 BuildRequires: fdupes @@ -143,6 +145,7 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 %build %cmake \ ++++++ 0001-Also-theme-the-default-cursor-for-the-root-window.patch ++++++ --- /var/tmp/diff_new_pack.2Vs7qH/_old 2017-07-12 19:32:55.966381695 +0200 +++ /var/tmp/diff_new_pack.2Vs7qH/_new 2017-07-12 19:32:55.966381695 +0200 @@ -1,4 +1,4 @@ -From 1b55ad727127f624c31fa656386b13c208455e42 Mon Sep 17 00:00:00 2001 +From ddbf5d75cb9504279a190b641a3d74edf43d9e76 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Fri, 5 May 2017 23:17:26 +0200 Subject: [PATCH] Also theme the default cursor for the root window @@ -9,7 +9,7 @@ 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp -index d06d89a..267ea9d 100644 +index d06d89a1..76568566 100644 --- a/src/daemon/XorgDisplayServer.cpp +++ b/src/daemon/XorgDisplayServer.cpp @@ -249,7 +249,7 @@ namespace SDDM { @@ -21,16 +21,13 @@ qDebug() << "Running display stop script " << displayStopCommand; displayStopScript->start(displayStopCommand); -@@ -285,11 +285,21 @@ namespace SDDM { +@@ -285,8 +285,18 @@ namespace SDDM { env.insert(QStringLiteral("PATH"), mainConfig.Users.DefaultPath.get()); env.insert(QStringLiteral("XAUTHORITY"), m_authPath); env.insert(QStringLiteral("SHELL"), QStringLiteral("/bin/sh")); + env.insert(QStringLiteral("XCURSOR_THEME"), mainConfig.Theme.CursorTheme.get()); displayScript->setProcessEnvironment(env); - // delete displayScript on finish - connect(displayScript, SIGNAL(finished(int,QProcess::ExitStatus)), displayScript, SLOT(deleteLater())); - + qDebug() << "Setting default cursor"; + displayScript->start(QStringLiteral("xsetroot -cursor_name left_ptr")); + @@ -40,9 +37,6 @@ + displayScript->kill(); + } + - // start display setup script - qDebug() << "Running display setup script " << displayCommand; - displayScript->start(displayCommand); --- -2.12.0 - + // delete displayScript on finish + connect(displayScript, SIGNAL(finished(int,QProcess::ExitStatus)), displayScript, SLOT(deleteLater())); + ++++++ 0001-Do-not-truncate-XAUTHORITY-file-on-login.patch ++++++ >From 9aa15075efbe713ffd40bec4b5ee90957c0a5605 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Fri, 7 Jul 2017 14:01:17 +0200 Subject: [PATCH] Do not truncate XAUTHORITY file on login xauth gets used to edit the file, so do not truncate the file with QIODevice::WriteOnly before. --- src/daemon/XorgDisplayServer.cpp | 2 +- src/helper/UserSession.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: sddm-0.14.0/src/daemon/XorgDisplayServer.cpp =================================================================== --- sddm-0.14.0.orig/src/daemon/XorgDisplayServer.cpp +++ sddm-0.14.0/src/daemon/XorgDisplayServer.cpp @@ -92,7 +92,7 @@ namespace SDDM { // Touch file QFile file_handler(file); - file_handler.open(QIODevice::WriteOnly); + file_handler.open(QIODevice::Append); file_handler.close(); QString cmd = QStringLiteral("%1 -f %2 -q").arg(mainConfig.XDisplay.XauthPath.get()).arg(file); Index: sddm-0.14.0/src/helper/UserSession.cpp =================================================================== --- sddm-0.14.0.orig/src/helper/UserSession.cpp +++ sddm-0.14.0/src/helper/UserSession.cpp @@ -177,7 +177,7 @@ namespace SDDM { QDir().mkpath(finfo.absolutePath()); QFile file_handler(file); - file_handler.open(QIODevice::WriteOnly); + file_handler.open(QIODevice::Append); file_handler.close(); QString cmd = QStringLiteral("%1 -f %2 -q").arg(mainConfig.XDisplay.XauthPath.get()).arg(file);
