Hello community,

here is the log from the commit of package kcm_sddm for openSUSE:Factory 
checked in at 2018-05-16 11:23:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kcm_sddm (Old)
 and      /work/SRC/openSUSE:Factory/.kcm_sddm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kcm_sddm"

Wed May 16 11:23:03 2018 rev:55 rq:606936 version:5.12.5

Changes:
--------
--- /work/SRC/openSUSE:Factory/kcm_sddm/kcm_sddm.changes        2018-05-08 
13:33:29.333891764 +0200
+++ /work/SRC/openSUSE:Factory/.kcm_sddm.new/kcm_sddm.changes   2018-05-16 
11:23:07.848575797 +0200
@@ -1,0 +2,8 @@
+Mon May 14 07:50:24 UTC 2018 - fab...@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
+
+-------------------------------------------------------------------

New:
----
  remove-wayland-suffix.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kcm_sddm.spec ++++++
--- /var/tmp/diff_new_pack.T0JGOJ/_old  2018-05-16 11:23:09.332521898 +0200
+++ /var/tmp/diff_new_pack.T0JGOJ/_new  2018-05-16 11:23:09.336521752 +0200
@@ -31,6 +31,8 @@
 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 @@
 
 %prep
 %setup -q -n sddm-kcm-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%autopatch -p1
 
 %build
   %cmake_kf5 -d build

++++++ 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch ++++++
--- /var/tmp/diff_new_pack.T0JGOJ/_old  2018-05-16 11:23:09.364520736 +0200
+++ /var/tmp/diff_new_pack.T0JGOJ/_new  2018-05-16 11:23:09.368520591 +0200
@@ -9,10 +9,10 @@
  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 @@
         <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>

++++++ remove-wayland-suffix.patch ++++++
From: Fabian Vogt <fab...@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="))

Reply via email to