diff options
-rw-r--r-- | kde-base/ksmserver/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch | 22 |
2 files changed, 5 insertions, 23 deletions
diff --git a/kde-base/ksmserver/ChangeLog b/kde-base/ksmserver/ChangeLog index ec07375f0e8c..3fa088fafb67 100644 --- a/kde-base/ksmserver/ChangeLog +++ b/kde-base/ksmserver/ChangeLog @@ -1,6 +1,10 @@ # 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.289 2013/12/12 03:37:19 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.290 2013/12/14 22:11:48 johu Exp $ + + 14 Dec 2013; Johannes Huber <johu@gentoo.org> + -files/ksmserver-4.10.1-noplasmalock.patch: + Remove unused patch. 12 Dec 2013; Agostino Sarubbo <ago@gentoo.org> -ksmserver-4.10.5.ebuild: Remove old diff --git a/kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch b/kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch deleted file mode 100644 index 7f7e918b1e27..000000000000 --- a/kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch +++ /dev/null @@ -1,22 +0,0 @@ -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()) { |