[SCM] plasma-workspace packaging branch, master, updated. debian/5.4.3-1-21-g04110f5

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=04110f5

The following commit has been merged in the master branch:
commit 04110f5ada5e4e6fc6db0c182c7ee06d9007a125
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon Feb 22 20:43:27 2016 +0100

    Drop CVE-2016-2312.diff.
    
    The code has been moved to kscreenlocker.
---
 debian/patches/CVE-2016-2312.diff | 33 ---------------------------------
 debian/patches/series             |  1 -
 2 files changed, 34 deletions(-)

diff --git a/debian/patches/CVE-2016-2312.diff b/debian/patches/CVE-2016-2312.diff
deleted file mode 100644
index 9891cb1..0000000
--- a/debian/patches/CVE-2016-2312.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Martin Gräßlin <mgraesslin at kde.org>
-Date: Tue, 09 Feb 2016 15:37:50 +0000
-Subject: [greeter] Dont quit when last window closes
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=23a9ed7ba9995570227dbcd69c23f009de7dde49
----
-[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
----
-
---- a/ksmserver/screenlocker/greeter/main.cpp
-+++ b/ksmserver/screenlocker/greeter/main.cpp
-@@ -56,6 +56,7 @@
-     // 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"));
diff --git a/debian/patches/series b/debian/patches/series
index 9e55099..fed1404 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 kubuntu_startkde-qtpath.diff
 install_missing_header
 disable_incompatible_tests
-CVE-2016-2312.diff

-- 
plasma-workspace packaging