diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-03-26 22:09:24 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-03-26 22:09:24 +0000 |
| commit | 4fb7ca2cf07259307766c6a31113f2a690ca02f6 (patch) | |
| tree | a1ae5f295a570defaf5b755bdbad823acc74d01b | |
| parent | Move nss_myhostname back to /usr -- it seems that nss handles this well. (diff) | |
| download | gentoo-2-4fb7ca2cf07259307766c6a31113f2a690ca02f6.tar.gz gentoo-2-4fb7ca2cf07259307766c6a31113f2a690ca02f6.tar.bz2 gentoo-2-4fb7ca2cf07259307766c6a31113f2a690ca02f6.zip | |
Hard-disable plasma screen locker, bug 462152
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
| -rw-r--r-- | kde-base/ksmserver/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch | 22 | ||||
| -rw-r--r-- | kde-base/ksmserver/ksmserver-4.10.1-r1.ebuild | 32 |
3 files changed, 61 insertions, 1 deletions
diff --git a/kde-base/ksmserver/ChangeLog b/kde-base/ksmserver/ChangeLog index a94b126c3a98..655c29ecab89 100644 --- a/kde-base/ksmserver/ChangeLog +++ b/kde-base/ksmserver/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/ksmserver # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.243 2013/03/06 13:41:25 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.244 2013/03/26 22:09:24 dilfridge Exp $ + +*ksmserver-4.10.1-r1 (26 Mar 2013) + + 26 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> + +ksmserver-4.10.1-r1.ebuild, +files/ksmserver-4.10.1-noplasmalock.patch: + Hard-disable plasma screen locker, bug 462152 *ksmserver-4.10.1 (06 Mar 2013) diff --git a/kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch b/kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch new file mode 100644 index 000000000000..7f7e918b1e27 --- /dev/null +++ b/kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch @@ -0,0 +1,22 @@ +diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp +index 22755ea..9e43c36 100644 +--- a/ksmserver/screenlocker/ksldapp.cpp ++++ b/ksmserver/screenlocker/ksldapp.cpp +@@ -271,12 +271,12 @@ void KSldApp::lockProcessFinished(int exitCode, QProcess::ExitStatus exitStatus) + + bool KSldApp::startLockProcess() + { +- if (m_plasmaEnabled) { +- m_lockProcess->setProgram(KStandardDirs::findExe(QLatin1String("plasma-overlay"))); +- *m_lockProcess << QLatin1String("--nofork"); +- } else { ++// if (m_plasmaEnabled) { ++// m_lockProcess->setProgram(KStandardDirs::findExe(QLatin1String("plasma-overlay"))); ++// *m_lockProcess << QLatin1String("--nofork"); ++// } else { + m_lockProcess->setProgram(KStandardDirs::findExe(QLatin1String("kscreenlocker_greet"))); +- } ++// } + m_lockProcess->start(); + // we wait one minute + if (!m_lockProcess->waitForStarted()) { diff --git a/kde-base/ksmserver/ksmserver-4.10.1-r1.ebuild b/kde-base/ksmserver/ksmserver-4.10.1-r1.ebuild new file mode 100644 index 000000000000..915800e88b16 --- /dev/null +++ b/kde-base/ksmserver/ksmserver-4.10.1-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.10.1-r1.ebuild,v 1.1 2013/03/26 22:09:24 dilfridge Exp $ + +EAPI=5 + +KMNAME="kde-workspace" +inherit kde4-meta + +DESCRIPTION="The reliable KDE session manager that talks the standard X11R6" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug" + +DEPEND=" + $(add_kdebase_dep kcminit) + $(add_kdebase_dep libkworkspace) + $(add_kdebase_dep solid) +" +RDEPEND="${DEPEND}" + +KMEXTRACTONLY=" + kcminit/main.h + libs/kdm/kgreeterplugin.h + kcheckpass/ + libs/kephal/ + libs/kworkspace/ + solid/ +" + +KMLOADLIBS="libkworkspace" + +PATCHES=( "${FILESDIR}/${P}-noplasmalock.patch" ) |