Accepting request 776753 from KDE:Frameworks5

Plasma 5.18.1

OBS-URL: https://build.opensuse.org/request/show/776753
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kcm_sddm?expand=0&rev=83

0003-Don-t-add-a-Wayland-suffix-to-Wayland-sessions.patch

@@ -1,18 +1,18 @@
-From 9e7e7bb056a91ec62c40e2cd94454ea006d452c9 Mon Sep 17 00:00:00 2001
+From 59515b3c6046e1c432836262fd8dc16acf6bcb11 Mon Sep 17 00:00:00 2001
 From: Fabian Vogt <fabian@ritter-vogt.de>
 Date: Sat, 7 Jul 2018 20:34:44 +0200
 Subject: [PATCH 3/3] Don't add a (Wayland) suffix to Wayland sessions
 
 It got removed from sddm as well.
 ---
- src/sessionmodel.cpp | 8 ++------
+ src/sessionmodel.cpp | 11 ++---------
- 1 file changed, 2 insertions(+), 6 deletions(-)
+ 1 file changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp
-index 429d664..99c5d51 100644
+index e1d337f..8af214a 100644
 --- a/src/sessionmodel.cpp
 +++ b/src/sessionmodel.cpp
-@@ -57,6 +57,7 @@ SessionModel::~SessionModel() {
+@@ -55,6 +55,7 @@ SessionModel::~SessionModel() {
  
  void SessionModel::loadDir(const QString &path, SessionType type)
  {
@@ -20,7 +20,7 @@ index 429d664..99c5d51 100644
      QDir dir(path);
      dir.setNameFilters(QStringList() << QStringLiteral("*.desktop"));
      dir.setFilter(QDir::Files);
-@@ -82,13 +83,8 @@ void SessionModel::loadDir(const QString &path, SessionType type)
+@@ -80,16 +81,8 @@ void SessionModel::loadDir(const QString &path, SessionType type)
              if (current_section != QLatin1String("Desktop Entry"))
                  continue; // We are only interested in the "Desktop Entry" section
  
@@ -28,13 +28,16 @@ index 429d664..99c5d51 100644
 +            if (line.startsWith(QLatin1String("Name=")))
                  si->name = line.mid(5);
 -                if (type == SessionTypeWayland) {
--                    //we want to exactly match the SDDM prompt which is formatted in this way
+-                    // 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);
+-                    // with the exact same check
+-                    if (!si->name.endsWith(QLatin1String(" (Wayland)"))) {
+-                        si->name = i18nc("%1 is the name of a session", "%1 (Wayland)", si->name);
+-                    }
 -                }
 -            }
              if (line.startsWith(QLatin1String("Exec=")))
                  si->exec = line.mid(5);
              if (line.startsWith(QLatin1String("Comment=")))
 -- 
-2.21.0
+2.23.0
 

kcm_sddm.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Feb 18 14:05:55 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.18.1
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.18.1.php
+- Changes since 5.18.0:
+  * Fix being unable to set the right permissions for kde_settings.conf (kde#414396)
+  * Don't let the Advanced tab's spacers expand all they want (kde#417657)
+  * Sync ("Wayland") appending to match SDDM (kde#417499)
+  * Have authhelper define config file paths on its own
+- Refresh 0003-Don-t-add-a-Wayland-suffix-to-Wayland-sessions.patch
+
 -------------------------------------------------------------------
 Thu Feb  6 15:10:03 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
 

kcm_sddm.spec

@@ -18,15 +18,15 @@
 
 %bcond_without lang
 Name:           kcm_sddm
-Version:        5.18.0
+Version:        5.18.1
 Release:        0
 Summary:        A sddm control module for KDE
 License:        GPL-2.0-only
 Group:          System/GUI/KDE
 Url:            https://projects.kde.org/projects/kdereview/sddm-kcm/repository
-Source:         sddm-kcm-%{version}.tar.xz
+Source:         https://download.kde.org/stable/plasma/%{version}/sddm-kcm-%{version}.tar.xz
 %if %{with lang}
-Source1:        sddm-kcm-%{version}.tar.xz.sig
+Source1:        https://download.kde.org/stable/plasma/%{version}/sddm-kcm-%{version}.tar.xz.sig
 Source2:        plasma.keyring
 %endif
 # PATCH-FIX-OPENSUSE

sddm-kcm-5.18.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56de2fdd02f87e93a91dfa5083e47ffeb7479b40cd1044bbe40fa1dbe758a24b
-size 61988

sddm-kcm-5.18.0.tar.xz.sig

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl48FacACgkQ7JTRj38F
-mX7Rlwf/b9pErAAwHOgK5oVnk6nMceSHrtkvAkIf9undTNjtn7Tu/LfNB+HMeOH6
-vVzALAri2ZNIxCm6WK26OSPIG/vQR3kYMhsJyApy2CNCu9gltXzuRLJ2BBb7Uunj
-ajjRgkVUqB0vxPKBtPkZrGiFLKRZCpF+9pGgQCR4pDdcjN3g6wshEGBsXGw6KzR1
-soWlUBXCkgo2sMEUR2hyWADUOpEnA5zRnNoJiTjNWGb3l68DeQTI0fZLpEz+uxQ7
-aVpe6+eDRJ8p3MAYTG/tcKjJjoOjg0QdaUjKRMaj6p/kYjo7Yceuujd9+DA15MNP
-2VN2kg5zJPQmL1Fod5GstpSSGx4QYQ==
-=IOUO
------END PGP SIGNATURE-----

sddm-kcm-5.18.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fdae8dce63fd607ef2fd39008dfc1d98ec9c9fecd38c855066e5e588334943e4
+size 62184

sddm-kcm-5.18.1.tar.xz.sig

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl5L5mgACgkQ7JTRj38F
+mX7rHAf/TWlGSewLdnjDR2aKpqV2nuTE26dlhQSk78+c/IJ2ffOQisx4ngzUC/kB
+B2mFXiGItAHoNtAk6nENKFGFcRqVfllbwVKrDBEy6K0BG7m5erJcSp05UAZYgvEi
+P9LcIee0DLeFPR2zF9Njtk2mqpXzgSfHnofY3GlWsWF0xPKdq++l/mEwU8gVHjNa
+/YLI22ucs1yQA6qbM+a4tEpYHVa4BQNUxY7MfkD/tveA2UiNfR+V0xN+2YxUnWc9
+oRdsZWo02aUKlc0DVe0t/+1Vv7AiGGQx/GclXyKkTEVyelRIuchT2/R7wFYaVpLC
+ht/PLa9312TslvEANvZ4fCKLWHk8aA==
+=sx0b
+-----END PGP SIGNATURE-----