Hello community, here is the log from the commit of package sddm for openSUSE:Factory checked in at 2015-09-11 09:01:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-29 20:03:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes 2015-09-11 09:01:45.000000000 +0200 @@ -1,0 +2,32 @@ +Sun Sep 6 08:12:52 UTC 2015 - [email protected] + +- Update to 0.12.0: + * SDDM now depends on Qt >= 5.3 + * Display setup script is now killed if it hasn't finished + within 30 seconds. + * The Maldives non-free background has been replaced by a + CC-BY-SA alternative + * Wayland sessions support + * New sddm.conf option XephyrPath + (defaults to /usr/bin/Xephyr) + * new sddm.conf option ServerArguments + (defaults to -nolisten tcp) + * new sddm.config option DisplayStopCommand (executes Xstop) + * Assorted improvements to the default theme + * Honor TryExec in Xsession desktop files + * Fix session startup on zsh + * Allow setting a custom DBUS_CONFIG_FILENAME at compile time + * Allow SYSTEMD_SYSTEM_UNIT_DIR to be overridden at compile time + * Allow QT_IMPORTS_DIR to be overridden at compile time + * No longer hardcode min/max UIDs, allow setting + UID_MIN and UID_MAX at compile time + * Assorted FreeBSD fixes + * Fix build warnings with Qt 5.5. + * Enable QT_NO_CAST_FROM_ASCII + * Added Arabic + * Added Hungarian + * Various i18n updates and improvements + * Full right-to-left languages support. +- Drop sddm-wait-for-display-script.patch, merged upstream + +------------------------------------------------------------------- Old: ---- sddm-wait-for-display-script.patch v0.11.0.tar.gz New: ---- sddm-0.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm.spec ++++++ --- /var/tmp/diff_new_pack.XCxTVd/_old 2015-09-11 09:01:46.000000000 +0200 +++ /var/tmp/diff_new_pack.XCxTVd/_new 2015-09-11 09:01:46.000000000 +0200 @@ -20,13 +20,13 @@ %{!?_unitdir: %global _unitdir /usr/lib/systemd/system} Name: sddm -Version: 0.11.0 +Version: 0.12.0 Release: 0 Summary: Lightweight QML-based display manager License: GPL-2.0+ Group: System/GUI/KDE Url: https://github.com/sddm/sddm -Source: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz +Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz Source1: %{name}.conf Source2: X11-displaymanagers-%{name} # PATCH-FIX-OPENSUSE proper_pam.diff -- Use openSUSE pam config @@ -42,8 +42,6 @@ # 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 @@ -103,7 +101,6 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %build %cmake \ ++++++ create_pid_file.patch ++++++ --- /var/tmp/diff_new_pack.XCxTVd/_old 2015-09-11 09:01:46.000000000 +0200 +++ /var/tmp/diff_new_pack.XCxTVd/_new 2015-09-11 09:01:46.000000000 +0200 @@ -1,17 +1,17 @@ diff --git a/src/common/Constants.h.in b/src/common/Constants.h.in -index f7e31e4..654331d 100644 +index b32b2e07687aecc545d18f47c28bb650a308e758..2be895e730da5affb2cd4f6052918a8ab4b2672a 100644 --- a/src/common/Constants.h.in +++ b/src/common/Constants.h.in -@@ -33,6 +33,7 @@ +@@ -34,6 +34,7 @@ #define CONFIG_FILE "@CONFIG_FILE@" #define LOG_FILE "@LOG_FILE@" +#define PID_FILE "@PID_FILE@" #define MINIMUM_VT @MINIMUM_VT@ - #define HALT_COMMAND "@HALT_COMMAND@" + #define UID_MIN @UID_MIN@ diff --git a/src/daemon/DaemonApp.cpp b/src/daemon/DaemonApp.cpp -index 662c0f4..c525efd 100644 +index ae8ae3b..ea2d0be 100644 --- a/src/daemon/DaemonApp.cpp +++ b/src/daemon/DaemonApp.cpp @@ -31,6 +31,7 @@ @@ -22,20 +22,19 @@ #include <iostream> -@@ -46,6 +47,16 @@ namespace SDDM { +@@ -46,6 +47,15 @@ namespace SDDM { // log message qDebug() << "Initializing..."; + // Write PID File -+ if ( ! QString(PID_FILE).isEmpty() ) { -+ QFile pidFile(PID_FILE); ++ if ( ! QString(QStringLiteral(PID_FILE)).isEmpty() ) { ++ QFile pidFile(QStringLiteral(PID_FILE)); + QString pid = QString::number(QCoreApplication::applicationPid()); + if ( pidFile.open(QIODevice::WriteOnly | QIODevice::Text) ) { + pidFile.write(pid.toLatin1().data(), qstrlen(pid.toLatin1().data())); + pidFile.close(); + } + } -+ // set testing parameter - m_testing = (arguments().indexOf("--test-mode") != -1); + m_testing = (arguments().indexOf(QStringLiteral("--test-mode")) != -1); ++++++ proper_pam.diff ++++++ --- /var/tmp/diff_new_pack.XCxTVd/_old 2015-09-11 09:01:46.000000000 +0200 +++ /var/tmp/diff_new_pack.XCxTVd/_new 2015-09-11 09:01:46.000000000 +0200 @@ -1,5 +1,5 @@ diff --git a/services/sddm-autologin.pam b/services/sddm-autologin.pam -index 2432b51..4fb3873 100755 +index 2432b51c94c23443012cb39d0da122af5c205f60..4fb3873a3fd347fc617843e7c2815411de39b120 100755 --- a/services/sddm-autologin.pam +++ b/services/sddm-autologin.pam @@ -1,11 +1,6 @@ @@ -20,7 +20,7 @@ +session required pam_loginuid.so +session include common-session diff --git a/services/sddm-greeter.pam b/services/sddm-greeter.pam -index 44e209e..a9c2a89 100644 +index 44e209e9046109b3ad9312a23bc210d5cd3486ef..a9c2a89d04a1dc403a08b2e5b69e926107c4abb5 100644 --- a/services/sddm-greeter.pam +++ b/services/sddm-greeter.pam @@ -1,17 +1,7 @@ @@ -48,7 +48,7 @@ +session required pam_loginuid.so +session include common-session diff --git a/services/sddm.pam b/services/sddm.pam -index bda5d80..d21651d 100755 +index bda5d8002668fb6d1c532924f020e81ff122ad2a..d21651db403edee92f3ca146e97374c43f440c6c 100755 --- a/services/sddm.pam +++ b/services/sddm.pam @@ -1,6 +1,6 @@ ++++++ sddm-relaxed-auth.diff ++++++ --- /var/tmp/diff_new_pack.XCxTVd/_old 2015-09-11 09:01:46.000000000 +0200 +++ /var/tmp/diff_new_pack.XCxTVd/_new 2015-09-11 09:01:46.000000000 +0200 @@ -1,17 +1,17 @@ diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp -index f10ad82..f7dddbb 100644 +index b40f718..e060928 100644 --- a/src/daemon/XorgDisplayServer.cpp +++ b/src/daemon/XorgDisplayServer.cpp -@@ -229,6 +229,7 @@ namespace SDDM { +@@ -277,6 +277,7 @@ namespace SDDM { // set process environment QProcessEnvironment env; - env.insert("DISPLAY", m_display); -+ env.insert("XAUTHLOCALHOSTNAME", daemonApp->hostName()); - env.insert("HOME", "/"); - env.insert("PATH", mainConfig.Users.DefaultPath.get()); - env.insert("XAUTHORITY", m_authPath); + env.insert(QStringLiteral("DISPLAY"), m_display); ++ env.insert(QStringLiteral("XAUTHLOCALHOSTNAME"), daemonApp->hostName()); + env.insert(QStringLiteral("HOME"), QStringLiteral("/")); + env.insert(QStringLiteral("PATH"), mainConfig.Users.DefaultPath.get()); + env.insert(QStringLiteral("XAUTHORITY"), m_authPath); diff --git a/src/helper/Backend.cpp b/src/helper/Backend.cpp -index fc933f9..6cb6fa9 100644 +index 12facb9..a90cfb3 100644 --- a/src/helper/Backend.cpp +++ b/src/helper/Backend.cpp @@ -26,6 +26,7 @@ @@ -23,10 +23,10 @@ #include <pwd.h> @@ -64,6 +65,7 @@ namespace SDDM { - env.insert("LOGNAME", pw->pw_name); - if (env.contains("DISPLAY") && !env.contains("XAUTHORITY")) - env.insert("XAUTHORITY", QString("%1/.Xauthority").arg(pw->pw_dir)); -+ env.insert("XAUTHLOCALHOSTNAME", QHostInfo::localHostName()); + env.insert(QStringLiteral("LOGNAME"), QString::fromLocal8Bit(pw->pw_name)); + if (env.contains(QStringLiteral("DISPLAY")) && !env.contains(QStringLiteral("XAUTHORITY"))) + env.insert(QStringLiteral("XAUTHORITY"), QStringLiteral("%1/.Xauthority").arg(QString::fromLocal8Bit(pw->pw_dir))); ++ env.insert(QStringLiteral("XAUTHLOCALHOSTNAME"), QHostInfo::localHostName()); // TODO: I'm fairly sure this shouldn't be done for PAM sessions, investigate! m_app->session()->setProcessEnvironment(env); } ++++++ sddm-service-handle-plymouth.patch ++++++ --- /var/tmp/diff_new_pack.XCxTVd/_old 2015-09-11 09:01:46.000000000 +0200 +++ /var/tmp/diff_new_pack.XCxTVd/_new 2015-09-11 09:01:46.000000000 +0200 @@ -1,5 +1,5 @@ diff --git a/services/sddm.service.in b/services/sddm.service.in -index b0cea02..fffa5c2 100644 +index b0cea02128f949ceeadae2ecca61faf668ea8728..fffa5c2dfc37acafe1cab2528e3323fca665e699 100644 --- a/services/sddm.service.in +++ b/services/sddm.service.in @@ -6,6 +6,7 @@ After=systemd-user-sessions.service [email protected] plymouth-quit.service ++++++ sysconfig-support.patch ++++++ --- /var/tmp/diff_new_pack.XCxTVd/_old 2015-09-11 09:01:46.000000000 +0200 +++ /var/tmp/diff_new_pack.XCxTVd/_new 2015-09-11 09:01:46.000000000 +0200 @@ -1,20 +1,20 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4d6e0a9d1bdb0742bf5ae23a522091f3f1d14dda..a2af8bb6559826252b8abe63217eca1cacb5d842 100644 +index 43796954d519fda27133dbaed6db50141b8ecf04..3071ea79ebaf9e5c20851f2c2512339f0f06f25c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -130,6 +130,7 @@ set(RUNTIME_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/sddm" - set(SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsession" CACHE PATH "Script to execute when starting the desktop session") +@@ -151,6 +151,7 @@ set(SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsession" + set(WAYLAND_SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/wayland-session" CACHE PATH "Script to execute when starting the Wayland desktop session") set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file") +set(DYSPLAY_MANAGER_CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sysconfig/displaymanager" CACHE PATH "Path of the sysconfig/displaymanager config file") set(LOG_FILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log" CACHE PATH "Path of the sddm log file") + set(DBUS_CONFIG_FILENAME "org.freedesktop.DisplayManager.conf" CACHE STRING "Name of the sddm config file") set(COMPONENTS_TRANSLATION_DIR "${DATA_INSTALL_DIR}/translations" CACHE PATH "Components translations directory") - diff --git a/src/common/Configuration.h b/src/common/Configuration.h -index 72aa6f4..95447c1 100644 +index c9af1b72cd0faee069264719ff26cc7d7cba204c..076e856e5ca592bf1b3dcd48a6511fc2395159a8 100644 --- a/src/common/Configuration.h +++ b/src/common/Configuration.h -@@ -75,14 +75,14 @@ namespace SDDM { +@@ -83,7 +83,7 @@ namespace SDDM { ); Section(Autologin, Entry(User, QString, QString(), _S("Autologin user")); @@ -23,20 +23,12 @@ Entry(Relogin, bool, false, _S("Autologin again on session exit")); ); ); - - Config(StateConfig, []()->QString{auto tmp = getpwnam("sddm"); return tmp ? tmp->pw_dir : STATE_DIR;}().append("/state.conf"), - Section(Last, -- Entry(Session, QString, QString(), _S("Name of the session file of the last session selected. This session will be preselected when the login screen shows up.")); -+ Entry(Session, QString, _S("plasma5.desktop"), _S("Name of the session file of the last session selected. This session will be preselected when the login screen shows up.")); - Entry(User, QString, QString(), _S("Name of the last logged-in user. This username will be preselected/shown when the login screen shows up")); - ); - ); diff --git a/src/common/Constants.h.in b/src/common/Constants.h.in -index 654331d6f22ce2c90ca510678cd137308c1000bd..9ca4b8c05f1d4b9a3533dbce83df0e12979a4809 100644 +index 2be895e730da5affb2cd4f6052918a8ab4b2672a..bb935503c08e8ad617f83f9df73d5c7703737686 100644 --- a/src/common/Constants.h.in +++ b/src/common/Constants.h.in -@@ -32,6 +32,7 @@ - #define SESSION_COMMAND "@SESSION_COMMAND@" +@@ -33,6 +33,7 @@ + #define WAYLAND_SESSION_COMMAND "@WAYLAND_SESSION_COMMAND@" #define CONFIG_FILE "@CONFIG_FILE@" +#define DYSPLAY_MANAGER_CONFIG_FILE "@DYSPLAY_MANAGER_CONFIG_FILE@" @@ -44,23 +36,23 @@ #define PID_FILE "@PID_FILE@" #define MINIMUM_VT @MINIMUM_VT@ diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp -index 87d0cc37c0f97b801ba1b7ffd1dd534e9fe92875..2f15cc62976d661977905f9964a1a558facc126c 100644 +index 2b76c6dbe64b3d35a0e6b1849cf10c250ead5f53..0d62358dc515826d18d9eb825a83149cf268ee9d 100644 --- a/src/daemon/Display.cpp +++ b/src/daemon/Display.cpp @@ -35,6 +35,7 @@ - #include <QDir> + #include <QDebug> #include <QFile> #include <QTimer> +#include <QSettings> #include <pwd.h> #include <unistd.h> -@@ -113,8 +114,19 @@ namespace SDDM { +@@ -114,8 +115,19 @@ namespace SDDM { // log message qDebug() << "Display server started."; -+ QSettings sysconfSettings(DYSPLAY_MANAGER_CONFIG_FILE, QSettings::NativeFormat); -+ QString sysconfigUser = sysconfSettings.value("DISPLAYMANAGER_AUTOLOGIN", "").toString(); ++ QSettings sysconfSettings(QStringLiteral(DYSPLAY_MANAGER_CONFIG_FILE), QSettings::NativeFormat); ++ QString sysconfigUser = sysconfSettings.value(QStringLiteral("DISPLAYMANAGER_AUTOLOGIN"), QStringLiteral("")).toString(); + + if (!sysconfigUser.isEmpty()) { + mainConfig.Autologin.User.set(sysconfigUser);
