From 1a9f23b77ac4ca6e4946cf47ed9c6833843df543a061ca6126e0bcfcc606d296 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 26 Jan 2016 22:50:49 +0000 Subject: [PATCH 1/3] 5.5.4 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kscreenlocker?expand=0&rev=14 --- kscreenlocker-5.5.3.tar.xz | 3 --- kscreenlocker-5.5.4.tar.xz | 3 +++ kscreenlocker.changes | 8 ++++++++ kscreenlocker.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 kscreenlocker-5.5.3.tar.xz create mode 100644 kscreenlocker-5.5.4.tar.xz diff --git a/kscreenlocker-5.5.3.tar.xz b/kscreenlocker-5.5.3.tar.xz deleted file mode 100644 index a514a20..0000000 --- a/kscreenlocker-5.5.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89dc3408989cc8b4c551ab7c1713422b9e6229443a2fd17df0f0440e0db62fb3 -size 97476 diff --git a/kscreenlocker-5.5.4.tar.xz b/kscreenlocker-5.5.4.tar.xz new file mode 100644 index 0000000..16605de --- /dev/null +++ b/kscreenlocker-5.5.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39c3a4272b6f53b26c27054f5efb54c0e88ebb6d6aea3f8a541dc5bc8b1b25a3 +size 98204 diff --git a/kscreenlocker.changes b/kscreenlocker.changes index 510d088..3717b46 100644 --- a/kscreenlocker.changes +++ b/kscreenlocker.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 26 22:20:10 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.5.4: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.4.php + ------------------------------------------------------------------- Wed Jan 6 14:12:07 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/kscreenlocker.spec b/kscreenlocker.spec index 78d224a..5df4283 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kscreenlocker -Version: 5.5.3 +Version: 5.5.4 Release: 0 Summary: Library and components for secure lock screen architecture License: GPL-2.0+ From 0ac590a06272ca587d1ae19a06c824f7f14ff56df079e0ede6b1de3d6b42ae99 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 9 Feb 2016 15:59:16 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kscreenlocker?expand=0&rev=15 --- ...er-Dont-quit-when-last-window-closes.patch | 39 +++++++++++++++++++ kscreenlocker.changes | 6 +++ kscreenlocker.spec | 3 ++ 3 files changed, 48 insertions(+) create mode 100644 0001-greeter-Dont-quit-when-last-window-closes.patch diff --git a/0001-greeter-Dont-quit-when-last-window-closes.patch b/0001-greeter-Dont-quit-when-last-window-closes.patch new file mode 100644 index 0000000..317df99 --- /dev/null +++ b/0001-greeter-Dont-quit-when-last-window-closes.patch @@ -0,0 +1,39 @@ +From fae65f1cdd6446042b31ccd0eafd7a4c0b6623e3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= +Date: Fri, 5 Feb 2016 10:30:19 +0100 +Subject: [PATCH 1/1] [greeter] Dont quit when last window closes + +Qt allows to have no screens. If all XRandR screens are disconnected +there are also no QScreens. This is from an X11 perspective wrong, but +we have to deal with it. No QScreens means that all views are destroyed +and no new ones are created. Thus all windows close and the greeter +exited successfully which in turn unlocked the screen. + +This change ensures that the greeter doesn't exit when all windows close. + +Funnily this was not a problem with the well known issue of Qt +crashing when all screens are disconnected. The lock screen handles +crashes gracefully and just restarts or more likely Qt also crashes +the application using KSld and thus taking down the complete session. + +BUG: 358125 +FIXED-IN: 5.5.5 +--- + greeter/main.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/greeter/main.cpp b/greeter/main.cpp +index e4e679e..5625d36 100644 +--- a/greeter/main.cpp ++++ b/greeter/main.cpp +@@ -59,6 +59,7 @@ int main(int argc, char* argv[]) + qputenv("QT_IM_MODULE", QByteArrayLiteral("compose")); + } + ScreenLocker::UnlockApp app(argc, argv); ++ app.setQuitOnLastWindowClosed(false); + QCoreApplication::setApplicationName(QStringLiteral("kscreenlocker_greet")); + QCoreApplication::setApplicationVersion(QStringLiteral("0.1")); + QCoreApplication::setOrganizationDomain(QStringLiteral("kde.org")); +-- +2.6.2 + diff --git a/kscreenlocker.changes b/kscreenlocker.changes index 3717b46..f108671 100644 --- a/kscreenlocker.changes +++ b/kscreenlocker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 9 15:58:56 UTC 2016 - hrvoje.senjan@gmail.com + +- Added 0001-greeter-Dont-quit-when-last-window-closes.patch + (kde#358125) + ------------------------------------------------------------------- Tue Jan 26 22:20:10 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/kscreenlocker.spec b/kscreenlocker.spec index 5df4283..d53f751 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 0001-greeter-Dont-quit-when-last-window-closes.patch +Patch1: 0001-greeter-Dont-quit-when-last-window-closes.patch BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: kf5-filesystem @@ -88,6 +90,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 From ff291dc6effdf48c96a724ac11d0e14ec4d70cb12d95ad55896b12878370869f Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 9 Feb 2016 16:05:15 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kscreenlocker?expand=0&rev=16 --- kscreenlocker.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kscreenlocker.changes b/kscreenlocker.changes index f108671..c227338 100644 --- a/kscreenlocker.changes +++ b/kscreenlocker.changes @@ -2,7 +2,7 @@ Tue Feb 9 15:58:56 UTC 2016 - hrvoje.senjan@gmail.com - Added 0001-greeter-Dont-quit-when-last-window-closes.patch - (kde#358125) + (boo#964548, kde#358125) ------------------------------------------------------------------- Tue Jan 26 22:20:10 UTC 2016 - hrvoje.senjan@gmail.com