Hello community,

here is the log from the commit of package sddm for openSUSE:Factory checked in 
at 2018-03-29 11:48:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sddm (Old)
 and      /work/SRC/openSUSE:Factory/.sddm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "sddm"

Thu Mar 29 11:48:31 2018 rev:32 rq:590866 version:0.17.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/sddm/sddm.changes        2018-03-24 
16:08:51.445605417 +0100
+++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes   2018-03-29 
11:48:35.261565879 +0200
@@ -1,0 +2,7 @@
+Sat Mar 24 13:55:06 UTC 2018 - [email protected]
+
+- Don't add a suffix for wayland sessions anymore, for symmetry with
+  gdm and lightdm:
+  * 0001-Remove-suffix-for-Wayland-session.patch
+
+-------------------------------------------------------------------

New:
----
  0001-Remove-suffix-for-Wayland-session.patch

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

Other differences:
------------------
++++++ sddm.spec ++++++
--- /var/tmp/diff_new_pack.rpqFVP/_old  2018-03-29 11:48:36.085536194 +0200
+++ /var/tmp/diff_new_pack.rpqFVP/_new  2018-03-29 11:48:36.089536050 +0200
@@ -32,6 +32,8 @@
 Patch2:         0001-greeter-Use-Qt-command-line-parser.patch
 Patch3:         0001-Fix-platform-detection-for-EnableHiDPI.patch
 Patch4:         0001-Fix-build-with-Qt-5.10-Use-QString-instead-of-QLatin.patch
+# Not merged yet: https://github.com/sddm/sddm/pull/997
+Patch50:        0001-Remove-suffix-for-Wayland-session.patch
 # Patch100-?: PATCH-FIX-OPENSUSE
 # Use openSUSE pam config
 Patch100:       proper_pam.diff

++++++ 0001-Remove-suffix-for-Wayland-session.patch ++++++
>From aa342153bf3bd88a7af5dc6c454cb4c9d16f95ee Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <[email protected]>
Date: Tue, 20 Mar 2018 18:22:39 +0100
Subject: [PATCH] Remove suffix for Wayland session

Some desktops like GNOME specify which windowing system is in use
with the Name entry of their desktop file.

For Wayland-only desktops such as Liri this information is
redundant and so is for X11-only window managers.

Do not append the Wayland suffix and let desktops handle it
themeselves.

[ChangeLog][Greeter] Remove suffix for Wayland sessions
---
 src/common/Session.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/common/Session.cpp b/src/common/Session.cpp
index 4812d67..a2be266 100644
--- a/src/common/Session.cpp
+++ b/src/common/Session.cpp
@@ -161,12 +161,8 @@ namespace SDDM {
             if (current_section != QLatin1String("Desktop Entry"))
                 continue; // We are only interested in the "Desktop Entry" 
section
 
-            if (line.startsWith(QLatin1String("Name="))) {
-                if (type == WaylandSession)
-                    m_displayName = QObject::tr("%1 
(Wayland)").arg(line.mid(5));
-                else
-                    m_displayName = line.mid(5);
-            }
+            if (line.startsWith(QLatin1String("Name=")))
+                m_displayName = line.mid(5);
             if (line.startsWith(QLatin1String("Comment=")))
                 m_comment = line.mid(8);
             if (line.startsWith(QLatin1String("Exec=")))
-- 
2.16.2


Reply via email to