Update to Plasma 5.8.1
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/plasma5-workspace?expand=0&rev=30
This commit is contained in:
committed by
Git OBS Bridge
parent
a0236cf4b7
commit
bf94167042
@@ -1,52 +0,0 @@
|
||||
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
|
||||
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:365b152c69ee7863bd1abe0e339707e412384beeb10294aacbc07e3d9da2b319
|
||||
size 7411612
|
3
plasma-workspace-5.8.1.tar.xz
Normal file
3
plasma-workspace-5.8.1.tar.xz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c05a38b94fb815957d6b572dfb43f1d8624654c3e23d9344751063118c4aed5c
|
||||
size 7377128
|
@@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 11 15:44:28 UTC 2016 - fabian@ritter-vogt.de
|
||||
|
||||
- Update to 5.8.1
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
https://www.kde.org/announcements/plasma-5.8.1.php
|
||||
- Removed upstream patches:
|
||||
* 0001-save-the-containment-only-aftyer-switch.patch
|
||||
- Remove copyrighted picture (kde#370490)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 7 16:46:37 UTC 2016 - alarrosa@suse.com
|
||||
|
||||
|
@@ -20,7 +20,7 @@
|
||||
|
||||
%bcond_without lang
|
||||
Name: plasma5-workspace
|
||||
Version: 5.8.0
|
||||
Version: 5.8.1
|
||||
Release: 0
|
||||
%{!?_plasma5_version: %global _plasma5_version %{version}}
|
||||
Summary: The KDE Plasma Workspace Components
|
||||
@@ -40,8 +40,6 @@ Patch3: add-tray-icon-cache.patch
|
||||
# PATCH-FIX-UPSTREAM keep-wallpaper-aspect-ratio-wallpaper-on-screen-resolution-change.diff alarrosa@suse.com -- Keep wallpaper aspect ratio on screen resolution change
|
||||
Patch4: keep-wallpaper-aspect-ratio-wallpaper-on-screen-resolution-change.diff
|
||||
# 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
|
||||
@@ -213,7 +211,6 @@ workspace. Development files.
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch100 -p1
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
|
||||
@@ -234,6 +231,8 @@ workspace. Development files.
|
||||
# we have a separate package for Plasma5 session
|
||||
rm -rfv %{buildroot}%{_kf5_sharedir}/xsessions
|
||||
rm -rfv %{buildroot}%{_kf5_sharedir}/wayland-sessions
|
||||
# apparently a copyright violation (kde#370490)
|
||||
rm %{buildroot}%{_datadir}/sddm/themes/breeze/face1.jpeg
|
||||
%fdupes %{buildroot}/%{_prefix}
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
@@ -341,7 +340,7 @@ workspace. Development files.
|
||||
|
||||
%if %{with lang}
|
||||
%files lang -f %{name}.lang
|
||||
%doc %lang(ca) %{_kf5_htmldir}/ca/
|
||||
%doc %lang(de) %{_kf5_htmldir}/de/
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
Reference in New Issue
Block a user