Accepting request 501498 from KDE:Frameworks5

Plasma 5.10.1

OBS-URL: https://build.opensuse.org/request/show/501498
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=65
This commit is contained in:
Dominique Leuenberger 2017-06-10 15:56:14 +00:00 committed by Git OBS Bridge
commit cbdf6ac757
5 changed files with 33 additions and 36 deletions

View File

@ -1,28 +0,0 @@
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

View File

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

View File

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

View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Tue Jun 6 17:19:56 CEST 2017 - fabian@ritter-vogt.de
- Update to 5.10.1
* New bugfix release
* For more details please see:
* https://www.kde.org/announcements/plasma-5.10.1.php
- Changes since 5.10.0:
* Fix testing when the test has qml syntax errors
* Fix variable name and logic
* Only enable MPRIS global shortcuts on demand (kde#380526)
* Small fix on test helper
* [xembedsniproxy] Fix check whether to use XTest (kde#362941,kde#375017)
* dont' crash if we don't have a launcherTasksModel
* don't show logout when kauthorized doesn't want it (kde#380344)
* [TaskGroupingProxyModel] Use LauncherUrlWithoutIcon
* Always add data sources in SystemMonitorEngine::sourceRequestEvent() (kde#380209)
- Remove patches, now upstream:
* xembedsniproxy-fix-using-XTest.patch
* 0001-dont-crash-if-we-don-t-have-a-launcherTasksModel.patch
-------------------------------------------------------------------
Wed May 31 13:18:59 UTC 2017 - wbauer@tmo.at
- Add xembedsniproxy-fix-using-XTest.patch to fix clicking on
system tray icons of certain applications, mainly GTK3 and Java
(boo#1026999, kde#362941, kde#375017)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 30 17:21:05 UTC 2017 - fabian@ritter-vogt.de Tue May 30 17:21:05 UTC 2017 - fabian@ritter-vogt.de

View File

@ -20,7 +20,7 @@
%bcond_without lang %bcond_without lang
Name: plasma5-workspace Name: plasma5-workspace
Version: 5.10.0 Version: 5.10.1
Release: 0 Release: 0
# Full Plasma 5 version (e.g. 5.9.1) # Full Plasma 5 version (e.g. 5.9.1)
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
@ -30,15 +30,13 @@ Summary: The KDE Plasma Workspace Components
License: GPL-2.0+ License: GPL-2.0+
Group: System/GUI/KDE Group: System/GUI/KDE
Url: http://www.kde.org/ 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 Source1: baselibs.conf
# PATCH-FIX-OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux@gmx.com -- Rename the qdbus executable in startkde # 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 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 # 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 Patch1: 0001-Ignore-default-sddm-face-icons.patch
# PATCHES 100-200 and above are from upstream 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 # PATCHES 201-300 and above are from upstream master/5.11 branch
BuildRequires: breeze5-icons BuildRequires: breeze5-icons
BuildRequires: fdupes BuildRequires: fdupes
@ -211,7 +209,6 @@ workspace. Development files.
%setup -q -n plasma-workspace-%{version} %setup -q -n plasma-workspace-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch100 -p1
%build %build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}