pool/plasma5-workspace
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

- Add patch to fix crash with active-window-control plasmoid:

Browse Source 
* 0001-dont-crash-if-we-don-t-have-a-launcherTasksModel.patch

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=320
This commit is contained in:
Fabian Vogt
2017-05-30 17:43:48 +00:00
committed by Git OBS Bridge
parent b32ad50f84
commit def0758cc3
3 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
0001-dont-crash-if-we-don-t-have-a-launcherTasksModel.patch Normal file
View File

@@ -0,0 +1,28 @@
From 3d506f00979bedbc68d5253db22e7fa0bfdbb45e Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Tue, 30 May 2017 16:31:50 +0100
Subject: [PATCH] dont' crash if we don't have a launcherTasksModel
If we don't have a launcher tasks model it's obvious no item can match
an item in the launcher tasks model.
---
libtaskmanager/tasksmodel.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libtaskmanager/tasksmodel.cpp b/libtaskmanager/tasksmodel.cpp
index 3d791ae5..83ef8b5b 100644
--- a/libtaskmanager/tasksmodel.cpp
+++ b/libtaskmanager/tasksmodel.cpp
@@ -921,6 +921,9 @@ QVariant TasksModel::data(const QModelIndex &proxyIndex, int role) const
if (proxyIndex.data(AbstractTasksModel::IsLauncher).toBool()) {
return true;
} else {
+ if (!d->launcherTasksModel) {
+ return false;
+ }
for (int i = 0; i < d->launcherTasksModel->rowCount(); ++i) {
const QModelIndex &launcherIndex = d->launcherTasksModel->index(i, 0);
--
2.13.0

6
plasma5-workspace.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 30 17:21:05 UTC 2017 - fabian@ritter-vogt.de
- Add patch to fix crash with active-window-control plasmoid:
* 0001-dont-crash-if-we-don-t-have-a-launcherTasksModel.patch
-------------------------------------------------------------------
Fri May 26 14:10:32 CEST 2017 - fabian@ritter-vogt.de

7
plasma5-workspace.spec
View File

@@ -36,8 +36,10 @@ Source1: baselibs.conf
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.9 branch
# PATCHES 201-300 and above are from upstream master/5.10 branch
# PATCHES 100-200 and above are from upstream 5.10 branch
# PATCH-FIX-UPSTREAM
Patch100: 0001-dont-crash-if-we-don-t-have-a-launcherTasksModel.patch
# PATCHES 201-300 and above are from upstream master/5.11 branch
BuildRequires: breeze5-icons
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@@ -209,6 +211,7 @@ workspace. Development files.
%setup -q -n plasma-workspace-%{version}
%patch0 -p1
%patch1 -p1
%patch100 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}