pool/kscreenlocker
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 384102 from KDE:Frameworks5

Browse Source 
- Added Workaround-problems-with-QtQueuedConnection.patch
  (kde#361007, kde#361008)

- Update to 5.6.1
  * New bugfix release
  * For more details please see:
    https://www.kde.org/announcements/plasma-5.6.1.php

- Update to 5.6.0
  * New feature release
  * For more details please see:
    https://www.kde.org/announcements/plasma-5.6.0.php

OBS-URL: https://build.opensuse.org/request/show/384102
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kscreenlocker?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2016-04-07 11:32:02 +00:00 committed by Git OBS Bridge
commit ff3bce34bd
5 changed files with 59 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Workaround-problems-with-QtQueuedConnection.patch Normal file
View 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();

3
kscreenlocker-5.5.5.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7cad8630831094dc1cde7d828df750191eb032c908a6bccc6d5d83b15a235803
size 98400

3
kscreenlocker-5.6.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8071a4bdef749cd392d0080b09827e5613e92d36283880ea6c1224211a0a01ef
size 103896

22
kscreenlocker.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
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
- Update to 5.6.1
* New bugfix release
* For more details please see:
https://www.kde.org/announcements/plasma-5.6.1.php
-------------------------------------------------------------------
Sun Mar 20 09:19:52 UTC 2016 - hrvoje.senjan@gmail.com
- Update to 5.6.0
* New feature release
* For more details please see:
https://www.kde.org/announcements/plasma-5.6.0.php
-------------------------------------------------------------------
Tue Mar 1 17:32:29 UTC 2016 - hrvoje.senjan@gmail.com

14
kscreenlocker.spec
View File

@ -18,7 +18,7 @@
%bcond_without lang
Name: kscreenlocker
Version: 5.5.5
Version: 5.6.1
Release: 0
Summary: Library and components for secure lock screen architecture
License: GPL-2.0+
@ -27,20 +27,24 @@ 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
BuildRequires: pam-config
BuildRequires: pam-devel
BuildRequires: cmake(KF5Crash) >= 5.15.0
BuildRequires: cmake(KF5DBusAddons) >= 5.15.0
BuildRequires: cmake(KF5Declarative) >= 5.15.0
BuildRequires: cmake(KF5GlobalAccel) >= 5.15.0
BuildRequires: cmake(KF5I18n) >= 5.15.0
BuildRequires: cmake(KF5IdleTime) >= 5.15.0
BuildRequires: cmake(KF5KCMUtils) >= 5.15.0
BuildRequires: cmake(KF5KDELibs4Support) >= 5.15.0
BuildRequires: cmake(KF5Plasma) >= 5.15.0
BuildRequires: cmake(KF5Notifications) >= 5.15.0
BuildRequires: cmake(KF5Solid) >= 5.15.0
BuildRequires: cmake(KF5Wayland)
BuildRequires: cmake(KF5WindowSystem) >= 5.15.0
BuildRequires: cmake(KF5XmlGui) >= 5.15.0
BuildRequires: cmake(Qt5Quick) >= 5.5.0
BuildRequires: cmake(Qt5QuickWidgets) >= 5.5.0
BuildRequires: cmake(Qt5Test) >= 5.5.0
@ -88,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
@ -120,7 +125,6 @@ Development files for Library and components for secure lock screen architecture
%{_kf5_libdir}/libexec/kscreenlocker_greet
%{_kf5_servicesdir}/
%{_kf5_sharedir}/kconf_update/
%{_kf5_plasmadir}/
%{_kf5_plugindir}/
%{_kf5_notifydir}/
%{_kf5_sharedir}/ksmserver/