diff --git a/Workaround-problems-with-QtQueuedConnection.patch b/Workaround-problems-with-QtQueuedConnection.patch deleted file mode 100644 index 034797b..0000000 --- a/Workaround-problems-with-QtQueuedConnection.patch +++ /dev/null @@ -1,25 +0,0 @@ -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-5.6.1.tar.xz b/kscreenlocker-5.6.1.tar.xz deleted file mode 100644 index 2c41033..0000000 --- a/kscreenlocker-5.6.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8071a4bdef749cd392d0080b09827e5613e92d36283880ea6c1224211a0a01ef -size 103896 diff --git a/kscreenlocker-5.6.2.tar.xz b/kscreenlocker-5.6.2.tar.xz new file mode 100644 index 0000000..64e6a8c --- /dev/null +++ b/kscreenlocker-5.6.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ae7c40c4394c32eafe560694b58aafa841f613451a9543d7fbf5d68e79e4bb2 +size 103940 diff --git a/kscreenlocker.changes b/kscreenlocker.changes index 86fa27e..8d80d41 100644 --- a/kscreenlocker.changes +++ b/kscreenlocker.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Apr 5 15:53:47 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.2 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.2.php +- Drop upstreamed Workaround-problems-with-QtQueuedConnection.patch + ------------------------------------------------------------------- Mon Apr 4 14:02:00 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/kscreenlocker.spec b/kscreenlocker.spec index deb930c..63cec3e 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kscreenlocker -Version: 5.6.1 +Version: 5.6.2 Release: 0 Summary: Library and components for secure lock screen architecture License: GPL-2.0+ @@ -27,8 +27,6 @@ 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 @@ -92,7 +90,6 @@ 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