From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 57182138334 for ; Tue, 15 Oct 2019 17:10:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A4C7E0821; Tue, 15 Oct 2019 17:10:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 63D70E0821 for ; Tue, 15 Oct 2019 17:10:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC6B034BDFC for ; Tue, 15 Oct 2019 17:10:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B18FF2A5 for ; Tue, 15 Oct 2019 17:10:44 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1571159324.ddf13e45190a39e8f4603729eaa75fd52f2c6d06.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/files/plasma-workspace-5.17.0-waylandsessionrename.patch kde-plasma/plasma-workspace/plasma-workspace-5.17.0.ebuild kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ kde-plasma/plasma-workspace/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ddf13e45190a39e8f4603729eaa75fd52f2c6d06 X-VCS-Branch: master Date: Tue, 15 Oct 2019 17:10:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4d9b6b11-bd76-450c-9b04-d2b9e74d2661 X-Archives-Hash: da9199ad6243ec530b2c0b2c9ff9314a commit: ddf13e45190a39e8f4603729eaa75fd52f2c6d06 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 15 17:08:44 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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"