From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-689577-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id ACAC5138A1F
for <garchives@archives.gentoo.org>; Thu, 24 Apr 2014 22:45:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E3BA9E09FD;
Thu, 24 Apr 2014 22:45:45 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5F055E09FB
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Apr 2014 22:45:45 +0000 (UTC)
Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B46AB33FC82
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Apr 2014 22:45:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by spoonbill.gentoo.org (Postfix) with ESMTP id 6518D1818D
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Apr 2014 22:45:42 +0000 (UTC)
From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" <johu@gentoo.org>
Message-ID: <1398379343.40ecbc5ec5119db3d40135e736b1e8379969149f.johu@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/ksmserver/files/, kde-base/ksmserver/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch kde-base/ksmserver/ksmserver-4.11.49.9999.ebuild
X-VCS-Directories: kde-base/ksmserver/files/ kde-base/ksmserver/
X-VCS-Committer: johu
X-VCS-Committer-Name: Johannes Huber
X-VCS-Revision: 40ecbc5ec5119db3d40135e736b1e8379969149f
X-VCS-Branch: master
Date: Thu, 24 Apr 2014 22:45:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 544e137a-19df-48ff-b9e1-23f2c1cab47d
X-Archives-Hash: 3dfbd1cea6786334a7dc1728371d3950
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" )