pool/kcm_sddm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 606936 from KDE:Frameworks5

Browse Source 
- Amend 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch
  to improve the replacement message
- Add patch to not show duplicate "(Wayland)" prefixes:
  * remove-wayland-suffix.patch

OBS-URL: https://build.opensuse.org/request/show/606936
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kcm_sddm?expand=0&rev=55
This commit is contained in:
Dominique Leuenberger 2018-05-16 09:23:03 +00:00 committed by Git OBS Bridge
commit fb40af87f9
4 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch
View File

@ -9,10 +9,10 @@ sddm looks at sysconfig for autologin and ignores other configuration files.
src/ui/advanceconfig.ui | 10 +++++++--- src/ui/advanceconfig.ui | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-) 1 file changed, 7 insertions(+), 3 deletions(-)
Index: sddm-kcm-5.12.2/src/ui/advanceconfig.ui Index: sddm-kcm-5.12.5/src/ui/advanceconfig.ui
=================================================================== ===================================================================
--- sddm-kcm-5.12.2.orig/src/ui/advanceconfig.ui --- sddm-kcm-5.12.5.orig/src/ui/advanceconfig.ui
+++ sddm-kcm-5.12.2/src/ui/advanceconfig.ui +++ sddm-kcm-5.12.5/src/ui/advanceconfig.ui
@@ -45,15 +45,19 @@ @@ -45,15 +45,19 @@
<property name="fieldGrowthPolicy"> <property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum> <enum>QFormLayout::ExpandingFieldsGrow</enum>
@ -22,7 +22,7 @@ Index: sddm-kcm-5.12.2/src/ui/advanceconfig.ui
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
- <string>User:</string> - <string>User:</string>
+ <string>Autologin needs to be configured using YaST or by editing /etc/sysconfig/displaymanager.</string> + <string>The user for autologin needs to be configured using YaST or by setting DISPLAYMANAGER_AUTOLOGIN in /etc/sysconfig/displaymanager.</string>
</property> </property>
</widget> </widget>
</item> </item>

8
kcm_sddm.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon May 14 07:50:24 UTC 2018 - fabian@ritter-vogt.de
- Amend 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch
to improve the replacement message
- Add patch to not show duplicate "(Wayland)" prefixes:
* remove-wayland-suffix.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 2 09:06:28 CEST 2018 - fabian@ritter-vogt.de Wed May 2 09:06:28 CEST 2018 - fabian@ritter-vogt.de

6
kcm_sddm.spec
View File

@ -31,6 +31,8 @@ Patch1: set-default-session-to-plasma5-for-autologin.patch
Patch2: 0002-Support-default.session-symlink.patch Patch2: 0002-Support-default.session-symlink.patch
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE
Patch3: 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch Patch3: 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch
# PATCH-FIX-UPSTREAM
Patch4: remove-wayland-suffix.patch
BuildRequires: extra-cmake-modules >= 1.0.0 BuildRequires: extra-cmake-modules >= 1.0.0
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -65,9 +67,7 @@ sddm.
%prep %prep
%setup -q -n sddm-kcm-%{version} %setup -q -n sddm-kcm-%{version}
%patch1 -p1 %autopatch -p1
%patch2 -p1
%patch3 -p1
%build %build
%cmake_kf5 -d build %cmake_kf5 -d build

24
remove-wayland-suffix.patch Normal file
View File

@ -0,0 +1,24 @@
From: Fabian Vogt <fabian@ritter-vogt.de>
Subject: Don't add a (Wayland) suffix to Wayland sessions
It got removed from sddm as well.
Index: sddm-kcm-5.12.5/src/sessionmodel.cpp
===================================================================
--- sddm-kcm-5.12.5.orig/src/sessionmodel.cpp
+++ sddm-kcm-5.12.5/src/sessionmodel.cpp
@@ -81,13 +81,8 @@ void SessionModel::loadDir(const QString
if (current_section != QLatin1String("Desktop Entry"))
continue; // We are only interested in the "Desktop Entry" section
- if (line.startsWith("Name=")) {
+ if (line.startsWith("Name="))
si->name = line.mid(5);
- if (type == SessionTypeWayland) {
- //we want to exactly match the SDDM prompt which is formatted in this way
- si->name = i18nc("%1 is the name of a session", "%1 (Wayland)", si->name);
- }
- }
if (line.startsWith("Exec="))
si->exec = line.mid(5);
if (line.startsWith("Comment="))