| 1 |
commit: 84ca3c2bca444e7c1d3aa8bdac3b1d947cf19172 |
| 2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 26 22:14:15 2013 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 26 22:14:28 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=84ca3c2b |
| 7 |
|
| 8 |
[kde-base/ksmserver] Hard-disable plasma screen locker, bug 462152 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.0_alpha169 |
| 11 |
|
| 12 |
--- |
| 13 |
.../files/ksmserver-4.10.1-noplasmalock.patch | 22 ++++++++++++++++++++ |
| 14 |
kde-base/ksmserver/ksmserver-4.10.49.9999.ebuild | 2 + |
| 15 |
kde-base/ksmserver/ksmserver-9999.ebuild | 2 + |
| 16 |
3 files changed, 26 insertions(+), 0 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch b/kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..7f7e918 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch |
| 23 |
@@ -0,0 +1,22 @@ |
| 24 |
+diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp |
| 25 |
+index 22755ea..9e43c36 100644 |
| 26 |
+--- a/ksmserver/screenlocker/ksldapp.cpp |
| 27 |
++++ b/ksmserver/screenlocker/ksldapp.cpp |
| 28 |
+@@ -271,12 +271,12 @@ void KSldApp::lockProcessFinished(int exitCode, QProcess::ExitStatus exitStatus) |
| 29 |
+ |
| 30 |
+ bool KSldApp::startLockProcess() |
| 31 |
+ { |
| 32 |
+- if (m_plasmaEnabled) { |
| 33 |
+- m_lockProcess->setProgram(KStandardDirs::findExe(QLatin1String("plasma-overlay"))); |
| 34 |
+- *m_lockProcess << QLatin1String("--nofork"); |
| 35 |
+- } else { |
| 36 |
++// if (m_plasmaEnabled) { |
| 37 |
++// m_lockProcess->setProgram(KStandardDirs::findExe(QLatin1String("plasma-overlay"))); |
| 38 |
++// *m_lockProcess << QLatin1String("--nofork"); |
| 39 |
++// } else { |
| 40 |
+ m_lockProcess->setProgram(KStandardDirs::findExe(QLatin1String("kscreenlocker_greet"))); |
| 41 |
+- } |
| 42 |
++// } |
| 43 |
+ m_lockProcess->start(); |
| 44 |
+ // we wait one minute |
| 45 |
+ if (!m_lockProcess->waitForStarted()) { |
| 46 |
|
| 47 |
diff --git a/kde-base/ksmserver/ksmserver-4.10.49.9999.ebuild b/kde-base/ksmserver/ksmserver-4.10.49.9999.ebuild |
| 48 |
index 1239683..d33c6ac 100644 |
| 49 |
--- a/kde-base/ksmserver/ksmserver-4.10.49.9999.ebuild |
| 50 |
+++ b/kde-base/ksmserver/ksmserver-4.10.49.9999.ebuild |
| 51 |
@@ -28,3 +28,5 @@ KMEXTRACTONLY=" |
| 52 |
" |
| 53 |
|
| 54 |
KMLOADLIBS="libkworkspace" |
| 55 |
+ |
| 56 |
+PATCHES=( "${FILESDIR}/${PN}-4.10.1-noplasmalock.patch" ) |
| 57 |
|
| 58 |
diff --git a/kde-base/ksmserver/ksmserver-9999.ebuild b/kde-base/ksmserver/ksmserver-9999.ebuild |
| 59 |
index 1239683..d33c6ac 100644 |
| 60 |
--- a/kde-base/ksmserver/ksmserver-9999.ebuild |
| 61 |
+++ b/kde-base/ksmserver/ksmserver-9999.ebuild |
| 62 |
@@ -28,3 +28,5 @@ KMEXTRACTONLY=" |
| 63 |
" |
| 64 |
|
| 65 |
KMLOADLIBS="libkworkspace" |
| 66 |
+ |
| 67 |
+PATCHES=( "${FILESDIR}/${PN}-4.10.1-noplasmalock.patch" ) |
Archives