Hello community, here is the log from the commit of package sddm for openSUSE:Factory checked in at 2017-04-17 10:21:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sddm (Old) and /work/SRC/openSUSE:Factory/.sddm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sddm" Mon Apr 17 10:21:15 2017 rev:19 rq:484360 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sddm/sddm.changes 2017-03-21 22:45:38.219966923 +0100 +++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes 2017-04-17 10:21:17.552859442 +0200 @@ -1,0 +2,14 @@ +Sat Apr 1 19:24:40 UTC 2017 - [email protected] + +- Use default tty (tty7) in systemd unit as specified in sddm.conf: + * 0001-Systemd-service-unit-Use-tty7-by-default.patch +- Add patch from upstream to allow setting QT_IM_MODULE in sddm.conf: + * 0001-Also-set-QT_IM_MODULE-in-non-testing-mode.patch + +------------------------------------------------------------------- +Fri Mar 31 17:28:46 UTC 2017 - [email protected] + +- Revert calling plymouth quit with --retain-splash. It is possible + that this prevents logging in on tty1. + +------------------------------------------------------------------- New: ---- 0001-Also-set-QT_IM_MODULE-in-non-testing-mode.patch 0001-Systemd-service-unit-Use-tty7-by-default.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm.spec ++++++ --- /var/tmp/diff_new_pack.8949HM/_old 2017-04-17 10:21:18.492726335 +0200 +++ /var/tmp/diff_new_pack.8949HM/_new 2017-04-17 10:21:18.492726335 +0200 @@ -48,12 +48,15 @@ Patch6: boo949903.patch # PATCH-FIX-UPSTREAM 0001-Make-the-default-cursor-themed.patch -- Make the default cursor themed Patch7: 0001-Make-the-default-cursor-themed.patch +# PATCH-FIX-OPENSUSE 0001-Systemd-service-unit-Use-tty7-by-default.patch -- Use tty7 by default in the systemd service unit +Patch8: 0001-Systemd-service-unit-Use-tty7-by-default.patch # Bugfixes from upstream develop branch Patch10: 0001-Fix-display-of-user-avatars.-684.patch Patch11: 0002-Add-a-config-option-to-enable-high-DPI-scaling-701.patch Patch12: 0003-elarun-Update-date-and-time.patch Patch13: 0004-Support-Non-Latin-characters-in-theme-settings-708.patch Patch14: 0005-Cleanup-dangling-pointer-in-SocketServer-725.patch +Patch15: 0001-Also-set-QT_IM_MODULE-in-non-testing-mode.patch BuildRequires: cmake BuildRequires: extra-cmake-modules >= 1.4.0 BuildRequires: fdupes @@ -121,11 +124,13 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %build %cmake \ ++++++ 0001-Also-set-QT_IM_MODULE-in-non-testing-mode.patch ++++++ >From 10352e08aae4a683fa804010e47bdac459892406 Mon Sep 17 00:00:00 2001 From: David Edmundson <[email protected]> Date: Sun, 26 Mar 2017 16:05:02 +0100 Subject: [PATCH] Also set QT_IM_MODULE in non testing mode QT_IM_MODULE is set from a config value, however it currently is only set in testing mode --- src/daemon/Greeter.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp index ff367ca..0240085 100644 --- a/src/daemon/Greeter.cpp +++ b/src/daemon/Greeter.cpp @@ -180,6 +180,7 @@ namespace SDDM { env.insert(QStringLiteral("XDG_VTNR"), QString::number(m_display->terminalId())); env.insert(QStringLiteral("XDG_SESSION_CLASS"), QStringLiteral("greeter")); env.insert(QStringLiteral("XDG_SESSION_TYPE"), m_display->sessionType()); + env.insert(QStringLiteral("QT_IM_MODULE"), mainConfig.InputMethod.get()); //some themes may use KDE components and that will automatically load KDE's crash handler which we don't want //counterintuitively setting this env disables that handler -- 2.12.0 ++++++ 0001-Systemd-service-unit-Use-tty7-by-default.patch ++++++ >From b7cd2c4a505eaadecf1ba5cd895928f23b23e9f2 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Sat, 1 Apr 2017 21:21:36 +0200 Subject: [PATCH] Systemd service unit: Use tty7 by default - We use tty7 by default in sddm.conf --- services/sddm.service.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/sddm.service.in b/services/sddm.service.in index df03d92..0ef4b5d 100644 --- a/services/sddm.service.in +++ b/services/sddm.service.in @@ -1,8 +1,8 @@ [Unit] Description=Simple Desktop Display Manager Documentation=man:sddm(1) man:sddm.conf(5) [email protected] -After=systemd-user-sessions.service [email protected] plymouth-quit.service [email protected] +After=systemd-user-sessions.service [email protected] plymouth-quit.service [Service] ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm -- 2.12.0 ++++++ X11-displaymanagers-sddm ++++++ --- /var/tmp/diff_new_pack.8949HM/_old 2017-04-17 10:21:18.556717273 +0200 +++ /var/tmp/diff_new_pack.8949HM/_new 2017-04-17 10:21:18.560716706 +0200 @@ -1,6 +1,6 @@ sddm_start_proc () { if [ -x /usr/bin/plymouth ]; then - /usr/bin/plymouth quit --retain-splash + /usr/bin/plymouth quit fi return 0 }
