diff --git a/sddm-git.e707e229-session-list.patch b/sddm-git.e707e229-session-list.patch new file mode 100644 index 0000000..d884413 --- /dev/null +++ b/sddm-git.e707e229-session-list.patch @@ -0,0 +1,25 @@ +diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp +index 8c232ba..8269c4c 100644 +--- a/src/greeter/SessionModel.cpp ++++ b/src/greeter/SessionModel.cpp +@@ -56,9 +56,6 @@ namespace SDDM { + // set role names + setRoleNames(roleNames); + #endif +- // add custom and failsafe session +- d->sessions << SessionPtr { new Session {"custom", "Custom", "custom", "Custom Session"} }; +- d->sessions << SessionPtr { new Session {"failsafe", "Failsafe", "failsafe", "Failsafe Session"} }; + // read session files + QDir dir(Configuration::instance()->sessionsDir()); + dir.setNameFilters(QStringList() << "*.desktop"); +@@ -84,6 +81,10 @@ namespace SDDM { + // close file + inputFile.close(); + } ++ // add custom and failsafe session ++// hidden for now --mbriza ++// d->sessions << SessionPtr { new Session {"custom", "Custom", "custom", "Custom Session"} }; ++ d->sessions << SessionPtr { new Session {"failsafe", "Failsafe", "failsafe", "Failsafe Session"} }; + // find out index of the last session + for (int i = 0; i < d->sessions.size(); ++i) { + if (d->sessions.at(i)->file == Configuration::instance()->lastSession()) diff --git a/sddm.spec b/sddm.spec index fafee81..a3d8475 100644 --- a/sddm.spec +++ b/sddm.spec @@ -3,7 +3,7 @@ Name: sddm Version: 0.2.0 -Release: 0.4.20130821git%(echo %{sddm_commit} | cut -c-8)%{?dist} +Release: 0.5.20130821git%(echo %{sddm_commit} | cut -c-8)%{?dist} License: GPLv2+ Summary: QML based X11 desktop manager @@ -16,6 +16,8 @@ Source2: sddm.service # Upstreamed patch waiting for review, need it right now Patch1: 0001-Store-the-PAM-handle-in-the-Authenticator-class-and-.patch +# Patch setting a better order of the xsessions and hiding the custom one +Patch2: sddm-git.e707e229-session-list.patch Provides: service(graphical-login) = sddm @@ -87,6 +89,9 @@ sed -i "s/^MinimumVT=[0-9]*$/MinimumVT=1/" %{buildroot}%{_sysconfdir}/sddm.conf %{_datadir}/apps/sddm/themes/* %changelog +* Mon Sep 09 2013 Martin Briza - 0.2.0-0.5.20130821gite707e229 +- Set a better order of the X sessions selection and hidden the Custom one (#1004902) + * Mon Sep 02 2013 Martin Briza - 0.2.0-0.4.20130821gite707e229 - Complete PAM conversations and end them properly when the session ends - Ship our own systemd service file especially to provide Conflicts: getty@tty1.service