From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 48D58139694 for ; Wed, 2 Aug 2017 23:22:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5457E0D2E; Wed, 2 Aug 2017 23:22:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77170E0D2E for ; Wed, 2 Aug 2017 23:22:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F4A43418BC for ; Wed, 2 Aug 2017 23:22:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A02575EB for ; Wed, 2 Aug 2017 23:22:40 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1501715314.94f86d4d9e93668733123cad4cf43cea6f837e19.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ kde-plasma/plasma-workspace/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 94f86d4d9e93668733123cad4cf43cea6f837e19 X-VCS-Branch: master Date: Wed, 2 Aug 2017 23:22:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d502bec5-e167-4f71-a0c9-6f5ba3256019 X-Archives-Hash: b5eabb45f472311bcf97ac17328d5908 commit: 94f86d4d9e93668733123cad4cf43cea6f837e19 Author: José Pekkarinen gmail com> AuthorDate: Wed Aug 2 22:13:02 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 2 23:08:34 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=94f86d4d kde-plasma/plasma-workspace: Gentoo FHS script support for Wayland session Gentoo-bug: 626746 Package-Manager: Portage-2.3.6, Repoman-2.3.1 ...rkspace-5.10-startplasmacompositor-script.patch | 40 ++++++++++++++++++++++ .../plasma-workspace-5.10.49.9999.ebuild | 1 + .../plasma-workspace/plasma-workspace-9999.ebuild | 1 + 3 files changed, 42 insertions(+) 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 new file mode 100644 index 0000000000..de56ffe236 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch @@ -0,0 +1,40 @@ +From a9b685f0dab7f21dfa3ed55011c035bab1c972d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +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/plasma-workspace-5.10.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild index cbd22c5842..ae70767907 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.49.9999.ebuild @@ -121,6 +121,7 @@ DEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" + "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" "${FILESDIR}/${PN}-5.10.4-unused-dep.patch" ) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index cbd22c5842..ae70767907 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -121,6 +121,7 @@ DEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" + "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" "${FILESDIR}/${PN}-5.10.4-unused-dep.patch" )