From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 18E98138247 for ; Sat, 23 Nov 2013 18:04:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1721BE09E0; Sat, 23 Nov 2013 18:04:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 88080E09E0 for ; Sat, 23 Nov 2013 18:03:59 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7141833F343 for ; Sat, 23 Nov 2013 18:03:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 16B7CE5459 for ; Sat, 23 Nov 2013 18:03:57 +0000 (UTC) From: "Johannes Huber" 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" Message-ID: <1385226177.8fa54cd6d88ef68a00c86b714529ff46e8f4a5cb.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.10.1-noplasmalock.patch kde-base/ksmserver/files/ksmserver-4.10.50-noplasmalock.patch kde-base/ksmserver/ksmserver-4.11.49.9999.ebuild kde-base/ksmserver/ksmserver-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: 8fa54cd6d88ef68a00c86b714529ff46e8f4a5cb X-VCS-Branch: master Date: Sat, 23 Nov 2013 18:03:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4ada5a8c-91dc-41b5-a20d-cfaa1690ebcd X-Archives-Hash: 95aa59b3c22acd223921408d20fbf7d4 commit: 8fa54cd6d88ef68a00c86b714529ff46e8f4a5cb Author: Johannes Huber gentoo org> AuthorDate: Sat Nov 23 17:02:57 2013 +0000 Commit: Johannes Huber gentoo 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" )