This commit is contained in:
parent
8d691ce317
commit
48bbded35e
25
Workaround-problems-with-QtQueuedConnection.patch
Normal file
25
Workaround-problems-with-QtQueuedConnection.patch
Normal file
@ -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();
|
@ -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
|
Tue Mar 29 16:20:51 UTC 2016 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
@ -27,6 +27,8 @@ Url: https://projects.kde.org/kscreenlocker
|
|||||||
Source: %{name}-%{version}.tar.xz
|
Source: %{name}-%{version}.tar.xz
|
||||||
# PATCH-FIX-OPENSUSE fix-wayland-version-requirement.diff -- Changes wayland requirement from 1.3 to 1.2.1
|
# PATCH-FIX-OPENSUSE fix-wayland-version-requirement.diff -- Changes wayland requirement from 1.3 to 1.2.1
|
||||||
Patch0: fix-wayland-version-requirement.diff
|
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: cmake >= 2.8.12
|
||||||
BuildRequires: extra-cmake-modules >= 1.8.0
|
BuildRequires: extra-cmake-modules >= 1.8.0
|
||||||
BuildRequires: kf5-filesystem
|
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
|
# SLE12 has a patched 1.2.1 wayland with all features KDE needs from up to 1.7.0
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%endif
|
%endif
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
|
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
|
||||||
|
Loading…
Reference in New Issue
Block a user