From 48bbded35e2a512d371d2ea6e176e0c1bbdd235c1ddd45cea113cfc0bd33ef7a Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 4 Apr 2016 14:03:34 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kscreenlocker?expand=0&rev=27 --- ...und-problems-with-QtQueuedConnection.patch | 25 +++++++++++++++++++ kscreenlocker.changes | 6 +++++ kscreenlocker.spec | 3 +++ 3 files changed, 34 insertions(+) create mode 100644 Workaround-problems-with-QtQueuedConnection.patch diff --git a/Workaround-problems-with-QtQueuedConnection.patch b/Workaround-problems-with-QtQueuedConnection.patch new file mode 100644 index 0000000..034797b --- /dev/null +++ b/Workaround-problems-with-QtQueuedConnection.patch @@ -0,0 +1,25 @@ +diff --git a/ksldapp.cpp b/ksldapp.cpp +--- a/ksldapp.cpp ++++ b/ksldapp.cpp +@@ -607,15 +607,19 @@ + return; + } + m_lockWindow->setGlobalAccel(m_globalAccel); +- connect(m_lockWindow, &AbstractLocker::userActivity, this, ++ connect(m_lockWindow, &AbstractLocker::userActivity, m_lockWindow, + [this]() { + if (isGraceTime()) { + unlock(); + } + }, + Qt::QueuedConnection + ); +- connect(m_lockWindow, &AbstractLocker::lockWindowShown, this, &KSldApp::lockScreenShown, Qt::QueuedConnection); ++ connect(m_lockWindow, &AbstractLocker::lockWindowShown, m_lockWindow, ++ [this] { ++ lockScreenShown(); ++ } ++ , Qt::QueuedConnection); + connect(m_waylandServer, &WaylandServer::x11WindowAdded, m_lockWindow, &AbstractLocker::addAllowedWindow); + } + m_lockWindow->showLockWindow(); diff --git a/kscreenlocker.changes b/kscreenlocker.changes index bfd558b..86fa27e 100644 --- a/kscreenlocker.changes +++ b/kscreenlocker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 4 14:02:00 UTC 2016 - hrvoje.senjan@gmail.com + +- Added Workaround-problems-with-QtQueuedConnection.patch + (kde#361007, kde#361008) + ------------------------------------------------------------------- Tue Mar 29 16:20:51 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/kscreenlocker.spec b/kscreenlocker.spec index b3a0742..deb930c 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -27,6 +27,8 @@ Url: https://projects.kde.org/kscreenlocker Source: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE fix-wayland-version-requirement.diff -- Changes wayland requirement from 1.3 to 1.2.1 Patch0: fix-wayland-version-requirement.diff +# PATCH-FIX-UPSTREAM Workaround-problems-with-QtQueuedConnection.patch +Patch1: Workaround-problems-with-QtQueuedConnection.patch BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: kf5-filesystem @@ -90,6 +92,7 @@ Development files for Library and components for secure lock screen architecture # SLE12 has a patched 1.2.1 wayland with all features KDE needs from up to 1.7.0 %patch0 -p1 %endif +%patch1 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5