[gentoo-commits] proj/kde:master commit in: kde-base/ksmserver/files/, kde-base/ksmserver/

[Andreas Hüttel]

commit:     a0c8524a99ac149deb12ebf0b8fa024cf613a8cb
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  1 19:43:52 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 19:43:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a0c8524a

[kde-base/ksmserver] update noplasmalock patch

---
 .../files/ksmserver-4.11.97-noplasmalock.patch      | 21 +++++++++++++++++++++
 kde-base/ksmserver/ksmserver-9999.ebuild            |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch b/kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch
new file mode 100644
index 0000000..e41d58b
--- /dev/null
+++ b/kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch
@@ -0,0 +1,21 @@
+diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp
+index 6490145..2403b45 100644
+--- a/ksmserver/screenlocker/ksldapp.cpp
++++ b/ksmserver/screenlocker/ksldapp.cpp
+@@ -286,16 +286,11 @@ void KSldApp::lockProcessReady()
+ 
+ bool KSldApp::startLockProcess(bool immediateLock)
+ {
+-    if (m_plasmaEnabled) {
+-        m_lockProcess->start(KStandardDirs::findExe(QLatin1String("plasma-overlay")),
+-                             QStringList() << QLatin1String("--nofork"));
+-    } else {
+         QStringList args;
+         if (immediateLock) {
+             args << "--immediateLock";
+         }
+         m_lockProcess->start(KStandardDirs::findExe(QLatin1String("kscreenlocker_greet")), args);
+-    }
+     // we wait one minute
+     if (!m_lockProcess->waitForStarted(60000)) {
+         m_lockProcess->kill();

diff --git a/kde-base/ksmserver/ksmserver-9999.ebuild b/kde-base/ksmserver/ksmserver-9999.ebuild
index 44f6f16..cb33c93 100644
--- a/kde-base/ksmserver/ksmserver-9999.ebuild
+++ b/kde-base/ksmserver/ksmserver-9999.ebuild
@@ -33,4 +33,4 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace"
 
-PATCHES=( "${FILESDIR}/${PN}-4.10.50-noplasmalock.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.11.97-noplasmalock.patch" )