diff options
| author | Johannes Huber <johu@gentoo.org> | 2014-04-25 00:42:23 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2014-04-25 00:42:23 +0200 |
| commit | 40ecbc5ec5119db3d40135e736b1e8379969149f (patch) | |
| tree | 77c553a99eb0b17ef8a8772ea0987f8331396f19 | |
| parent | f2b04bdc93f256945d0b1141df70b7756bf805d9 (diff) | |
| download | kde-40ecbc5ec5119db3d40135e736b1e8379969149f.tar.gz kde-40ecbc5ec5119db3d40135e736b1e8379969149f.tar.bz2 kde-40ecbc5ec5119db3d40135e736b1e8379969149f.zip | |
[kde-base/ksmserver] Re-enable plasma lock
Package-Manager: portage-2.2.10
| -rw-r--r-- | kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch | 21 | ||||
| -rw-r--r-- | kde-base/ksmserver/ksmserver-4.11.49.9999.ebuild | 2 |
2 files changed, 0 insertions, 23 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 deleted file mode 100644 index e41d58bbe69..00000000000 --- a/kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch +++ /dev/null @@ -1,21 +0,0 @@ -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-4.11.49.9999.ebuild b/kde-base/ksmserver/ksmserver-4.11.49.9999.ebuild index 43fdf0d5477..18ca2179aa2 100644 --- a/kde-base/ksmserver/ksmserver-4.11.49.9999.ebuild +++ b/kde-base/ksmserver/ksmserver-4.11.49.9999.ebuild @@ -34,5 +34,3 @@ KMEXTRACTONLY=" " KMLOADLIBS="libkworkspace" - -PATCHES=( "${FILESDIR}/${PN}-4.11.97-noplasmalock.patch" ) |