OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=242

0001-check-harder-to-include-only-desktops-in-desktops.patch

@@ -1,28 +0,0 @@
-From a2850caf4a442c5e92d4c027b9a1c78c9dee24b5 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Fri, 29 Jul 2016 13:23:18 +0200
-Subject: [PATCH 1/2] check harder to include only desktops in desktops()
-
-only desktops have an assigned activtyId, but some
-containments are !isPanel() (like the systray)
----
- shell/scripting/scriptengine.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/shell/scripting/scriptengine.cpp b/shell/scripting/scriptengine.cpp
-index f368e7e3b918bb09e69a3cb486680ab3d85fd15e..a17ba1a708ddc69caa483a667c7c390c52d6d84b 100644
---- a/shell/scripting/scriptengine.cpp
-+++ b/shell/scripting/scriptengine.cpp
-@@ -882,7 +882,8 @@ QScriptValue ScriptEngine::desktops(QScriptContext *context, QScriptEngine *engi
-     int count = 0;
- 
-     foreach (Plasma::Containment *c, env->corona()->containments()) {
--        if (!isPanel(c)) {
-+        //make really sure we get actual desktops, so check for a non empty activty id
-+        if (!isPanel(c) && !c->activity().isEmpty()) {
-             containments.setProperty(count, env->wrap(c));
-             ++count;
-         }
--- 
-2.6.6
-

0002-don-t-try-to-load-layout-before-kamd-starts.patch

@@ -1,39 +0,0 @@
-From f7ef6ee87b8957bebc976b6fc9e0df279cea05f1 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Wed, 20 Jul 2016 13:57:08 +0200
-Subject: [PATCH 02/11] don't try to load layout before kamd starts
-
-if the status of kamd is anything but running, refuse to
-execute load()
-this fixes activity creation in default layout initialization
----
- shell/shellcorona.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
-index 93a218addeb965ca421ac593f1ab5373bc344431..8b873aa8a382399b8bfc7ae7c6ff0ba65041d37e 100644
---- a/shell/shellcorona.cpp
-+++ b/shell/shellcorona.cpp
-@@ -302,7 +302,9 @@ void ShellCorona::setShell(const QString &shell)
- 
-     connect(m_activityController, &KActivities::Controller::serviceStatusChanged, this, &ShellCorona::load, Qt::UniqueConnection);
- 
--    load();
-+    if (m_activityController->serviceStatus() == KActivities::Controller::Running) {
-+        load();
-+    }
- }
- 
- QString ShellCorona::shell() const
-@@ -330,7 +332,7 @@ static QList<QScreen*> sortOutputs(const QList<QScreen*> &outputs)
- void ShellCorona::load()
- {
-     if (m_shell.isEmpty() ||
--        m_activityController->serviceStatus() == KActivities::Controller::Unknown) {
-+        m_activityController->serviceStatus() != KActivities::Controller::Running) {
-         return;
-     }
- 
--- 
-2.6.6
-

0006-Treat-IsDemandingAttention-as-IsOnAllVirtualDesktops.patch

@@ -1,27 +0,0 @@
-From da5c2fd5058e60d12bfbdfa2b1863433ab20dfbb Mon Sep 17 00:00:00 2001
-From: Eike Hein <hein@kde.org>
-Date: Sat, 23 Jul 2016 05:47:51 +0900
-Subject: [PATCH 06/11] Treat IsDemandingAttention as IsOnAllVirtualDesktops.
-
-BUG:365970
----
- libtaskmanager/taskfilterproxymodel.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libtaskmanager/taskfilterproxymodel.cpp b/libtaskmanager/taskfilterproxymodel.cpp
-index 79b902e5b7fe9d2c975405b88c60a747f1385685..803db2199417a979916bd267536a9e1f67db603f 100644
---- a/libtaskmanager/taskfilterproxymodel.cpp
-+++ b/libtaskmanager/taskfilterproxymodel.cpp
-@@ -288,7 +288,8 @@ bool TaskFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &so
- 
-     // Filter by virtual desktop.
-     if (d->filterByVirtualDesktop && d->virtualDesktop != 0) {
--        if (!sourceIdx.data(AbstractTasksModel::IsOnAllVirtualDesktops).toBool()) {
-+        if (!sourceIdx.data(AbstractTasksModel::IsOnAllVirtualDesktops).toBool()
-+            && !sourceIdx.data(AbstractTasksModel::IsDemandingAttention).toBool()) {
-             const QVariant &virtualDesktop = sourceIdx.data(AbstractTasksModel::VirtualDesktop);
- 
-             if (!virtualDesktop.isNull()) {
--- 
-2.6.6
-

0007-apparently-containment-can-be-null.patch

@@ -1,27 +0,0 @@
-From 214443fdff330629104509de9e1738aadcfe36b6 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 25 Jul 2016 10:16:03 +0200
-Subject: [PATCH 07/11] apparently containment() can be null
-
-null in some rare occasions during startup
-CCBUG:365989
----
- shell/desktopview.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/shell/desktopview.cpp b/shell/desktopview.cpp
-index 509184dc4ae77014800517ecea076f5faee2ebdd..83866dc77ab394b7c8f91d5a1016669b29abb5c3 100644
---- a/shell/desktopview.cpp
-+++ b/shell/desktopview.cpp
-@@ -193,7 +193,7 @@ bool DesktopView::event(QEvent *e)
-     } else if (e->type() == QEvent::FocusIn) {     //FIXME: this should *not* be needed
-         ensureWindowType();
- 
--    } else if (e->type() == QEvent::FocusOut) {
-+    } else if (e->type() == QEvent::FocusOut && containment()) {
-         QObject *graphicObject = containment()->property("_plasma_graphicObject").value<QObject *>();
-         if (graphicObject) {
-             graphicObject->setProperty("focus", false);
--- 
-2.6.6
-

0010-Properly-registering-existing-activities-before-load.patch

@@ -1,52 +0,0 @@
-From 475bed7373142afe20927acbc465f269cfa59878 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@kde.org>
-Date: Mon, 25 Jul 2016 22:48:13 +0200
-Subject: [PATCH 10/11] Properly registering existing activities before loading
- layout.js
-
-Reviewers: #plasma, mart, davidedmundson
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D2288
----
- shell/shellcorona.cpp | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
-index 757b32c0a8fd44a6427594ab752d74a802867f35..c993eec300e0eb5a375449c0fe35e6d4c548ce35 100644
---- a/shell/shellcorona.cpp
-+++ b/shell/shellcorona.cpp
-@@ -345,7 +345,12 @@ void ShellCorona::load()
-     loadLayout("plasma-" + m_shell + "-appletsrc");
- 
-     checkActivities();
-+
-     if (containments().isEmpty()) {
-+        // Seems like we never really get to this point since loadLayout already
-+        // (virtually) calls loadDefaultLayout if it does not load anything
-+        // from the config file. Maybe if the config file is not empty,
-+        // but still does not have any containments
-         loadDefaultLayout();
-         processUpdateScripts();
-     } else {
-@@ -575,6 +580,14 @@ void ShellCorona::loadDefaultLayout()
-         QString code = file.readAll();
-         qDebug() << "evaluating startup script:" << script;
- 
-+        // We need to know which activities are here in order for
-+        // the scripting engine to work. activityAdded does not mind
-+        // if we pass it the same activity multiple times
-+        QStringList existingActivities = m_activityController->activities();
-+        foreach (const QString &id, existingActivities) {
-+            activityAdded(id);
-+        }
-+
-         WorkspaceScripting::ScriptEngine scriptEngine(this);
- 
-         connect(&scriptEngine, &WorkspaceScripting::ScriptEngine::printError, this,
--- 
-2.6.6
-

plasma-workspace-5.7.2.tar.xz

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

plasma-workspace-5.7.3.tar.xz

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

plasma5-workspace.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Aug  3 07:14:32 UTC 2016 - fabian@ritter-vogt.de
+
+- Remove 0001-Workaround-kde-362531.patch as fixed in kwindowsystem
+
+-------------------------------------------------------------------
+Tue Aug  2 11:36:06 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Update to 5.7.3
+  * New bugfix release
+  * For more details please see:
+    https://www.kde.org/announcements/plasma-5.7.3.php
+- Drop upstreamed patches:
+  0002-don-t-try-to-load-layout-before-kamd-starts.patch
+  0006-Treat-IsDemandingAttention-as-IsOnAllVirtualDesktops.patch
+  0007-apparently-containment-can-be-null.patch
+  0010-Properly-registering-existing-activities-before-load.patch
+  0001-check-harder-to-include-only-desktops-in-desktops.patch
+
 -------------------------------------------------------------------
 Mon Aug  1 11:42:08 UTC 2016 - alarrosa@suse.com
 

plasma5-workspace.spec

@@ -18,9 +18,9 @@
 
 %bcond_without lang
 Name:           plasma5-workspace
-Version:        5.7.2
+Version:        5.7.3
 Release:        0
-%define plasma_version 5.7.2
+%define plasma_version 5.7.3
 Summary:        The KDE Plasma Workspace Components
 License:        GPL-2.0+
 Group:          System/GUI/KDE
@@ -35,14 +35,7 @@ Patch1:         require-qt56.diff
 Patch2:         fix-breeze-sddm-theme-with-many-users.patch
 # PATCH-FIX-OPENSUSE plasmashell-disable-windowclosing-on-logout.patch kde#349805 wbauer@tmo.at -- Prevent plasma from closing too early on logout resulting in an unusable desktop if the logout is cancelled
 Patch4:         plasmashell-disable-windowclosing-on-logout.patch
-# PATCH-FIX-OPENSUSE 0001-Workaround-kde-362531.patch kde#362531 fabian@ritter-vogt.de -- Delay plasma startup by a second so that effects can be queried
-Patch5:         0001-Workaround-kde-362531.patch
 # PATCHES 100-200 and above are from upstream 5.7 branch
-Patch100:       0002-don-t-try-to-load-layout-before-kamd-starts.patch
-Patch102:       0006-Treat-IsDemandingAttention-as-IsOnAllVirtualDesktops.patch
-Patch103:       0007-apparently-containment-can-be-null.patch
-Patch104:       0010-Properly-registering-existing-activities-before-load.patch
-Patch105:       0001-check-harder-to-include-only-desktops-in-desktops.patch
 # PATCHES 201-300 and above are from upstream master/5.8 branch
 # PATCH-FEATURE-UPSTREAM Configuration-option-for-System-Tray-icon-size.patch
 Patch201:       Configuration-option-for-System-Tray-icon-size.patch
@@ -225,12 +218,6 @@ workspace. Development files.
 %if 0%{?is_opensuse} || 0%{?suse_version} > 1315
 %patch4 -p1
 %endif
-%patch5 -p1
-%patch100 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
 %patch201 -p1
 
 %build
@@ -364,7 +351,7 @@ workspace. Development files.
 
 %if %{with lang}
 %files lang -f %{name}.lang
-%doc %lang(ca) %{_kf5_htmldir}/ca/
+%doc %lang(de) %{_kf5_htmldir}/de/
 %doc %lang(cs) %{_kf5_htmldir}/cs/
 %endif