From 7e2697dbc000bad066710e38bcd1b239ddbe31c88508c53aa8dcd263e8c12fd7 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 5 Mar 2016 19:49:52 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kscreenlocker?expand=0&rev=22 --- kscreenlocker-5.5.5.tar.xz | 3 --- kscreenlocker-5.5.95.tar.xz | 3 +++ kscreenlocker.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 kscreenlocker-5.5.5.tar.xz create mode 100644 kscreenlocker-5.5.95.tar.xz diff --git a/kscreenlocker-5.5.5.tar.xz b/kscreenlocker-5.5.5.tar.xz deleted file mode 100644 index 22547db..0000000 --- a/kscreenlocker-5.5.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7cad8630831094dc1cde7d828df750191eb032c908a6bccc6d5d83b15a235803 -size 98400 diff --git a/kscreenlocker-5.5.95.tar.xz b/kscreenlocker-5.5.95.tar.xz new file mode 100644 index 0000000..e75df15 --- /dev/null +++ b/kscreenlocker-5.5.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f47181b81266ee4641aaca11b6c57eae469c9e83b6c72f7c551e17a523c0785 +size 100524 diff --git a/kscreenlocker.spec b/kscreenlocker.spec index bfaeff1..311f885 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kscreenlocker -Version: 5.5.5 +Version: 5.5.95 Release: 0 Summary: Library and components for secure lock screen architecture License: GPL-2.0+ From 17e839c076aea66de1a1c622d5dcf962215654c33567cf59897f1a6902a71451 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 5 Mar 2016 19:53:30 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kscreenlocker?expand=0&rev=23 --- kscreenlocker.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kscreenlocker.spec b/kscreenlocker.spec index 311f885..9dca30a 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -33,14 +33,16 @@ 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 From 87c20b895a5b1a44deb456451daa9be43100621bddc9325e820020ce461a82e3 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 20 Mar 2016 09:26:28 +0000 Subject: [PATCH 3/6] 5.6.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kscreenlocker?expand=0&rev=24 --- kscreenlocker-5.5.95.tar.xz | 3 --- kscreenlocker-5.6.0.tar.xz | 3 +++ kscreenlocker.changes | 8 ++++++++ kscreenlocker.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 kscreenlocker-5.5.95.tar.xz create mode 100644 kscreenlocker-5.6.0.tar.xz diff --git a/kscreenlocker-5.5.95.tar.xz b/kscreenlocker-5.5.95.tar.xz deleted file mode 100644 index e75df15..0000000 --- a/kscreenlocker-5.5.95.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f47181b81266ee4641aaca11b6c57eae469c9e83b6c72f7c551e17a523c0785 -size 100524 diff --git a/kscreenlocker-5.6.0.tar.xz b/kscreenlocker-5.6.0.tar.xz new file mode 100644 index 0000000..d6c2e59 --- /dev/null +++ b/kscreenlocker-5.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:714a3c4692899a1a22d503c1fd136b2489f165221a8a1bf3ea3046722764e7fb +size 103844 diff --git a/kscreenlocker.changes b/kscreenlocker.changes index b6ba6a0..aa4723c 100644 --- a/kscreenlocker.changes +++ b/kscreenlocker.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/kscreenlocker.spec b/kscreenlocker.spec index 9dca30a..2664ce7 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kscreenlocker -Version: 5.5.95 +Version: 5.6.0 Release: 0 Summary: Library and components for secure lock screen architecture License: GPL-2.0+ From adb72d2d5e03a98946706cfdf52d5e13f7cdd8f997e9fc87d436a1a65d48b173 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 20 Mar 2016 15:42:05 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kscreenlocker?expand=0&rev=25 --- kscreenlocker.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/kscreenlocker.spec b/kscreenlocker.spec index 2664ce7..4a814dd 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -122,7 +122,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/ From a1b76dfe68b8e3d3e6a9bc15dc54156382a51fde9944f42e066fe1ea9b2e50dc Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 29 Mar 2016 16:30:19 +0000 Subject: [PATCH 5/6] 5.6.1 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kscreenlocker?expand=0&rev=26 --- kscreenlocker-5.6.0.tar.xz | 3 --- kscreenlocker-5.6.1.tar.xz | 3 +++ kscreenlocker.changes | 8 ++++++++ kscreenlocker.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 kscreenlocker-5.6.0.tar.xz create mode 100644 kscreenlocker-5.6.1.tar.xz diff --git a/kscreenlocker-5.6.0.tar.xz b/kscreenlocker-5.6.0.tar.xz deleted file mode 100644 index d6c2e59..0000000 --- a/kscreenlocker-5.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:714a3c4692899a1a22d503c1fd136b2489f165221a8a1bf3ea3046722764e7fb -size 103844 diff --git a/kscreenlocker-5.6.1.tar.xz b/kscreenlocker-5.6.1.tar.xz new file mode 100644 index 0000000..2c41033 --- /dev/null +++ b/kscreenlocker-5.6.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8071a4bdef749cd392d0080b09827e5613e92d36283880ea6c1224211a0a01ef +size 103896 diff --git a/kscreenlocker.changes b/kscreenlocker.changes index aa4723c..bfd558b 100644 --- a/kscreenlocker.changes +++ b/kscreenlocker.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/kscreenlocker.spec b/kscreenlocker.spec index 4a814dd..b3a0742 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kscreenlocker -Version: 5.6.0 +Version: 5.6.1 Release: 0 Summary: Library and components for secure lock screen architecture License: GPL-2.0+ From 1084ff57ca8115bc92f693d748b8b4b77b5c178ae3abdd0c2c79744998da1fc3 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 4 Apr 2016 14:03:34 +0000 Subject: [PATCH 6/6] 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