diff options
| author | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2013-12-01 20:43:52 +0100 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2013-12-01 20:43:52 +0100 |
| commit | a0c8524a99ac149deb12ebf0b8fa024cf613a8cb (patch) | |
| tree | 3c2cc9534ac6a5dd3205dd06b60b5e1147c7f0d2 | |
| parent | 93bd53c9b09aa8ca7ce323c16f99ddfc4a831b0c (diff) | |
| download | kde-a0c8524a99ac149deb12ebf0b8fa024cf613a8cb.tar.gz kde-a0c8524a99ac149deb12ebf0b8fa024cf613a8cb.tar.bz2 kde-a0c8524a99ac149deb12ebf0b8fa024cf613a8cb.zip | |
[kde-base/ksmserver] update noplasmalock patch
| -rw-r--r-- | kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch | 21 | ||||
| -rw-r--r-- | kde-base/ksmserver/ksmserver-9999.ebuild | 2 |
2 files changed, 22 insertions, 1 deletions
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 00000000000..e41d58bbe69 --- /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 44f6f1614a0..cb33c930e6f 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" ) |