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

Accepting request 433626 from KDE:Frameworks5:LTS

Browse Source 
Fairly critical bugfix (without this, config will be lost: boo#1003399)

OBS-URL: https://build.opensuse.org/request/show/433626
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=46
This commit is contained in:
Dominique Leuenberger
2016-10-06 20:22:12 +00:00
committed by Git OBS Bridge
parent 905071b826 cb9b31b4b3
commit dbdb5cd7a3
3 changed files with 68 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
0001-save-the-containment-only-aftyer-switch.patch Normal file
View File

@@ -0,0 +1,52 @@
From 53b2a407af9d1d60cfbb1a42af8546ab0a156d38 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Thu, 6 Oct 2016 15:50:05 +0200
Subject: [PATCH] save the containment only aftyer switch
Summary:
during a type switch
if the new containment gets saved before getting a view,
it will get lastScreen=-1 so the next boot
it will create a new containment
Test Plan:
switched repeatedly between desktop and folderview
the config file always got with the correct lastScreen=0 entry
Reviewers: #plasma
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D2966
---
shell/shellcorona.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index 1d08cd1..74f6ded 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -1562,8 +1562,6 @@ Plasma::Containment *ShellCorona::setContainmentTypeForScreen(int screen, const
newCg.writeEntry("activityId", oldContainment->activity());
newContainment->restore(newCg);
newContainment->updateConstraints(Plasma::Types::StartupCompletedConstraint);
- newContainment->save(newCg);
- requestConfigSync();
newContainment->flushPendingConstraintsEvents();
emit containmentAdded(newContainment);
@@ -1588,6 +1586,9 @@ Plasma::Containment *ShellCorona::setContainmentTypeForScreen(int screen, const
view->rootObject()->setFocus(true, Qt::MouseFocusReason);
QTimer::singleShot(2500, oldContainment, &Plasma::Applet::destroy);
+ //Save now as we now have a screen, so lastScreen will not be -1
+ newContainment->save(newCg);
+ requestConfigSync();
emit availableScreenRectChanged();
return newContainment;
--
2.10.0

12
plasma5-workspace.changes
View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Oct 6 17:18:45 UTC 2016 - fabian@ritter-vogt.de
- Add 0001-save-the-containment-only-aftyer-switch.patch:
* Without this it would always change back to the folderview
after login (boo#1003399)
-------------------------------------------------------------------
Wed Oct 5 07:58:52 UTC 2016 - fabian@ritter-vogt.de
- Add Source: URL back
-------------------------------------------------------------------
Mon Oct 3 19:51:33 UTC 2016 - fabian@ritter-vogt.de

5
plasma5-workspace.spec
View File

@@ -27,7 +27,7 @@ Summary: The KDE Plasma Workspace Components
License: GPL-2.0+
Group: System/GUI/KDE
Url: http://www.kde.org/
Source: plasma-workspace-%{version}.tar.xz
Source: http://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux@gmx.com -- Rename the qdbus executable in startkde
Patch0: 0001-Rename-qdbus-in-startkde.patch
@@ -38,6 +38,8 @@ Patch2: 0001-Ignore-default-sddm-face-icons.patch
# PATCH-FIX-OPENSUSE add-tray-icon-cache.patch kde#356479 fabian@ritter-vogt.de -- Workaround for high load due to animated tray icons
Patch3: add-tray-icon-cache.patch
# PATCHES 100-200 and above are from upstream 5.8 branch
# PATCH-FIX-UPSTREAM 0001-save-the-containment-only-aftyer-switch.patch -- Do not overwrite containment on startup
Patch100: 0001-save-the-containment-only-aftyer-switch.patch
# PATCHES 201-300 and above are from upstream master/5.9 branch
BuildRequires: breeze5-icons
BuildRequires: fdupes
@@ -208,6 +210,7 @@ workspace. Development files.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch100 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}