public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-base/ksmserver/files/, kde-base/ksmserver/
@ 2013-03-26 22:13 Andreas Hüttel
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Hüttel @ 2013-03-26 22:13 UTC (permalink / raw
  To: gentoo-commits

commit:     84ca3c2bca444e7c1d3aa8bdac3b1d947cf19172
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 22:14:15 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 22:14:28 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=84ca3c2b

[kde-base/ksmserver] Hard-disable plasma screen locker, bug 462152

Package-Manager: portage-2.2.0_alpha169

---
 .../files/ksmserver-4.10.1-noplasmalock.patch      |   22 ++++++++++++++++++++
 kde-base/ksmserver/ksmserver-4.10.49.9999.ebuild   |    2 +
 kde-base/ksmserver/ksmserver-9999.ebuild           |    2 +
 3 files changed, 26 insertions(+), 0 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/ksmserver-4.10.49.9999.ebuild b/kde-base/ksmserver/ksmserver-4.10.49.9999.ebuild
index 1239683..d33c6ac 100644
--- a/kde-base/ksmserver/ksmserver-4.10.49.9999.ebuild
+++ b/kde-base/ksmserver/ksmserver-4.10.49.9999.ebuild
@@ -28,3 +28,5 @@ KMEXTRACTONLY="
 "
 
 KMLOADLIBS="libkworkspace"
+
+PATCHES=( "${FILESDIR}/${PN}-4.10.1-noplasmalock.patch" )

diff --git a/kde-base/ksmserver/ksmserver-9999.ebuild b/kde-base/ksmserver/ksmserver-9999.ebuild
index 1239683..d33c6ac 100644
--- a/kde-base/ksmserver/ksmserver-9999.ebuild
+++ b/kde-base/ksmserver/ksmserver-9999.ebuild
@@ -28,3 +28,5 @@ KMEXTRACTONLY="
 "
 
 KMLOADLIBS="libkworkspace"
+
+PATCHES=( "${FILESDIR}/${PN}-4.10.1-noplasmalock.patch" )


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/ksmserver/files/, kde-base/ksmserver/
@ 2013-05-10  9:44 Jonathan Callen
  0 siblings, 0 replies; 8+ messages in thread
From: Jonathan Callen @ 2013-05-10  9:44 UTC (permalink / raw
  To: gentoo-commits

commit:     b84c1c23fae6298a15046983ac55ac58da5e9ec2
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 09:16:43 2013 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Fri May 10 09:16:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b84c1c23

[kde-base/ksmserver] Update patch, remove unneeded solid dep

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

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-9999.ebuild b/kde-base/ksmserver/ksmserver-9999.ebuild
index f164aee..44f6f16 100644
--- a/kde-base/ksmserver/ksmserver-9999.ebuild
+++ b/kde-base/ksmserver/ksmserver-9999.ebuild
@@ -15,7 +15,6 @@ IUSE="debug"
 DEPEND="
 	$(add_kdebase_dep kcminit)
 	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep solid)
 	media-libs/qimageblitz
 	x11-libs/libICE
 	x11-libs/libSM
@@ -30,9 +29,8 @@ KMEXTRACTONLY="
 	kcheckpass/
 	libs/kephal/
 	libs/kworkspace/
-	solid/
 "
 
 KMLOADLIBS="libkworkspace"
 
-PATCHES=( "${FILESDIR}/${PN}-4.10.1-noplasmalock.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.10.50-noplasmalock.patch" )


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/ksmserver/files/, kde-base/ksmserver/
@ 2013-11-23 16:39 Marc Schiffbauer
  0 siblings, 0 replies; 8+ messages in thread
From: Marc Schiffbauer @ 2013-11-23 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     45a25aa79cec4d72c4c5163f1fb15a99374b3d77
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 16:39:06 2013 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 16:39:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=45a25aa7

[kde-base/ksmserver] remove noplasmalock patches

Package-Manager: portage-2.2.7

---
 .../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, 2 insertions(+), 46 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
deleted file mode 100644
index 7f7e918..0000000
--- a/kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 4e3753a..0000000
--- a/kde-base/ksmserver/files/ksmserver-4.10.50-noplasmalock.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 44f6f16..f1eea4d 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=( "${FILESDIR}/${PN}-4.10.50-noplasmalock.patch" )
+PATCHES=( )

diff --git a/kde-base/ksmserver/ksmserver-9999.ebuild b/kde-base/ksmserver/ksmserver-9999.ebuild
index 44f6f16..f1eea4d 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=( )


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/ksmserver/files/, kde-base/ksmserver/
@ 2013-11-23 18:03 Johannes Huber
  0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2013-11-23 18:03 UTC (permalink / raw
  To: gentoo-commits

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" )


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/ksmserver/files/, kde-base/ksmserver/
@ 2013-12-01 19:42 Andreas Hüttel
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Hüttel @ 2013-12-01 19:42 UTC (permalink / raw
  To: gentoo-commits

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" )


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/ksmserver/files/, kde-base/ksmserver/
@ 2013-12-02 18:50 David Heidelberger
  0 siblings, 0 replies; 8+ messages in thread
From: David Heidelberger @ 2013-12-02 18:50 UTC (permalink / raw
  To: gentoo-commits

commit:     eaa6f9664ca0a52d635978b96123f917f18a832c
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Mon Dec  2 18:44:27 2013 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Mon Dec  2 18:44:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eaa6f966

kde-base/ksmserver: 4.11.3-r1, get qmllockscreen work on multi screen setup (picked from 4.11.4)

---
 .../files/ksmserver-4.11.3-fixmultimonitor.patch   | 210 +++++++++++++++++++++
 kde-base/ksmserver/ksmserver-4.11.3-r1.ebuild      |  39 ++++
 2 files changed, 249 insertions(+)

diff --git a/kde-base/ksmserver/files/ksmserver-4.11.3-fixmultimonitor.patch b/kde-base/ksmserver/files/ksmserver-4.11.3-fixmultimonitor.patch
new file mode 100644
index 0000000..061868a
--- /dev/null
+++ b/kde-base/ksmserver/files/ksmserver-4.11.3-fixmultimonitor.patch
@@ -0,0 +1,210 @@
+From 3a4a7ac959c17ffd08b104bc4c5d550b5f1dfcb6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
+Date: Sat, 26 Jan 2013 22:27:48 +0100
+Subject: [PATCH] improve screenlocker multiscreen behavior
+
+- pass focus to greeter under the mouse
+- share keyboard events
+- let through keyboard events for one hidden locker
+  (mouse wakeup case)
+- remove double filtering
+
+BUG: 311188
+FIXED-IN: 4.11.4
+REVIEW: 113971
+---
+ ksmserver/screenlocker/greeter/greeterapp.cpp | 92 +++++++++++++++++++++++++--
+ ksmserver/screenlocker/greeter/greeterapp.h   |  1 +
+ 2 files changed, 87 insertions(+), 6 deletions(-)
+
+diff --git a/ksmserver/screenlocker/greeter/greeterapp.cpp b/ksmserver/screenlocker/greeter/greeterapp.cpp
+index 30987c1..c5e2f85 100644
+--- a/ksmserver/screenlocker/greeter/greeterapp.cpp
++++ b/ksmserver/screenlocker/greeter/greeterapp.cpp
+@@ -32,6 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include <KDE/KDebug>
+ #include <KDE/KStandardDirs>
+ #include <KDE/KUser>
++#include <KDE/KWindowSystem>
+ #include <Solid/PowerManagement>
+ #include <kdeclarative.h>
+ //Plasma
+@@ -52,6 +53,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include <X11/Xlib.h>
+ #include <fixx11h.h>
+ 
++// this is usable to fake a "screensaver" installation for testing
++// *must* be "0" for every public commit!
++#define TEST_SCREENSAVER 0
++
+ namespace ScreenLocker
+ {
+ 
+@@ -98,7 +103,11 @@ void UnlockApp::initialize()
+     KCrash::setDrKonqiEnabled(false);
+ 
+     KScreenSaverSettings::self()->readConfig();
++#if TEST_SCREENSAVER
++    m_showScreenSaver = true;
++#else
+     m_showScreenSaver = KScreenSaverSettings::legacySaverEnabled();
++#endif
+ 
+     m_structure = Plasma::PackageStructure::load("Plasma/Generic");
+     m_package = new Plasma::Package(KStandardDirs::locate("data", "ksmserver/screenlocker/"), KScreenSaverSettings::greeterQML(), m_structure);
+@@ -148,7 +157,6 @@ void UnlockApp::desktopResized()
+                 this, SLOT(viewStatusChanged(QDeclarativeView::Status)));
+         view->setWindowFlags(Qt::X11BypassWindowManagerHint);
+         view->setFrameStyle(QFrame::NoFrame);
+-        view->installEventFilter(this);
+ 
+         // engine stuff
+         KDeclarative kdeclarative;
+@@ -232,11 +240,15 @@ void UnlockApp::desktopResized()
+             ScreenSaverWindow *screensaverWindow = m_screensaverWindows.at(i);
+             screensaverWindow->setGeometry(view->geometry());
+ 
++#if TEST_SCREENSAVER
++            screensaverWindow->setAutoFillBackground(true);
++#else
+             QPixmap backgroundPix(screensaverWindow->size());
+             QPainter p(&backgroundPix);
+             view->render(&p);
+             p.end();
+             screensaverWindow->setBackground(backgroundPix);
++#endif
+             screensaverWindow->show();
+             screensaverWindow->activateWindow();
+             connect(screensaverWindow, SIGNAL(hidden()), this, SLOT(getFocus()));
+@@ -244,14 +256,52 @@ void UnlockApp::desktopResized()
+     }
+     // random state update, actually rather required on init only
+     QMetaObject::invokeMethod(this, "getFocus", Qt::QueuedConnection);
++    // getFocus on the next event cycle does not work as expected for multiple views
++    // if there's no screensaver, hiding it won't happen and thus not trigger getFocus either
++    // so we call it again in a few miliseconds - the value is nearly random but "must cross some event cycles"
++    // while 150ms worked for me, 250ms gets us a bit more padding without being notable to a human user
++    if (nScreens > 1 && m_screensaverWindows.isEmpty()) {
++        QTimer::singleShot(250, this, SLOT(getFocus()));
++    }
+     capsLocked();
+ }
+ 
+ void UnlockApp::getFocus()
+ {
+-    if (!m_views.isEmpty()) {
+-        m_views.first()->activateWindow();
++    if (m_views.isEmpty()) {
++        return;
+     }
++    QWidget *w = 0;
++    // this loop is required to make the qml/graphicsscene properly handle the shared keyboard input
++    // ie. "type something into the box of every greeter"
++    foreach (QDeclarativeView *view, m_views) {
++        view->activateWindow();
++        view->grabKeyboard();
++        view->setFocus(Qt::OtherFocusReason);
++    }
++    // determine which window should actually be active and have the real input focus/grab
++    foreach (QDeclarativeView *view, m_views) {
++        if (view->underMouse()) {
++            w = view;
++            break;
++        }
++    }
++    if (!w) { // try harder
++        foreach (QDeclarativeView *view, m_views) {
++            if (view->geometry().contains(QCursor::pos())) {
++                w = view;
++                break;
++            }
++        }
++    }
++    if (!w) { // fallback solution
++        w = m_views.first();
++    }
++    // activate window and grab input to be sure it really ends up there.
++    // focus setting is still required for proper internal QWidget state (and eg. visual reflection)
++    w->grabKeyboard();
++    w->activateWindow();
++    w->setFocus(Qt::OtherFocusReason);
+ }
+ 
+ void UnlockApp::setLockedPropertyOnViews()
+@@ -354,14 +404,15 @@ bool UnlockApp::eventFilter(QObject *obj, QEvent *event)
+ 
+     static bool ignoreNextEscape = false;
+     if (event->type() == QEvent::KeyPress) { // react if saver is visible
+-        bool saverVisible = false;
++        bool saverVisible = !m_screensaverWindows.isEmpty();
+         foreach (ScreenSaverWindow *screensaverWindow, m_screensaverWindows) {
+-            if (screensaverWindow->isVisible()) {
+-                saverVisible = true;
++            if (!screensaverWindow->isVisible()) {
++                saverVisible = false;
+                 break;
+             }
+         }
+         if (!saverVisible) {
++            shareEvent(event, qobject_cast<QDeclarativeView*>(obj));
+             return false; // we don't care
+         }
+         ignoreNextEscape = bool(static_cast<QKeyEvent *>(event)->key() == Qt::Key_Escape);
+@@ -378,6 +429,7 @@ bool UnlockApp::eventFilter(QObject *obj, QEvent *event)
+             return false;
+         }
+         if (ke->key() != Qt::Key_Escape) {
++            shareEvent(event, qobject_cast<QDeclarativeView*>(obj));
+             return false; // irrelevant
+         }
+         if (ignoreNextEscape) {
+@@ -428,6 +480,34 @@ void UnlockApp::capsLocked()
+     }
+ }
+ 
++/*
++ * This function forwards an event from one greeter window to all others
++ * It's used to have the keyboard operate on all greeter windows (on every screen)
++ * at once so that the user gets visual feedback on the screen he's looking at -
++ * even if the focus is actually on a powered off screen.
++ */
++
++void UnlockApp::shareEvent(QEvent *e, QDeclarativeView *from)
++{
++    // from can be NULL any time (because the parameter is passed as qobject_cast)
++    // m_views.contains(from) is atm. supposed to be true but required if any further
++    // QDeclarativeViews are added (which are not part of m_views)
++    // this makes "from" an optimization (nullptr check aversion)
++    if (from && m_views.contains(from)) {
++        // NOTICE any recursion in the event sharing will prevent authentication on multiscreen setups!
++        // Any change in regarded event processing shall be tested thoroughly!
++        removeEventFilter(this); // prevent recursion!
++        const bool accepted = e->isAccepted(); // store state
++        foreach (QDeclarativeView *view, m_views) {
++            if (view != from) {
++                QApplication::sendEvent(view, e);
++                e->setAccepted(accepted);
++            }
++        }
++        installEventFilter(this);
++    }
++}
++
+ } // namespace
+ 
+ #include "greeterapp.moc"
+diff --git a/ksmserver/screenlocker/greeter/greeterapp.h b/ksmserver/screenlocker/greeter/greeterapp.h
+index 76b9824..8b79188 100644
+--- a/ksmserver/screenlocker/greeter/greeterapp.h
++++ b/ksmserver/screenlocker/greeter/greeterapp.h
+@@ -63,6 +63,7 @@ private Q_SLOTS:
+ private:
+     void initialize();
+     void capsLocked();
++    void shareEvent(QEvent *e, QDeclarativeView *from);
+ 
+     QString m_mainQmlPath;
+     QList<QDeclarativeView*> m_views;
+-- 
+1.8.4.4
+

diff --git a/kde-base/ksmserver/ksmserver-4.11.3-r1.ebuild b/kde-base/ksmserver/ksmserver-4.11.3-r1.ebuild
new file mode 100644
index 0000000..4c34cbf
--- /dev/null
+++ b/kde-base/ksmserver/ksmserver-4.11.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DECLARATIVE_REQUIRED="always"
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kcminit)
+	$(add_kdebase_dep libkworkspace)
+	media-libs/qimageblitz
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXrender
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kcminit/main.h
+	libs/kdm/kgreeterplugin.h
+	kcheckpass/
+	libs/kephal/
+	libs/kworkspace/
+"
+
+KMLOADLIBS="libkworkspace"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.10.50-noplasmalock.patch"
+	"${FILESDIR}/${P}-fixmultimonitor.patch" # picked from 4.11.4
+)


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/ksmserver/files/, kde-base/ksmserver/
@ 2013-12-03 23:10 Johannes Huber
  0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2013-12-03 23:10 UTC (permalink / raw
  To: gentoo-commits

commit:     451b7c9fd3e5d85d5d01e826d54ed54ad1140ea8
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 23:09:33 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 23:09:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=451b7c9f

Revert "kde-base/ksmserver: 4.11.3-r1, get qmllockscreen work on multi screen setup (picked from 4.11.4)"

This reverts commit eaa6f9664ca0a52d635978b96123f917f18a832c.

---
 .../files/ksmserver-4.11.3-fixmultimonitor.patch   | 210 ---------------------
 kde-base/ksmserver/ksmserver-4.11.3-r1.ebuild      |  39 ----
 2 files changed, 249 deletions(-)

diff --git a/kde-base/ksmserver/files/ksmserver-4.11.3-fixmultimonitor.patch b/kde-base/ksmserver/files/ksmserver-4.11.3-fixmultimonitor.patch
deleted file mode 100644
index 061868a..0000000
--- a/kde-base/ksmserver/files/ksmserver-4.11.3-fixmultimonitor.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From 3a4a7ac959c17ffd08b104bc4c5d550b5f1dfcb6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
-Date: Sat, 26 Jan 2013 22:27:48 +0100
-Subject: [PATCH] improve screenlocker multiscreen behavior
-
-- pass focus to greeter under the mouse
-- share keyboard events
-- let through keyboard events for one hidden locker
-  (mouse wakeup case)
-- remove double filtering
-
-BUG: 311188
-FIXED-IN: 4.11.4
-REVIEW: 113971
----
- ksmserver/screenlocker/greeter/greeterapp.cpp | 92 +++++++++++++++++++++++++--
- ksmserver/screenlocker/greeter/greeterapp.h   |  1 +
- 2 files changed, 87 insertions(+), 6 deletions(-)
-
-diff --git a/ksmserver/screenlocker/greeter/greeterapp.cpp b/ksmserver/screenlocker/greeter/greeterapp.cpp
-index 30987c1..c5e2f85 100644
---- a/ksmserver/screenlocker/greeter/greeterapp.cpp
-+++ b/ksmserver/screenlocker/greeter/greeterapp.cpp
-@@ -32,6 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include <KDE/KDebug>
- #include <KDE/KStandardDirs>
- #include <KDE/KUser>
-+#include <KDE/KWindowSystem>
- #include <Solid/PowerManagement>
- #include <kdeclarative.h>
- //Plasma
-@@ -52,6 +53,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include <X11/Xlib.h>
- #include <fixx11h.h>
- 
-+// this is usable to fake a "screensaver" installation for testing
-+// *must* be "0" for every public commit!
-+#define TEST_SCREENSAVER 0
-+
- namespace ScreenLocker
- {
- 
-@@ -98,7 +103,11 @@ void UnlockApp::initialize()
-     KCrash::setDrKonqiEnabled(false);
- 
-     KScreenSaverSettings::self()->readConfig();
-+#if TEST_SCREENSAVER
-+    m_showScreenSaver = true;
-+#else
-     m_showScreenSaver = KScreenSaverSettings::legacySaverEnabled();
-+#endif
- 
-     m_structure = Plasma::PackageStructure::load("Plasma/Generic");
-     m_package = new Plasma::Package(KStandardDirs::locate("data", "ksmserver/screenlocker/"), KScreenSaverSettings::greeterQML(), m_structure);
-@@ -148,7 +157,6 @@ void UnlockApp::desktopResized()
-                 this, SLOT(viewStatusChanged(QDeclarativeView::Status)));
-         view->setWindowFlags(Qt::X11BypassWindowManagerHint);
-         view->setFrameStyle(QFrame::NoFrame);
--        view->installEventFilter(this);
- 
-         // engine stuff
-         KDeclarative kdeclarative;
-@@ -232,11 +240,15 @@ void UnlockApp::desktopResized()
-             ScreenSaverWindow *screensaverWindow = m_screensaverWindows.at(i);
-             screensaverWindow->setGeometry(view->geometry());
- 
-+#if TEST_SCREENSAVER
-+            screensaverWindow->setAutoFillBackground(true);
-+#else
-             QPixmap backgroundPix(screensaverWindow->size());
-             QPainter p(&backgroundPix);
-             view->render(&p);
-             p.end();
-             screensaverWindow->setBackground(backgroundPix);
-+#endif
-             screensaverWindow->show();
-             screensaverWindow->activateWindow();
-             connect(screensaverWindow, SIGNAL(hidden()), this, SLOT(getFocus()));
-@@ -244,14 +256,52 @@ void UnlockApp::desktopResized()
-     }
-     // random state update, actually rather required on init only
-     QMetaObject::invokeMethod(this, "getFocus", Qt::QueuedConnection);
-+    // getFocus on the next event cycle does not work as expected for multiple views
-+    // if there's no screensaver, hiding it won't happen and thus not trigger getFocus either
-+    // so we call it again in a few miliseconds - the value is nearly random but "must cross some event cycles"
-+    // while 150ms worked for me, 250ms gets us a bit more padding without being notable to a human user
-+    if (nScreens > 1 && m_screensaverWindows.isEmpty()) {
-+        QTimer::singleShot(250, this, SLOT(getFocus()));
-+    }
-     capsLocked();
- }
- 
- void UnlockApp::getFocus()
- {
--    if (!m_views.isEmpty()) {
--        m_views.first()->activateWindow();
-+    if (m_views.isEmpty()) {
-+        return;
-     }
-+    QWidget *w = 0;
-+    // this loop is required to make the qml/graphicsscene properly handle the shared keyboard input
-+    // ie. "type something into the box of every greeter"
-+    foreach (QDeclarativeView *view, m_views) {
-+        view->activateWindow();
-+        view->grabKeyboard();
-+        view->setFocus(Qt::OtherFocusReason);
-+    }
-+    // determine which window should actually be active and have the real input focus/grab
-+    foreach (QDeclarativeView *view, m_views) {
-+        if (view->underMouse()) {
-+            w = view;
-+            break;
-+        }
-+    }
-+    if (!w) { // try harder
-+        foreach (QDeclarativeView *view, m_views) {
-+            if (view->geometry().contains(QCursor::pos())) {
-+                w = view;
-+                break;
-+            }
-+        }
-+    }
-+    if (!w) { // fallback solution
-+        w = m_views.first();
-+    }
-+    // activate window and grab input to be sure it really ends up there.
-+    // focus setting is still required for proper internal QWidget state (and eg. visual reflection)
-+    w->grabKeyboard();
-+    w->activateWindow();
-+    w->setFocus(Qt::OtherFocusReason);
- }
- 
- void UnlockApp::setLockedPropertyOnViews()
-@@ -354,14 +404,15 @@ bool UnlockApp::eventFilter(QObject *obj, QEvent *event)
- 
-     static bool ignoreNextEscape = false;
-     if (event->type() == QEvent::KeyPress) { // react if saver is visible
--        bool saverVisible = false;
-+        bool saverVisible = !m_screensaverWindows.isEmpty();
-         foreach (ScreenSaverWindow *screensaverWindow, m_screensaverWindows) {
--            if (screensaverWindow->isVisible()) {
--                saverVisible = true;
-+            if (!screensaverWindow->isVisible()) {
-+                saverVisible = false;
-                 break;
-             }
-         }
-         if (!saverVisible) {
-+            shareEvent(event, qobject_cast<QDeclarativeView*>(obj));
-             return false; // we don't care
-         }
-         ignoreNextEscape = bool(static_cast<QKeyEvent *>(event)->key() == Qt::Key_Escape);
-@@ -378,6 +429,7 @@ bool UnlockApp::eventFilter(QObject *obj, QEvent *event)
-             return false;
-         }
-         if (ke->key() != Qt::Key_Escape) {
-+            shareEvent(event, qobject_cast<QDeclarativeView*>(obj));
-             return false; // irrelevant
-         }
-         if (ignoreNextEscape) {
-@@ -428,6 +480,34 @@ void UnlockApp::capsLocked()
-     }
- }
- 
-+/*
-+ * This function forwards an event from one greeter window to all others
-+ * It's used to have the keyboard operate on all greeter windows (on every screen)
-+ * at once so that the user gets visual feedback on the screen he's looking at -
-+ * even if the focus is actually on a powered off screen.
-+ */
-+
-+void UnlockApp::shareEvent(QEvent *e, QDeclarativeView *from)
-+{
-+    // from can be NULL any time (because the parameter is passed as qobject_cast)
-+    // m_views.contains(from) is atm. supposed to be true but required if any further
-+    // QDeclarativeViews are added (which are not part of m_views)
-+    // this makes "from" an optimization (nullptr check aversion)
-+    if (from && m_views.contains(from)) {
-+        // NOTICE any recursion in the event sharing will prevent authentication on multiscreen setups!
-+        // Any change in regarded event processing shall be tested thoroughly!
-+        removeEventFilter(this); // prevent recursion!
-+        const bool accepted = e->isAccepted(); // store state
-+        foreach (QDeclarativeView *view, m_views) {
-+            if (view != from) {
-+                QApplication::sendEvent(view, e);
-+                e->setAccepted(accepted);
-+            }
-+        }
-+        installEventFilter(this);
-+    }
-+}
-+
- } // namespace
- 
- #include "greeterapp.moc"
-diff --git a/ksmserver/screenlocker/greeter/greeterapp.h b/ksmserver/screenlocker/greeter/greeterapp.h
-index 76b9824..8b79188 100644
---- a/ksmserver/screenlocker/greeter/greeterapp.h
-+++ b/ksmserver/screenlocker/greeter/greeterapp.h
-@@ -63,6 +63,7 @@ private Q_SLOTS:
- private:
-     void initialize();
-     void capsLocked();
-+    void shareEvent(QEvent *e, QDeclarativeView *from);
- 
-     QString m_mainQmlPath;
-     QList<QDeclarativeView*> m_views;
--- 
-1.8.4.4
-

diff --git a/kde-base/ksmserver/ksmserver-4.11.3-r1.ebuild b/kde-base/ksmserver/ksmserver-4.11.3-r1.ebuild
deleted file mode 100644
index 4c34cbf..0000000
--- a/kde-base/ksmserver/ksmserver-4.11.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kcminit)
-	$(add_kdebase_dep libkworkspace)
-	media-libs/qimageblitz
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXrender
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kcminit/main.h
-	libs/kdm/kgreeterplugin.h
-	kcheckpass/
-	libs/kephal/
-	libs/kworkspace/
-"
-
-KMLOADLIBS="libkworkspace"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.10.50-noplasmalock.patch"
-	"${FILESDIR}/${P}-fixmultimonitor.patch" # picked from 4.11.4
-)


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/ksmserver/files/, kde-base/ksmserver/
@ 2014-04-24 22:45 Johannes Huber
  0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2014-04-24 22:45 UTC (permalink / raw
  To: gentoo-commits

commit:     40ecbc5ec5119db3d40135e736b1e8379969149f
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 24 22:42:23 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr 24 22:42:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=40ecbc5e

[kde-base/ksmserver] Re-enable plasma lock

Package-Manager: portage-2.2.10

---
 .../files/ksmserver-4.11.97-noplasmalock.patch      | 21 ---------------------
 kde-base/ksmserver/ksmserver-4.11.49.9999.ebuild    |  2 --
 2 files changed, 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 e41d58b..0000000
--- 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 43fdf0d..18ca217 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" )


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2014-04-24 22:45 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-03 23:10 [gentoo-commits] proj/kde:master commit in: kde-base/ksmserver/files/, kde-base/ksmserver/ Johannes Huber
  -- strict thread matches above, loose matches on Subject: below --
2014-04-24 22:45 Johannes Huber
2013-12-02 18:50 David Heidelberger
2013-12-01 19:42 Andreas Hüttel
2013-11-23 18:03 Johannes Huber
2013-11-23 16:39 Marc Schiffbauer
2013-05-10  9:44 Jonathan Callen
2013-03-26 22:13 Andreas Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox