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 62D0A138334 for ; Tue, 29 Oct 2019 22:22:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EAF90E08CD; Tue, 29 Oct 2019 22:22:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 C2790E08CD for ; Tue, 29 Oct 2019 22:22:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B6B3234C576 for ; Tue, 29 Oct 2019 22:22:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 799B38A4 for ; Tue, 29 Oct 2019 22:22:27 +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: <1572387696.457145c9d97bbcaace74b8bdacf20af972c61693.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch kde-plasma/plasma-workspace/plasma-workspace-5.17.2.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: 457145c9d97bbcaace74b8bdacf20af972c61693 X-VCS-Branch: master Date: Tue, 29 Oct 2019 22:22:27 +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: b8966ea3-0c76-4eb2-bb03-4f17a517a5d4 X-Archives-Hash: b087b56abb14fcce436ff66cc43d90c9 commit: 457145c9d97bbcaace74b8bdacf20af972c61693 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 29 21:27:28 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 29 22:21:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=457145c9 kde-plasma/plasma-workspace: Drop translations of Plasma session name We need to remove all translations in order to not reproduce the initial issue. Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> ...sma-workspace-5.17.2-waylandsessionrename.patch | 91 ++++++++++++++++++++++ .../plasma-workspace-5.17.2.ebuild | 2 +- 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch new file mode 100644 index 00000000000..71d1ce4abb8 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch @@ -0,0 +1,91 @@ +From 36bc9bfd9661f88039a8945688e07b0626b48610 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 15 Oct 2019 18:33:45 +0200 +Subject: [PATCH 1/2] 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, fvogt, 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 64f997ea4..3e9b46bc9 100644 +--- a/login-sessions/plasmawayland.desktop.cmake ++++ b/login-sessions/plasmawayland.desktop.cmake +@@ -2,51 +2,7 @@ + Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland + TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland + DesktopNames=KDE +-Name=Plasma +-Name[ar]=بلازما +-Name[bs]=Plazma +-Name[ca]=Plasma +-Name[ca@valencia]=Plasma +-Name[cs]=Plasma +-Name[da]=Plasma +-Name[de]=Plasma +-Name[el]=Plasma +-Name[en_GB]=Plasma +-Name[es]=Plasma +-Name[et]=Plasma +-Name[eu]=Plasma +-Name[fi]=Plasma +-Name[fr]=Plasma +-Name[gl]=Plasma +-Name[he]=פלזמה +-Name[hu]=Plasma +-Name[id]=Plasma +-Name[is]=Plasma +-Name[it]=Plasma +-Name[ja]=プラズマ +-Name[ko]=Plasma +-Name[lt]=Plasma +-Name[nb]=Plasma +-Name[nds]=Plasma +-Name[nl]=Plasma +-Name[nn]=Plasma +-Name[pa]=ਪਲਾਜ਼ਮਾ +-Name[pl]=Plazma +-Name[pt]=Plasma +-Name[pt_BR]=Plasma +-Name[ru]=Plasma +-Name[sk]=Plasma +-Name[sl]=Plasma +-Name[sr]=Плазма +-Name[sr@ijekavian]=Плазма +-Name[sr@ijekavianlatin]=Plasma +-Name[sr@latin]=Plasma +-Name[sv]=Plasma +-Name[tr]=Plama +-Name[uk]=Плазма +-Name[x-test]=xxPlasmaxx +-Name[zh_CN]=Plasma +-Name[zh_TW]=Plasma ++Name=Plasma (Wayland) + Comment=Plasma by KDE + Comment[ar]=بلازما كدي + Comment[bs]=Plazma od strane KDe +-- +2.23.0 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.2.ebuild index 18496a7cf26..1e58c5789d8 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.2.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.2.ebuild @@ -118,7 +118,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" - "${FILESDIR}/${PN}-5.17.0-waylandsessionrename.patch" + "${FILESDIR}/${P}-waylandsessionrename.patch" ) RESTRICT+=" test"