Accepting request 434449 from KDE:Frameworks5:LTS
Update to 5.8.1 OBS-URL: https://build.opensuse.org/request/show/434449 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=47
This commit is contained in:
Git OBS Bridge
@@ -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
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
diff --git a/wallpapers/image/image.cpp b/wallpapers/image/image.cpp
|
||||
index 0aa72bb..0a65b7d 100644
|
||||
--- a/wallpapers/image/image.cpp
|
||||
+++ b/wallpapers/image/image.cpp
|
||||
@@ -192,7 +192,7 @@ void Image::findPreferedImageInPackage(KPackage::Package &package)
|
||||
// choose the nearest resolution, always preferring images with the same aspect ratio
|
||||
float best = FLT_MAX;
|
||||
float bestWithSameAspectRatio = FLT_MAX;
|
||||
- float targetAspectRatio = m_targetSize.width()/(float)m_targetSize.height();
|
||||
+ float targetAspectRatio = ( m_targetSize.height() > 0 ) ? m_targetSize.width() / (float)m_targetSize.height() : 0;
|
||||
|
||||
QString bestImage;
|
||||
QString bestImageWithSameAspectRatio;
|
||||
@@ -201,7 +201,7 @@ void Image::findPreferedImageInPackage(KPackage::Package &package)
|
||||
if (candidate == QSize()) {
|
||||
continue;
|
||||
}
|
||||
- float candidateAspectRatio = candidate.width()/(float)candidate.height();
|
||||
+ float candidateAspectRatio = (candidate.height() > 0 ) ? candidate.width() / (float)candidate.height() : FLT_MAX;
|
||||
|
||||
double dist = distance(candidate, m_targetSize);
|
||||
//qDebug() << "candidate" << candidate << "distance" << dist << "aspect ratio" << candidateAspectRatio;
|
||||
@@ -235,9 +235,15 @@ QSize Image::targetSize() const
|
||||
|
||||
void Image::setTargetSize(const QSize &size)
|
||||
{
|
||||
+ bool sizeChanged = m_targetSize != size;
|
||||
m_targetSize = size;
|
||||
|
||||
if (m_mode == SingleImage) {
|
||||
+ if (sizeChanged) {
|
||||
+ // If screen size was changed, we may want to select a new preferred image
|
||||
+ // which has correct aspect ratio for the new screen size.
|
||||
+ m_wallpaperPackage.removeDefinition("preferred");
|
||||
+ }
|
||||
setSingleImage();
|
||||
}
|
||||
}
|
||||
@@ -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,22 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- Add keep-wallpaper-aspect-ratio-wallpaper-on-screen-resolution-change.diff:
|
||||
* Chooses a new preferred background image when the screen
|
||||
resolution is changed to keep the correct aspect ratio (boo#990257).
|
||||
Also check for division by zero.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 6 17:18:45 UTC 2016 - fabian@ritter-vogt.de
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -32,14 +32,14 @@ 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
|
||||
# PATCH-FIX-OPENSUSE change-kioremote-severity.patch boo#997173 fabian@ritter-vogt.de -- Change default log severity for log_kioremote
|
||||
Patch1: change-kioremote-severity.patch
|
||||
Patch1: change-kioremote-severity.patch
|
||||
# PATCH-FIX-OPENSUSE 0001-Ignore-default-sddm-face-icons.patch boo#1001364 fabian@ritter-vogt.de -- Ignore default sddm face icons
|
||||
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
|
||||
# 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
|
||||
@@ -210,7 +210,7 @@ workspace. Development files.
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch100 -p1
|
||||
%patch4 -p1
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
|
||||
@@ -231,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
|
||||
@@ -338,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