D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Andreas Sturmlechner]

asturmlechner closed this revision.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson, fvogt, ngraham
Cc: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel, crossi, 
LeGast00n, The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, 
alexeymin, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, 
apol, ahiemstra, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Andreas Sturmlechner]

asturmlechner added a comment.


  In D22210#547637 , @davidedmundson 
wrote:
  
  > 1. A period where both X and wayland say "Plasma".
  >
  >   1 is super super bad. Which means we need to patch one of the Plasma 
entries first. I would block this happening.
  
  
  It is the status quo for everyone using a DM other than SDDM on 
, so any decision here is going to be an improvement.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson, fvogt
Cc: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, 
The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, alexeymin, 
himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, 
ahiemstra, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[David Edmundson]

davidedmundson accepted this revision.
davidedmundson added a comment.


  +1
  but wait for fvogt and whoever else to ack.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson, fvogt
Cc: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, 
The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, alexeymin, 
himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, 
ahiemstra, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Andreas Sturmlechner]

asturmlechner updated this revision to Diff 67992.
asturmlechner added a comment.


  Switch back to Plasma (Wayland)

REPOSITORY
  R120 Plasma Workspace

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D22210?vs=62165&id=67992

BRANCH
  arcpatch-D22210

REVISION DETAIL
  https://phabricator.kde.org/D22210

AFFECTED FILES
  login-sessions/plasmawayland.desktop.cmake

To: asturmlechner, #plasma, davidedmundson, fvogt
Cc: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, 
The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, alexeymin, 
himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, 
ahiemstra, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Nathaniel Graham]

ngraham added a comment.


  In D22210#547637 , @davidedmundson 
wrote:
  
  > Ok, so there are exactly 3 outcomes of events.
  >
  > 1. A period where both X and wayland say "Plasma".
  > 2. A period where we see Plasma (X11) and Plasma
  > 3. A period where we see Plasma (wayland) (wayland) (a combo of 2 & 3 is 
also possible, but that seems pointless)
  >
  > 1 is super super bad. Which means we need to patch one of the Plasma 
entries first. I would block this happening.
  >
  > 2 (this patch) I don't like. It's not comparable with gnome because they 
have their wayland session by default. We currently do not. 
  >  I really don't like this, but if group concensus from Plasma is 
this...then ok.
  >
  > 3 not great, obviously looks super stupid, but it affects the fewest users. 
My preference.
  >
  > Hopefully it's mostly a non issue and we're overthinking it as all the 
really good distros can patch in sync if we send an email upfront.
  
  
  My thoughts exactly.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson, fvogt
Cc: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, 
The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, alexeymin, 
himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, 
ahiemstra, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[David Edmundson]

davidedmundson added a comment.


  Ok, so there are exactly 3 outcomes of events.
  
  1. A period where both X and wayland say "Plasma".
  2. A period where we see Plasma (X11) and Plasma
  3. A period where we see Plasma (wayland) (wayland)
  
  (a combo of 2 & 3 is also possible, but that seems pointless)
  
  1 is super super bad. Which means we need to patch one of the Plasma entries 
first. I would block this happening.
  
  2 (this patch) I don't like. It's not comparable with gnome because they have 
their wayland session by default. We currently do not. 
  I really don't like this, but if group concensus from Plasma is this...then 
ok.
  
  3 not great, obviously looks super stupid, but it affects the fewest users. 
My preference.
  
  Hopefully it's mostly a non issue and we're overthinking it as all the really 
good distros can patch in sync if we send an email upfront.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson, fvogt
Cc: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, 
The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, alexeymin, 
himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, 
ahiemstra, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Andreas Sturmlechner]

asturmlechner added a comment.


  In D22210#547621 , @ngraham wrote:
  
  > "Plasma on Xorg" is a yucky string to display to users.
  
  
  well, it is what Gnome apparently does, so at least it would have lead to 
some uniformity. But no strong opinion here.
  
  In D22210#547621 , @ngraham wrote:
  
  > IMO it would be preferable to display "Plasma on Wayland (Wayland) for a 
limited period of time while the Plasma and SDDM versions aren't yet aligned.
  
  
  ...except I wasn't sure if you could call Plasma running "on" Wayland in the 
same sense as it is running "on" Xorg.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson, fvogt
Cc: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, 
The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, alexeymin, 
himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, 
ahiemstra, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Nathaniel Graham]

ngraham added a comment.


  Got it.
  
  My very strong preference is to append the session name for Wayland, not X11. 
"Plasma on Xorg" is a yucky string to display to users. IMO it would be 
preferable to display "Plasma on Wayland (Wayland) for a limited period of time 
while the Plasma and SDDM versions aren't yet aligned. This redundancy would 
then have a built-in expiration date.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson, fvogt
Cc: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, 
The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, alexeymin, 
himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, 
ahiemstra, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Fabian Vogt]

fvogt added a comment.


  In D22210#547608 , @ngraham wrote:
  
  > I thought this change was introduced with  0.18.1 though? Aren't distros 
with an old SDDM using something older than that?
  
  
  That pull request hasn't been merged yet, so all distros which haven't 
applied it manually would be affected.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson, fvogt
Cc: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, 
The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, alexeymin, 
himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, 
ahiemstra, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Nathaniel Graham]

ngraham added a comment.


  I thought this change was introduced with  0.18.1 though? Aren't distros with 
an old SDDM using something older than that?

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson, fvogt
Cc: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, 
The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, alexeymin, 
himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, 
ahiemstra, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Fabian Vogt]

fvogt added a comment.


  In D22210#547602 , @ngraham wrote:
  
  > FWIW to me https://github.com/sddm/sddm/pull/997 seems correct, and then we 
would rename the sessions upstream here. My preference would be to make the 
Wayland session say "Plasma (Wayland)" rather than renaming the X11 session 
("Plasma on Xorg" sounds pretty awkward IMO)
  
  
  Which then results in "Plasma (Wayland) (Wayland)" on distros with old sddm. 
That's why this patch does it the other way around.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson, fvogt
Cc: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, 
The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, alexeymin, 
himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, 
ahiemstra, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Nathaniel Graham]

ngraham added a comment.


  FWIW to me https://github.com/sddm/sddm/pull/997 seems correct, and then we 
would rename the sessions upstream here. My preference would be to make the 
Wayland session say "Plasma (Wayland)" rather than renaming the X11 session 
("Plasma on Xorg" sounds pretty awkward IMO)

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson, fvogt
Cc: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, 
The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, alexeymin, 
himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, 
ahiemstra, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Fabian Vogt]

fvogt requested changes to this revision.
fvogt added a comment.
This revision now requires changes to proceed.


  In D22210#498933 , @fvogt wrote:
  
  > In D22210#498929 , 
@asturmlechner wrote:
  >
  > > drop translations, rename to 'Plasma on Xorg'
  >
  >
  > That would not be symmetric to "Plasma (Wayland)" though as produced by 
sddm.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson, fvogt
Cc: pino, rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, 
The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, ZrenBot, ngraham, 
alexeymin, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, 
apol, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Pino Toscano]

pino added a comment.


  In D22210#498929 , @asturmlechner 
wrote:
  
  > drop translations
  
  
  No need to do that, scripty will take care of it.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson
Cc: pino, rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, jraleigh, 
fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Fabian Vogt]

fvogt added a comment.


  In D22210#498929 , @asturmlechner 
wrote:
  
  > drop translations, rename to 'Plasma on Xorg'
  
  
  That would not be symmetric to "Plasma (Wayland)" though as produced by sddm.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson
Cc: rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, jraleigh, 
fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Andreas Sturmlechner]

asturmlechner updated this revision to Diff 62165.
asturmlechner added a comment.


  drop translations, rename to 'Plasma on Xorg'

REPOSITORY
  R120 Plasma Workspace

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D22210?vs=60995&id=62165

BRANCH
  session-rename

REVISION DETAIL
  https://phabricator.kde.org/D22210

AFFECTED FILES
  login-sessions/plasma.desktop.cmake

To: asturmlechner, #plasma, davidedmundson
Cc: rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, jraleigh, 
fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Andreas Sturmlechner]

asturmlechner added a comment.


  FWIW, Gnome appear to be calling theirs 'Gnome on Xorg' (and likewise, just 
'Gnome' for the wayland session).

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson
Cc: rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, jraleigh, 
fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Andreas Sturmlechner]

asturmlechner added a comment.


  I'll have to do this downstream, anyway...

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson
Cc: rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, jraleigh, 
fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Fabian Vogt]

fvogt added a comment.


  > This patch only helps with the case where SDDM is updated first,
  
  No, it solves all cases. Patched SDDM and therefore also GDM and LightDM show 
"Plasma (X11)" and "Plasma", while unpatched SDDM shows "Plasma (X11)" and 
"Plasma (Wayland)".

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson
Cc: rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, jraleigh, 
fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[David Edmundson]

davidedmundson added a comment.


  Yeah, I understand the situation.
  
  
  
  LightDM (when I worked on it at least) used to support the Icon property in 
the .desktop file. 
  That'd be a quick and easy way to add an extra clarification on which one is 
wayland in the short term.
  
  -
  
  Unless you get an SDDM release exactly in sync with the Plasma change, you 
still have "(wayland)" twice or potentially never.
  
  This patch only helps with the case where SDDM is updated first, but the UX 
is messy as the additional qualifier moves, which is very confusing. And it'll 
end up staying there forever just to solve a few weeks of hypothetics crossover.
  
  Given we need to do something horrific, the other option is we patch our 
.desktop file right now and then just manipulate the text to remove one 
"(wayland)" if needed. That's at least atomic, and then we can patch SDDM at 
our leisure later.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson
Cc: rdieter, fvogt, davidedmundson, plasma-devel, LeGast00n, jraleigh, 
fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Fabian Vogt]

fvogt added a comment.


  This is a necessary step to avoid having two indistinguishable "Plasma" 
options in SDDM with the linked PR merged and all other DMs , the other option 
is to have a "Plasma (Wayland) (Wayland)" in sddm only.
  
  AFAICT the translations for Name need to be removed though as they're wrong 
now.
  
  In openSUSE downstream we could do it the other way as we can change sddm and 
plasma-workspace simultaneously, so we have "Plasma" and "Plasma (Wayland)" in 
the desktop files with sddm not adding any suffix.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson
Cc: fvogt, davidedmundson, plasma-devel, LeGast00n, jraleigh, fbampaloukas, 
GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Andreas Sturmlechner]

asturmlechner added a comment.


  Well, what's the current situation - SDDM have made the decision on their 
part to append that tech-garbage for Wayland sessions, users end up with:
  
  - Plasma
  - Plasma (Wayland)
  
  Per linked issue it is not going to be like that forever; on every(?) other 
DM, like lightdm, users can choose between:
  
  - Plasma
  - Plasma
  
  ...unless whatever downstream patching has been done to alleviate that issue. 
That's a real problem, not only because it relies on downstreams to do 
something, maybe not the right thing, and for users who do not know what to 
report when they have a problem entering a session (and frustration to decide 
which is which). Both choices will remain available in the foreseeable future.
  
  I'd like to get us to a situation where the session naming is consistent on 
all DMs, the SDDM hack can be dropped and no one needs to patch anything. 
`Plasma (Wayland)` would eventually become the default choice anyway, then be 
displayed just as `Plasma` if we don't do anything on our side and only fix 
SDDM.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson
Cc: davidedmundson, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, 
ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, 
abetts, sebas, apol, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[David Edmundson]

davidedmundson requested changes to this revision.
davidedmundson added a comment.
This revision now requires changes to proceed.


  This means most our normal users in an office who don't know/care if they're 
running X11 or wayland have some extra tech-garbage after the name.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D22210

To: asturmlechner, #plasma, davidedmundson
Cc: davidedmundson, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, 
ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, 
abetts, sebas, apol, mart

D22210: Fix Name conflict between plasma.desktop and plasmawayland.desktop

[Andreas Sturmlechner]

asturmlechner created this revision.
asturmlechner added a reviewer: Plasma.
Herald added a project: Plasma.
Herald added a subscriber: plasma-devel.
asturmlechner requested review of this revision.

REVISION SUMMARY
  SDDM as of 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.
  
  Instead of waiting for which of (SDDM, Plasma) is doing something about
  it first, renaming X11 session to "Plasma (X11)" appears to be the most
  elegant solution out of the deadlock. SDDM can be fixed any time later.
  
  CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409
  See also: https://github.com/sddm/sddm/pull/997

REPOSITORY
  R120 Plasma Workspace

BRANCH
  session-rename

REVISION DETAIL
  https://phabricator.kde.org/D22210

AFFECTED FILES
  login-sessions/plasma.desktop.cmake

To: asturmlechner, #plasma
Cc: plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, 
ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, 
apol, mart