diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-10-29 22:27:28 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-10-29 23:21:36 +0100 |
commit | 457145c9d97bbcaace74b8bdacf20af972c61693 (patch) | |
tree | 62a4d61711653650fe8998e313b57f0140e5b07b /kde-plasma | |
parent | kde-plasma: Add KDE Plasma 5.17.2 (diff) | |
download | gentoo-457145c9d97bbcaace74b8bdacf20af972c61693.tar.gz gentoo-457145c9d97bbcaace74b8bdacf20af972c61693.tar.bz2 gentoo-457145c9d97bbcaace74b8bdacf20af972c61693.zip |
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 <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma')
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch | 91 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/plasma-workspace-5.17.2.ebuild | 2 |
2 files changed, 92 insertions, 1 deletions
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 000000000000..71d1ce4abb87 --- /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 <asturm@gentoo.org> +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 18496a7cf262..1e58c5789d8f 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" |