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 180D958975 for ; Tue, 9 Feb 2016 16:25:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B546A21C243; Tue, 9 Feb 2016 16:25:29 +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 34AD621C23F for ; Tue, 9 Feb 2016 16:25:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4940B340894 for ; Tue, 9 Feb 2016 16:25:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF8751074 for ; Tue, 9 Feb 2016 16:25:24 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1455035114.0be8df1b52ad6ee0dbfe86ca22ec19fb47e88797.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-lockscreen-bypass.patch kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r2.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ kde-plasma/plasma-workspace/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 0be8df1b52ad6ee0dbfe86ca22ec19fb47e88797 X-VCS-Branch: master Date: Tue, 9 Feb 2016 16:25:24 +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: 36ee9551-1d7a-4511-8a67-9a72300f3895 X-Archives-Hash: bda4398c45667d56969aa7f6720d801f commit: 0be8df1b52ad6ee0dbfe86ca22ec19fb47e88797 Author: Michael Palimaka gentoo org> AuthorDate: Tue Feb 9 16:13:10 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Feb 9 16:25:14 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be8df1b kde-plasma/plasma-workspace: backport patch from upstream solving lock screen bypass Gentoo-bug: 574270 Package-Manager: portage-2.2.27 .../plasma-workspace-5.4.3-lockscreen-bypass.patch | 38 ++++++++++++++++++++++ ...-r1.ebuild => plasma-workspace-5.4.3-r2.ebuild} | 1 + 2 files changed, 39 insertions(+) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-lockscreen-bypass.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-lockscreen-bypass.patch new file mode 100644 index 0000000..977251e --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-lockscreen-bypass.patch @@ -0,0 +1,38 @@ +From 23a9ed7ba9995570227dbcd69c23f009de7dde49 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= +Date: Tue, 9 Feb 2016 16:37:50 +0100 +Subject: [PATCH] [greeter] Dont quit when last window closes + +Qt allows to have no screens. If all XRandR screens are disconnected +there are also no QScreens. This is from an X11 perspective wrong, but +we have to deal with it. No QScreens means that all views are destroyed +and no new ones are created. Thus all windows close and the greeter +exited successfully which in turn unlocked the screen. + +This change ensures that the greeter doesn't exit when all windows close. + +Funnily this was not a problem with the well known issue of Qt +crashing when all screens are disconnected. The lock screen handles +crashes gracefully and just restarts or more likely Qt also crashes +the application using KSld and thus taking down the complete session. + +CCBUG: 358125 +--- + ksmserver/screenlocker/greeter/main.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ksmserver/screenlocker/greeter/main.cpp b/ksmserver/screenlocker/greeter/main.cpp +index fa4bf62..0a68835 100644 +--- a/ksmserver/screenlocker/greeter/main.cpp ++++ b/ksmserver/screenlocker/greeter/main.cpp +@@ -56,6 +56,7 @@ int main(int argc, char* argv[]) + // explicitly disable input methods as it makes it impossible to unlock, see BUG 306932 + qputenv("QT_IM_MODULE", QByteArrayLiteral("compose")); + ScreenLocker::UnlockApp app(argc, argv); ++ app.setQuitOnLastWindowClosed(false); + QCoreApplication::setApplicationName(QStringLiteral("kscreenlocker_greet")); + QCoreApplication::setApplicationVersion(QStringLiteral("0.1")); + QCoreApplication::setOrganizationDomain(QStringLiteral("kde.org")); +-- +2.4.10 + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r2.ebuild similarity index 99% rename from kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild rename to kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r2.ebuild index b6f96f5..0b95d6e 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r2.ebuild @@ -130,6 +130,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.4-consolekit2.patch" "${FILESDIR}/${PN}-5.4.3-fix-drkonqi.patch" #Upstream bug 354110 "${FILESDIR}/${PN}-5.4.3-no-SUID-no-GUID.patch" + "${FILESDIR}/${P}-lockscreen-bypass.patch" ) RESTRICT="test"