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

[Andreas Sturmlechner]

commit:     abba77cd84257b5db9aa9a38d4b9a817308bad77
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 15:38:00 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 15:38:00 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=abba77cd

kde-plasma/plasma-workspace: Drop unused patches

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

 ...rkspace-5.10-startplasmacompositor-script.patch | 40 ----------
 .../plasma-workspace-5.14.80-startkde-script.patch | 39 ----------
 .../plasma-workspace-5.16.3-x11sessionrename.patch | 91 ----------------------
 ...asma-workspace-5.16.4-no-share-dataengine.patch | 25 ------
 4 files changed, 195 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch
deleted file mode 100644
index de56ffe236..0000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a9b685f0dab7f21dfa3ed55011c035bab1c972d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= <koalinux@×××××.com>
-Date: Tue, 1 Aug 2017 23:09:24 +0300
-Subject: [PATCH] Source files in /etc/plasma/{startup,shutdown}
-
----
- startkde/startplasmacompositor.cmake | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
-index 5bcf26a..e965f19 100644
---- a/startkde/startplasmacompositor.cmake
-+++ b/startkde/startplasmacompositor.cmake
-@@ -157,6 +157,11 @@ for prefix in `echo $scriptpath`; do
-   done
- done
-
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- echo 'startplasmacompositor: Starting up...'  1>&2
-
- # Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
-@@ -232,6 +237,11 @@ fi
-
- echo 'startplasmacompositor: Shutting down...'  1>&2
-
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- unset KDE_FULL_SESSION
- xprop -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
---
-2.13.0
-

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch
deleted file mode 100644
index 44e86a0169..0000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bf569560bf195ac4e79d65d4103a7161a6a2f2ac Mon Sep 17 00:00:00 2001
-From: Elias Probst <mail@×××××××××××.eu>
-Date: Sat, 4 Jul 2015 11:33:01 +0200
-Subject: [PATCH] [startkde] Gentoo FHS script support
-
----
- startkde/startkde.cmake | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 2585600..9350158 100644
---- a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -210,6 +210,11 @@ for prefix in `echo $scriptpath`; do
-   done
- done
- 
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
- # from some users that they're confused and don't know what to do. This is
- # especially necessary on slow machines, where starting KDE takes one or two
-@@ -417,6 +422,11 @@ for prefix in `echo "$scriptpath"`; do
-   done
- done
- 
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- unset KDE_FULL_SESSION
- xprop -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
--- 
-2.3.6

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch
deleted file mode 100644
index a851f5f54b..0000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From bcabb38b1f07a52847752fb54eb61696a1312a61 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@g.o>
-Date: Tue, 2 Jul 2019 10:13:54 +0200
-Subject: [PATCH] Fix Name conflict between plasma.desktop and
- plasmawayland.desktop
-
-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 on Xorg" 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
-
-Reviewers: #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D22210
----
- plasma.desktop.cmake | 46 +----------------------------
- 1 file changed, 1 insertion(+), 45 deletions(-)
-
-diff --git a/plasma.desktop.cmake b/plasma.desktop.cmake
-index 4d361606d..099de2908 100644
---- a/plasma.desktop.cmake
-+++ b/plasma.desktop.cmake
-@@ -3,51 +3,7 @@ Type=XSession
- Exec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11
- TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11
- 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 on Xorg
- Comment=Plasma by KDE
- Comment[ar]=بلازما كدي
- Comment[bs]=Plazma od strane KDe
--- 
-2.22.0
-

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch
deleted file mode 100644
index dc5214b303..0000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-See also: https://phabricator.kde.org/D22691
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,7 @@
- include(KDEPackageAppTemplates)
- 
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
--                    Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet
-+                    Plasma DocTools Runner NotifyConfig Su NewStuff Wallet
-                     IdleTime Declarative I18n KCMUtils TextWidgets KDELibs4Support Crash GlobalAccel
-                     DBusAddons Wayland CoreAddons)
- find_package(KDED CONFIG REQUIRED)
-diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
---- a/dataengines/CMakeLists.txt
-+++ b/dataengines/CMakeLists.txt
-@@ -24,7 +24,6 @@
- add_subdirectory(time)
- add_subdirectory(weather)
- add_subdirectory(statusnotifieritem)
--add_subdirectory(share)
- 
- if(NOT WIN32)
-   add_subdirectory(mouse)