Accepting request 511290 from KDE:Frameworks5

(forwarded request 511247 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/511290
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=71
This commit is contained in:
Dominique Leuenberger 2017-07-25 09:38:50 +00:00 committed by Git OBS Bridge
commit 106fe4d26f
5 changed files with 20 additions and 39 deletions

View File

@ -1,33 +0,0 @@
From 8a05294e5b3ef1df86f099edde837b8c8d28ccaf Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Wed, 12 Jul 2017 18:06:28 +0200
Subject: [Notifications] Check for corona to avoid crash
My previous attempt only fixed the case when notifications were directly in a panel.
Now it also no longer crashes when removing a panel that has a System Tray with the
notifications applet in it.
BUG: 378508
FIXED-IN: 5.8.8
Differential Revision: https://phabricator.kde.org/D6653
---
applets/notifications/lib/notificationsapplet.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/applets/notifications/lib/notificationsapplet.cpp b/applets/notifications/lib/notificationsapplet.cpp
index 4474c8c..f49071c 100644
--- a/applets/notifications/lib/notificationsapplet.cpp
+++ b/applets/notifications/lib/notificationsapplet.cpp
@@ -63,7 +63,7 @@ void NotificationsApplet::onScreenChanges()
{
// when removing the panel the applet is in, the containment is being destroyed but its corona is still
// there, rightfully emitting availableScreenRectChanged and then we blow up if we try to access it.
- if (!containment()) {
+ if (!containment() || !containment()->corona()) {
return;
}
--
cgit v0.11.2

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:69d7513ad0ba0acc224cd0dee824795c20e8733f52704e3cf3dca5f6ae6cdf71
size 6994932

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c05578186d1b715042723f99196b981ce6c8a606e4e574681dad31db946a121
size 6953964

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Jul 18 16:14:48 CEST 2017 - fabian@ritter-vogt.de
- Update to 5.10.4
* New bugfix release
* For more details please see:
* https://www.kde.org/announcements/plasma-5.10.4.php
- Changes since 5.10.3:
* Fix compilation with current cmake (git branch release).
* [Notification Item] Enforce PlainText for summary
* [Notifications] Check for corona to avoid crash (kde#378508)
* [Windowed Widgets Runner] Fix launching widget
* [lookandfeel/lockscreen] Fix state handling when clicking the keyboard's own hide button (kde#381833)
- Remove patches, now upstream:
* Notifications-Check-for-corona-to-avoid-crash.patch
-------------------------------------------------------------------
Wed Jul 12 16:36:16 UTC 2017 - wbauer@tmo.at

View File

@ -20,7 +20,7 @@
%bcond_without lang
Name: plasma5-workspace
Version: 5.10.3
Version: 5.10.4
Release: 0
# Full Plasma 5 version (e.g. 5.9.1)
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
@ -37,7 +37,6 @@ Patch0: 0001-Rename-qdbus-in-startkde.patch
# PATCH-FIX-OPENSUSE 0001-Ignore-default-sddm-face-icons.patch boo#1001364 fabian@ritter-vogt.de -- Ignore default sddm face icons
Patch1: 0001-Ignore-default-sddm-face-icons.patch
# PATCHES 100-200 and above are from upstream 5.10 branch
Patch100: Notifications-Check-for-corona-to-avoid-crash.patch
# PATCHES 201-300 and above are from upstream master/5.11 branch
Patch201: applauncher-allow-to-show-apps-by-name.patch
Patch202: logoutdialog-honor-Offer-shutdown-options.patch
@ -212,7 +211,6 @@ workspace. Development files.
%setup -q -n plasma-workspace-%{version}
%patch0 -p1
%patch1 -p1
%patch100 -p1
%patch201 -p1
%patch202 -p1