commit: ddf13e45190a39e8f4603729eaa75fd52f2c6d06 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Oct 15 17:08:44 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Oct 15 17:08:44 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ddf13e45
kde-plasma/plasma-workspace: Backport Plasma Wayland session renaming Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...sma-workspace-5.17.0-waylandsessionrename.patch | 48 ++++++++++++++++++++++ .../plasma-workspace-5.17.0.ebuild | 1 + .../plasma-workspace-5.17.49.9999.ebuild | 1 + 3 files changed, 50 insertions(+) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.0-waylandsessionrename.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.0-waylandsessionrename.patch new file mode 100644 index 0000000000..2493b8a159 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.0-waylandsessionrename.patch @@ -0,0 +1,48 @@ +From f8e716524435c0fc2bfec2aa36183e5c99e12d42 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <ast...@gentoo.org> +Date: Tue, 15 Oct 2019 18:33:45 +0200 +Subject: [PATCH] Fix Name conflict between plasma.desktop and + plasmawayland.desktop + +Summary: +SDDM until 0.18.1 appends " (Wayland)" to the name of any session file it +finds in wayland-sessions dir, and Plasma is relying on that behaviour to +distinguish between its X11 and Wayland sessions. This leads to duplicate +"Plasma" entries on any other DM not applying the same hack, e.g. lightdm, +and users are lost without downstream patching. + +SDDM in 0.19 only appends " (Wayland)" in case the session name does +not already end with this, to avoid duplicating it. + +CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409 +See also: https://github.com/sddm/sddm/pull/997 + +Reviewers: #plasma, davidedmundson, fvogt, ngraham + +Reviewed By: #plasma, davidedmundson, ngraham + +Subscribers: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D22210 +--- + login-sessions/plasmawayland.desktop.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/login-sessions/plasmawayland.desktop.cmake b/login-sessions/plasmawayland.desktop.cmake +index 1207621e0..c114959a2 100644 +--- a/login-sessions/plasmawayland.desktop.cmake ++++ b/login-sessions/plasmawayland.desktop.cmake +@@ -2,7 +2,7 @@ + Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland + TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland + DesktopNames=KDE +-Name=Plasma ++Name=Plasma (Wayland) + Name[ar]=بلازما + Name[bs]=Plazma + Name[ca]=Plasma +-- +2.23.0 + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.0.ebuild index f0efd16189..bef894f43f 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.0.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.0.ebuild @@ -118,6 +118,7 @@ PDEPEND=" PATCHES=( # TODO: Restore Gentoo part for FHS installs, bug 688366 "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" + "${FILESDIR}/${P}-waylandsessionrename.patch" ) RESTRICT+=" test" diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild index d6b7b9c862..be2b0fd5b6 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild @@ -118,6 +118,7 @@ PDEPEND=" PATCHES=( # TODO: Restore Gentoo part for FHS installs, bug 688366 "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" + "${FILESDIR}/${PN}-5.17.0-waylandsessionrename.patch" ) RESTRICT+=" test"
