Hello community, here is the log from the commit of package sddm for openSUSE:Factory checked in at 2016-10-04 15:46:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-06-12 18:51:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes 2016-10-04 15:45:57.000000000 +0200 @@ -1,0 +2,23 @@ +Sat Sep 24 17:02:03 UTC 2016 - [email protected] + +- Add 0001-Fall-back-to-regular-login-when-autologin-fails.patch + to fix crash when autologin session not found (boo#1000917) + +------------------------------------------------------------------- +Thu Sep 22 18:17:01 UTC 2016 - [email protected] + +- Add 0001-Make-the-default-cursor-themed.patch to fix the default + cursor appearance + +------------------------------------------------------------------- +Wed Sep 21 17:48:23 UTC 2016 - [email protected] + +- Provide sddm-lang + +------------------------------------------------------------------- +Thu Sep 15 11:57:36 UTC 2016 - [email protected] + +- Use the new theme name, breeze-openSUSE, in sddm-branding-openSUSE +- Require the new sddm-theme-openSUSE package + +------------------------------------------------------------------- New: ---- 0001-Fall-back-to-regular-login-when-autologin-fails.patch 0001-Make-the-default-cursor-themed.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm.spec ++++++ --- /var/tmp/diff_new_pack.JlWUiX/_old 2016-10-04 15:45:58.000000000 +0200 +++ /var/tmp/diff_new_pack.JlWUiX/_new 2016-10-04 15:45:58.000000000 +0200 @@ -57,6 +57,10 @@ Patch9: specify-default-config-entries.patch # PATCH-FIX-UPSTREAM add-threshold-to-disable-avatars.patch -- Add a config option/property to define a thershold above which avatars are disabled automatically Patch10: add-threshold-to-disable-avatars.patch +# PATCH-FIX-UPSTREAM 0001-Make-the-default-cursor-themed.patch -- Make the default cursor themed +Patch11: 0001-Make-the-default-cursor-themed.patch +# PATCH-FIX-UPSTREAM 0001-Fall-back-to-regular-login-when-autologin-fails.patch -- Fall back to regular login when autologin fails +Patch12: 0001-Fall-back-to-regular-login-when-autologin-fails.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -76,7 +80,8 @@ BuildRequires: pkgconfig(xcb-xkb) Requires: sddm-branding = %{version} # Merged the -lang package back into the main package -Obsoletes: %{name}-lang <= %{version} +Provides: %{name}-lang = %{version} +Obsoletes: %{name}-lang < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -88,7 +93,7 @@ Summary: Lightweight QML-based display manager. openSUSE branding Group: System/GUI/KDE PreReq: sddm -Requires: plasma5-workspace-branding +Requires: sddm-theme-openSUSE Supplements: packageand(plasma5-workspace:branding-openSUSE) Provides: sddm-branding = %{version} Conflicts: otherproviders(sddm-branding) @@ -125,6 +130,8 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 cp %{SOURCE3} data/faces/default.face.icon.png cp %{SOURCE4} data/faces/root.face.icon.png @@ -162,12 +169,14 @@ %post branding-openSUSE if [ $1 -ge 1 -a -f /etc/sddm.conf ]; then - sed -i -e 's/^Current=maui$/Current=breeze/g' /etc/sddm.conf + # Upgrade from previous theme name + sed -i -e 's/^Current=breeze$/Current=breeze-openSUSE/g' /etc/sddm.conf + sed -i -e 's/^Current=maui$/Current=breeze-openSUSE/g' /etc/sddm.conf fi %postun branding-openSUSE if [ $1 -eq 0 -a -f /etc/sddm.conf ]; then - sed -i -e 's/^Current=breeze$/Current=maui/g' /etc/sddm.conf + sed -i -e 's/^Current=breeze-openSUSE$/Current=maui/g' /etc/sddm.conf fi %files ++++++ 0001-Fall-back-to-regular-login-when-autologin-fails.patch ++++++ >From 5f43cbf23a9ec9e3547dfe0f59928d0ac5324db9 Mon Sep 17 00:00:00 2001 From: Jerome Leclanche <[email protected]> Date: Thu, 5 Nov 2015 21:28:22 +0200 Subject: [PATCH] Fall back to regular login when autologin fails Fixes #316 --- src/daemon/Display.cpp | 42 +++++++++++++++++++++++++----------------- src/daemon/Display.h | 1 + 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp index 8de59e5..6bc9965 100644 --- a/src/daemon/Display.cpp +++ b/src/daemon/Display.cpp @@ -103,6 +103,29 @@ namespace SDDM { m_displayServer->start(); } + bool Display::attemptAutologin() { + Session::Type sessionType = Session::X11Session; + + // determine session type + const QString &autologinSession = mainConfig.Autologin.Session.get(); + if (findSessionEntry(mainConfig.XDisplay.SessionDir.get(), autologinSession)) { + sessionType = Session::X11Session; + } else if (findSessionEntry(mainConfig.WaylandDisplay.SessionDir.get(), autologinSession)) { + sessionType = Session::WaylandSession; + } else { + qCritical() << "Unable to find autologin session entry" << autologinSession; + return false; + } + + Session session; + session.setTo(sessionType, autologinSession); + + m_auth->setAutologin(true); + startAuth(mainConfig.Autologin.User.get(), QString(), session); + + return true; + } + void Display::displayServerStarted() { // check flag if (m_started) @@ -122,25 +145,10 @@ namespace SDDM { // set flags m_started = true; - // determine session type - const QString &autologinSession = mainConfig.Autologin.Session.get(); - Session session; - if (findSessionEntry(mainConfig.XDisplay.SessionDir.get(), autologinSession)) { - session.setTo(Session::X11Session, autologinSession); - } else if (findSessionEntry(mainConfig.WaylandDisplay.SessionDir.get(), autologinSession)) { - session.setTo(Session::WaylandSession, autologinSession); - } else { - qCritical() << "Unable to find autologin session entry" << autologinSession; - emit loginFailed(m_socket); + bool success = attemptAutologin(); + if (success) { return; } - - // start session - m_auth->setAutologin(true); - startAuth(mainConfig.Autologin.User.get(), QString(), session); - - // return - return; } // start socket server diff --git a/src/daemon/Display.h b/src/daemon/Display.h index dc46463..3d6d6a5 100644 --- a/src/daemon/Display.h +++ b/src/daemon/Display.h @@ -60,6 +60,7 @@ namespace SDDM { void login(QLocalSocket *socket, const QString &user, const QString &password, const Session &session); + bool attemptAutologin(); void displayServerStarted(); signals: -- 2.10.0 ++++++ 0001-Make-the-default-cursor-themed.patch ++++++ >From 7ea57ed6c993619b8bd5a8d256e7f6e9e5a77ee0 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Thu, 22 Sep 2016 20:07:01 +0200 Subject: [PATCH] Make the default cursor themed The X root window uses an "X" as the default cursor. To use a themed one, it has to be set explicitly, e.g. by QML MouseAreas. For themes which do not have a MouseArea that spans the entire screen, the "X" cursor would be visible. By setting a cursor in the root QML object, the themed cursor will be used by default. (https://bugs.kde.org/show_bug.cgi?id=337083) [ChangeLog][Greeter] Fix default cursor appearance --- src/greeter/GreeterApp.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp index 06d13c5..dfe321f 100644 --- a/src/greeter/GreeterApp.cpp +++ b/src/greeter/GreeterApp.cpp @@ -32,6 +32,7 @@ #include "MessageHandler.h" #include <QGuiApplication> +#include <QQuickItem> #include <QQuickView> #include <QQmlContext> #include <QQmlEngine> @@ -198,6 +199,10 @@ namespace SDDM { // set main script as source view->setSource(QUrl::fromLocalFile(mainScript)); + // set default cursor + QCursor cursor(Qt::ArrowCursor); + view->rootObject()->setCursor(cursor); + // show qDebug() << "Adding view for" << screen->name() << screen->geometry(); view->show(); -- 2.10.0
