[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/

[Andreas Sturmlechner]

commit:     b388c33932ad258b3c1d086bca252493bc824da3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 21:35:10 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 21:48:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b388c339

kde-plasma/plasma-workspace: Drop translations of Plasma session name

We need to remove all translations in order to not reproduce the initial issue.
Drop obsolete comment, the old paths won't come back.

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ma-workspace-5.17.2-waylandsessionrename.patch} | 61 ++++++++++++++++++----
 .../plasma-workspace-5.17.49.9999.ebuild           |  3 +-
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  5 +-
 3 files changed, 54 insertions(+), 15 deletions(-)

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.2-waylandsessionrename.patch
similarity index 54%
rename from kde-plasma/plasma-workspace/files/plasma-workspace-5.17.0-waylandsessionrename.patch
rename to kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch
index 2493b8a159..71d1ce4abb 100644
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.0-waylandsessionrename.patch
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch
@@ -1,7 +1,7 @@
-From f8e716524435c0fc2bfec2aa36183e5c99e12d42 Mon Sep 17 00:00:00 2001
+From 36bc9bfd9661f88039a8945688e07b0626b48610 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@g.o>
 Date: Tue, 15 Oct 2019 18:33:45 +0200
-Subject: [PATCH] Fix Name conflict between plasma.desktop and
+Subject: [PATCH 1/2] Fix Name conflict between plasma.desktop and
  plasmawayland.desktop
 
 Summary:
@@ -19,7 +19,7 @@ See also: https://github.com/sddm/sddm/pull/997
 
 Reviewers: #plasma, davidedmundson, fvogt, ngraham
 
-Reviewed By: #plasma, davidedmundson, ngraham
+Reviewed By: #plasma, davidedmundson, fvogt, ngraham
 
 Subscribers: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel
 
@@ -31,18 +31,61 @@ Differential Revision: https://phabricator.kde.org/D22210
  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
+index 64f997ea4..3e9b46bc9 100644
 --- a/login-sessions/plasmawayland.desktop.cmake
 +++ b/login-sessions/plasmawayland.desktop.cmake
-@@ -2,7 +2,7 @@
+@@ -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)
- Name[ar]=بلازما
- Name[bs]=Plazma
- Name[ca]=Plasma
+ 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.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49.9999.ebuild
index 4712dbfc55..96f1c1b918 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
@@ -117,9 +117,8 @@ 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"
+	"${FILESDIR}/${PN}-5.17.2-waylandsessionrename.patch"
 )
 
 RESTRICT+=" test"

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index e60dcf067b..6e287a1520 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -117,10 +117,7 @@ PDEPEND="
 	$(add_plasma_dep kde-cli-tools)
 "
 
-PATCHES=(
-	# TODO: Restore Gentoo part for FHS installs, bug 688366
-	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
 
 RESTRICT+=" test"