pool/plasma5-workspace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=194

Browse Source
This commit is contained in:
Hrvoje Senjan 2016-03-30 16:08:43 +00:00 committed by Git OBS Bridge
parent 91173d06f1
commit 2b95f7b6bf
3 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plasma5-workspace.changes
View File

@ -5,6 +5,7 @@ Tue Mar 29 16:21:08 UTC 2016 - hrvoje.senjan@gmail.com
* New bugfix release
* For more details please see:
https://www.kde.org/announcements/plasma-5.6.1.php
- Drop upstreamed xembedsniproxy-avoid-ghost-entry.patch
-------------------------------------------------------------------
Sun Mar 20 09:19:59 UTC 2016 - hrvoje.senjan@gmail.com

3
plasma5-workspace.spec
View File

@ -36,6 +36,8 @@ Patch1: create_kdehome.patch
Patch2: fix-breeze-sddm-theme-with-many-users.patch
# PATCH-FIX_OPENSUSE kuiserver5_qApp.patch -- kuiserver can't be a QCoreApplications as it uses QWidget
Patch3: kuiserver5_qApp.patch
# PATCH-FIX-OPENSUSE plasmashell-disable-windowclosing-on-logout.patch kde#349805 wbauer@tmo.at -- Prevent plasma from closing too early on logout resulting in an unusable desktop if the logout is cancelled
Patch4: plasmashell-disable-windowclosing-on-logout.patch
# PATCHES 100-200 and above are from upstream 5.6 branch
# PATCHES 201-300 and above are from upstream master/5.7 branch
BuildRequires: kf5-filesystem
@ -206,6 +208,7 @@ workspace. Development files.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5

47
plasmashell-disable-windowclosing-on-logout.patch Normal file
View File

@ -0,0 +1,47 @@
From: Andreas Hartmetz <ahartmetz@gmail.com>
Date: Sat, 20 Feb 2016 20:01:42 +0000
Subject: Disable fallback session management (requires Qt >= 5.6.0).
X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=b5e814a7b2867914327c889794b1088027aaafd6
---
Disable fallback session management (requires Qt >= 5.6.0).
This prevents processes from dying when session logout is cancelled.
Session restore is not an issue in these, it's disabled anyway.
---
--- a/klipper/main.cpp
+++ b/klipper/main.cpp
@@ -73,7 +73,7 @@
KAboutData::setApplicationData(aboutData);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1)
QGuiApplication::setFallbackSessionManagementEnabled(false);
#endif
auto disableSessionManagement = [](QSessionManager &sm) {
--- a/krunner/main.cpp
+++ b/krunner/main.cpp
@@ -66,7 +66,7 @@
KAboutData::setApplicationData(aboutData);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1)
QGuiApplication::setFallbackSessionManagementEnabled(false);
#endif
auto disableSessionManagement = [](QSessionManager &sm) {
diff --git a/shell/main.cpp b/shell/main.cpp
index 49ea484..68cf9e9 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -101,7 +101,7 @@
cliOptions.process(app);
aboutData.processCommandLine(&cliOptions);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1)
QGuiApplication::setFallbackSessionManagementEnabled(false);
#endif
auto disableSessionManagement = [](QSessionManager &sm) {