summaryrefslogtreecommitdiffstats
path: root/kde/patch/kscreenlocker
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-07-31 16:13:18 +0200
committer Eric Hameleers <alien@slackware.com>2020-07-31 16:13:18 +0200
commit703149752c6265b36973d2c1f0f5a69721e3128a (patch)
tree7ded0d801771d5705f48ffbfb48f37dd4829439e /kde/patch/kscreenlocker
parentdd005500c624d127321ff3fe14a0c29bfa8d67f7 (diff)
parentcd7ff1719433fbb3b6a8304596be173bc1b91b00 (diff)
downloadktown-master.tar.gz
ktown-master.tar.xz
Merge branch 'elogind'HEADmaster
Diffstat (limited to 'kde/patch/kscreenlocker')
-rw-r--r--kde/patch/kscreenlocker/kscreenlocker_CVE-2016-2312.patch36
-rw-r--r--kde/patch/kscreenlocker/kscreenlocker_crash_force_softrender.patch112
-rw-r--r--kde/patch/kscreenlocker/kscreenlocker_rendersettings.patch49
3 files changed, 0 insertions, 197 deletions
diff --git a/kde/patch/kscreenlocker/kscreenlocker_CVE-2016-2312.patch b/kde/patch/kscreenlocker/kscreenlocker_CVE-2016-2312.patch
deleted file mode 100644
index 492ef80..0000000
--- a/kde/patch/kscreenlocker/kscreenlocker_CVE-2016-2312.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Martin Gräßlin <mgraesslin@kde.org>
-Date: Fri, 05 Feb 2016 09:30:19 +0000
-Subject: [greeter] Dont quit when last window closes
-X-Git-Url: http://quickgit.kde.org/?p=kscreenlocker.git&a=commitdiff&h=fae65f1cdd6446042b31ccd0eafd7a4c0b6623e3
----
-[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.
-
-BUG: 358125
-FIXED-IN: 5.5.5
----
-
-
---- a/greeter/main.cpp
-+++ b/greeter/main.cpp
-@@ -59,6 +59,7 @@
- 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/kde/patch/kscreenlocker/kscreenlocker_crash_force_softrender.patch b/kde/patch/kscreenlocker/kscreenlocker_crash_force_softrender.patch
deleted file mode 100644
index 06045d7..0000000
--- a/kde/patch/kscreenlocker/kscreenlocker_crash_force_softrender.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 875e44f56d4597ba3b65f5bf4ff2b315376c05a4 Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Wed, 11 Jul 2018 18:01:41 +0200
-Subject: Force software rendering when greeter crashed
-
-We have a fallback QML theme for when the look and feel package is broken but when the
-graphics driver is broken (e.g. proprietary graphics driver update) the lock screen would
-stop working. When the greeter crashed, better play safe and force software rendering
-
-Reviewed-By: d_ed
----
- ksldapp.cpp | 13 +++++++++++--
- ksldapp.h | 9 +++++++++
- 2 files changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/ksldapp.cpp b/ksldapp.cpp
-index 892826f..5fe28ea 100644
---- a/ksldapp.cpp
-+++ b/ksldapp.cpp
-@@ -66,6 +66,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
- namespace ScreenLocker
- {
-
-+static const QString s_qtQuickBackend = QStringLiteral("QT_QUICK_BACKEND");
-+
- static KSldApp * s_instance = nullptr;
-
- KSldApp* KSldApp::self()
-@@ -226,6 +228,8 @@ void KSldApp::initialize()
- // failure, restart lock process
- m_greeterCrashedCounter++;
- if (m_greeterCrashedCounter < 4) {
-+ // Perhaps it crashed due to a graphics driver issue, force software rendering now
-+ setForceSoftwareRendering(true);
- startLockProcess(EstablishLock::Immediate);
- } else if (m_lockWindow) {
- m_lockWindow->emergencyShow();
-@@ -385,6 +389,7 @@ void KSldApp::lock(EstablishLock establishLock)
-
- m_lockState = AcquiringLock;
-
-+ setForceSoftwareRendering(false);
- // start unlock screen process
- startLockProcess(establishLock);
- emit lockStateChanged();
-@@ -546,6 +551,8 @@ bool KSldApp::isFdoPowerInhibited() const
-
- void KSldApp::startLockProcess(EstablishLock establishLock)
- {
-+ QProcessEnvironment env = m_greeterEnv;
-+
- if (m_isWayland && m_waylandDisplay) {
- int sx[2];
- if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sx) < 0) {
-@@ -566,9 +573,7 @@ void KSldApp::startLockProcess(EstablishLock establishLock)
- emit greeterClientConnectionChanged();
- int socket = dup(sx[1]);
- if (socket >= 0) {
-- QProcessEnvironment env = m_greeterEnv;
- env.insert("WAYLAND_SOCKET", QByteArray::number(socket));
-- m_lockProcess->setProcessEnvironment(env);
- }
- }
- QStringList args;
-@@ -587,6 +592,9 @@ void KSldApp::startLockProcess(EstablishLock establishLock)
- if (m_lockGrace == -1) {
- args << QStringLiteral("--nolock");
- }
-+ if (m_forceSoftwareRendering) {
-+ env.insert(s_qtQuickBackend, QStringLiteral("software"));
-+ }
-
- // start the Wayland server
- int fd = m_waylandServer->start();
-@@ -598,6 +606,7 @@ void KSldApp::startLockProcess(EstablishLock establishLock)
- args << QStringLiteral("--ksldfd");
- args << QString::number(fd);
-
-+ m_lockProcess->setProcessEnvironment(env);
- m_lockProcess->start(QStringLiteral(KSCREENLOCKER_GREET_BIN), args);
- close(fd);
- }
-diff --git a/ksldapp.h b/ksldapp.h
-index 4849588..b6d6703 100644
---- a/ksldapp.h
-+++ b/ksldapp.h
-@@ -127,6 +127,14 @@ public:
- m_lockGrace = msec;
- }
-
-+ bool forceSoftwareRendering() const {
-+ return m_forceSoftwareRendering;
-+ }
-+
-+ void setForceSoftwareRendering(bool force) {
-+ m_forceSoftwareRendering = force;
-+ }
-+
- Q_SIGNALS:
- void locked();
- void unlocked();
-@@ -179,6 +187,7 @@ private:
- LogindIntegration *m_logind;
- GlobalAccel *m_globalAccel = nullptr;
- bool m_hasXInput2 = false;
-+ bool m_forceSoftwareRendering = false;
-
- bool m_isX11;
- bool m_isWayland;
---
-cgit v0.11.2
-
diff --git a/kde/patch/kscreenlocker/kscreenlocker_rendersettings.patch b/kde/patch/kscreenlocker/kscreenlocker_rendersettings.patch
deleted file mode 100644
index 2802a1a..0000000
--- a/kde/patch/kscreenlocker/kscreenlocker_rendersettings.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3f104cbb0a34024dc1aa45538d2ef2403a7a45f0 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 10 Aug 2018 01:18:42 +0200
-Subject: Load QtQuickSettings for software rendering
-
-We had support for falling back on errors yet somehow
-the initial basic loading was missing.
-
-Summary: BUG: 347772
-
-Test Plan: Compiles
-
-Reviewers: #plasma, broulik
-
-Reviewed By: #plasma, broulik
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D14708
----
- greeter/main.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/greeter/main.cpp b/greeter/main.cpp
-index ff64a55..6db87e1 100644
---- a/greeter/main.cpp
-+++ b/greeter/main.cpp
-@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- *********************************************************************/
- #include <KLocalizedString>
-+#include <KQuickAddons/QtQuickSettings>
-
- #include <QDateTime>
- #include <QCommandLineParser>
-@@ -85,6 +86,8 @@ int main(int argc, char* argv[])
- QCoreApplication::setApplicationVersion(QStringLiteral("0.1"));
- QCoreApplication::setOrganizationDomain(QStringLiteral("kde.org"));
-
-+ KQuickAddons::QtQuickSettings::init();
-+
- // disable session management for the greeter
- auto disableSessionManagement = [](QSessionManager &sm) {
- sm.setRestartHint(QSessionManager::RestartNever);
---
-cgit v0.11.2
-