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

[Johannes Huber]

commit:     8fa54cd6d88ef68a00c86b714529ff46e8f4a5cb
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 17:02:57 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 17:02:57 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8fa54cd6

Revert "[kde-base/ksmserver] remove noplasmalock patches"

Please read bug mails before doing something.

This reverts commit 45a25aa79cec4d72c4c5163f1fb15a99374b3d77.

---
 .../files/ksmserver-4.10.1-noplasmalock.patch      | 22 ++++++++++++++++++++++
 .../files/ksmserver-4.10.50-noplasmalock.patch     | 22 ++++++++++++++++++++++
 kde-base/ksmserver/ksmserver-4.11.49.9999.ebuild   |  2 +-
 kde-base/ksmserver/ksmserver-9999.ebuild           |  2 +-
 4 files changed, 46 insertions(+), 2 deletions(-)

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 0000000..7f7e918
--- /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/files/ksmserver-4.10.50-noplasmalock.patch b/kde-base/ksmserver/files/ksmserver-4.10.50-noplasmalock.patch
new file mode 100644
index 0000000..4e3753a
--- /dev/null
+++ b/kde-base/ksmserver/files/ksmserver-4.10.50-noplasmalock.patch
@@ -0,0 +1,22 @@
+diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp
+index f0526cf..feb3c8e 100644
+--- a/ksmserver/screenlocker/ksldapp.cpp
++++ b/ksmserver/screenlocker/ksldapp.cpp
+@@ -278,12 +278,12 @@ void KSldApp::lockProcessReady()
+ 
+ bool KSldApp::startLockProcess()
+ {
+-    if (m_plasmaEnabled) {
+-        m_lockProcess->start(KStandardDirs::findExe(QLatin1String("plasma-overlay")),
+-                             QStringList() << QLatin1String("--nofork"));
+-    } else {
++//    if (m_plasmaEnabled) {
++//        m_lockProcess->start(KStandardDirs::findExe(QLatin1String("plasma-overlay")),
++//                             QStringList() << QLatin1String("--nofork"));
++//    } else {
+         m_lockProcess->start(KStandardDirs::findExe(QLatin1String("kscreenlocker_greet")));
+-    }
++//    }
+     // we wait one minute
+     if (!m_lockProcess->waitForStarted(60000)) {
+         m_lockProcess->kill();

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

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