diff options
| author | Elias Probst <mail@eliasprobst.eu> | 2015-07-04 11:35:23 +0200 |
|---|---|---|
| committer | Elias Probst <mail@eliasprobst.eu> | 2015-07-04 15:09:11 +0200 |
| commit | 2e88b36c1e59478154b4ee8899c38917c3bb8e5f (patch) | |
| tree | 21d7fba7e8dbe9ec1f89e1752a497f31b421e9df | |
| parent | a0b21671451b0d01ae10743c9576c80dfc9563bb (diff) | |
| download | kde-2e88b36c1e59478154b4ee8899c38917c3bb8e5f.tar.gz kde-2e88b36c1e59478154b4ee8899c38917c3bb8e5f.tar.bz2 kde-2e88b36c1e59478154b4ee8899c38917c3bb8e5f.zip | |
[kde-plasma/plasma-workspace] Update startkde Gentoo FHS patch for 5.4
Package-Manager: portage-2.2.20
| -rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.4-startkde-script.patch | 40 | ||||
| -rw-r--r-- | kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 2 |
2 files changed, 41 insertions, 1 deletions
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-startkde-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-startkde-script.patch new file mode 100644 index 00000000000..1630080ca2c --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-startkde-script.patch @@ -0,0 +1,40 @@ +From bf569560bf195ac4e79d65d4103a7161a6a2f2ac Mon Sep 17 00:00:00 2001 +From: Elias Probst <mail@eliasprobst.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 ++ + # Activate the kde font directories. + # + # There are 4 directories that may be used for supplying fonts for KDE. +@@ -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/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 6c2b55a0b04..5a4bbde6d05 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -121,7 +121,7 @@ DEPEND="${COMMON_DEPEND} x11-proto/xproto " -PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" ) RESTRICT="test" |