From 571165f96143e9a9a9efb28bba260d71611d19981f7a785d7d99d0a307b421c3 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Mon, 14 May 2018 07:52:48 +0000
Subject: [PATCH] - 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:   * 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcm_sddm?expand=0&rev=154
---
 ...n-configuration-with-a-note-to-use-Y.patch |  8 ++++----
 kcm_sddm.changes                              |  8 ++++++++
 kcm_sddm.spec                                 |  6 +++---
 remove-wayland-suffix.patch                   | 19 +++++++++++++++++++
 4 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 remove-wayland-suffix.patch

diff --git a/0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch b/0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch
index 82366f8..95583fc 100644
--- a/0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch
+++ b/0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch
@@ -9,10 +9,10 @@ sddm looks at sysconfig for autologin and ignores other configuration files.
  src/ui/advanceconfig.ui | 10 +++++++---
  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.2/src/ui/advanceconfig.ui
+--- sddm-kcm-5.12.5.orig/src/ui/advanceconfig.ui
++++ sddm-kcm-5.12.5/src/ui/advanceconfig.ui
 @@ -45,15 +45,19 @@
        <property name="fieldGrowthPolicy">
         <enum>QFormLayout::ExpandingFieldsGrow</enum>
@@ -22,7 +22,7 @@ Index: sddm-kcm-5.12.2/src/ui/advanceconfig.ui
         <widget class="QLabel" name="label_7">
          <property name="text">
 -         <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>
         </widget>
        </item>
diff --git a/kcm_sddm.changes b/kcm_sddm.changes
index 09eecb0..318fa1b 100644
--- a/kcm_sddm.changes
+++ b/kcm_sddm.changes
@@ -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:
+  * 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch
+
 -------------------------------------------------------------------
 Wed May  2 09:06:28 CEST 2018 - fabian@ritter-vogt.de
 
diff --git a/kcm_sddm.spec b/kcm_sddm.spec
index a2b137a..9cc415f 100644
--- a/kcm_sddm.spec
+++ b/kcm_sddm.spec
@@ -31,6 +31,8 @@ Patch1:         set-default-session-to-plasma5-for-autologin.patch
 Patch2:         0002-Support-default.session-symlink.patch
 # PATCH-FIX-OPENSUSE
 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:  kf5-filesystem
 BuildRequires:  pkgconfig
@@ -65,9 +67,7 @@ sddm.
 
 %prep
 %setup -q -n sddm-kcm-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%autopatch -p1
 
 %build
   %cmake_kf5 -d build
diff --git a/remove-wayland-suffix.patch b/remove-wayland-suffix.patch
new file mode 100644
index 0000000..449937a
--- /dev/null
+++ b/remove-wayland-suffix.patch
@@ -0,0 +1,19 @@
+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="))