Accepting request 499835 from KDE:Frameworks5

- Add patch to fix crash with active-window-control plasmoid:
  * 0001-dont-crash-if-we-don-t-have-a-launcherTasksModel.patch

- Update to 5.10.0
  * New feature release
  * For more details please see:
  * https://www.kde.org/announcements/plasma-5.10.0.php
- Changes since 5.9.95:
  * Always add data sources in SystemMonitorEngine::sourceRequestEvent() (kde#380209)
  * Fix co-installability with other DBus activated notification services
  * We should not forget the launchers that are not currently shown
  * remove useless debug
  * don't check for panel visible during startup
  * [Weather] Fix term used for thunderstorm in bbcukmet data db
  * [Weather] Add missing strings from bbcukmet data db
  * [Weather] Remove duplicated/bad strings from bbcukmet data db
  * [Weather] Fix lookup of bbcukmet translations strings, stored in lowercase
  * [Weather] Fix term used for thunderstorm in bbcukmet data db
  * [Weather] Add missing strings from bbcukmet data db
  * [Weather] Remove duplicated/bad strings from bbcukmet data db
  * [Weather] Fix lookup of bbcukmet translations strings, stored in lowercase

- Update to 5.9.95
  * New feature release
  * For more details please see:
  * https://www.kde.org/announcements/plasma-5.9.95.php
- Too many changes to list here
- Remove patches, now upstream:
  * change-kioremote-severity.patch
  * 0001-Some-UI-fixes-for-logout-dialog.patch

OBS-URL: https://build.opensuse.org/request/show/499835
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=64

0001-Some-UI-fixes-for-logout-dialog.patch

@@ -1,75 +0,0 @@
-From 553535ea35c9e3a2b82fc46e76e0b72fbd2143a6 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Sun, 9 Apr 2017 13:34:21 +0200
-Subject: [PATCH] Some UI fixes for logout dialog
-
-Less intrusive parts of 5f2f343ef ('UI fixes for logout dialog'):
-* add an OK button, that was complained a lot
-* Stop timer with arrow keys
-* Hide timer label if timer not running
----
- lookandfeel/contents/logout/Logout.qml       | 22 +++++++++++++++++++---
- lookandfeel/contents/logout/LogoutButton.qml |  1 +
- 2 files changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/contents/logout/Logout.qml
-index 839c390f..e1573f5e 100644
---- a/lookandfeel/contents/logout/Logout.qml
-+++ b/lookandfeel/contents/logout/Logout.qml
-@@ -74,6 +74,7 @@ PlasmaCore.ColorScope {
-     }
- 
-     Timer {
-+        id: countDownTimer
-         running: true
-         repeat: true
-         interval: 1000
-@@ -155,6 +156,14 @@ PlasmaCore.ColorScope {
- 
-         PlasmaComponents.Label {
-             Layout.alignment: Qt.AlignHCenter
-+            //opacity, as visible would re-layout
-+            opacity: countDownTimer.running ? 1 : 0
-+            Behavior on opacity {
-+                OpacityAnimator {
-+                    duration: units.longDuration
-+                    easing.type: Easing.InOutQuad
-+                }
-+            }
-             text: {
-                 switch (sdtype) {
-                     case ShutdownType.ShutdownTypeReboot:
-@@ -167,10 +176,17 @@ PlasmaCore.ColorScope {
-             }
-         }
- 
--        PlasmaComponents.Button {
-+        RowLayout {
-             Layout.alignment: Qt.AlignHCenter
--            text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Cancel")
--            onClicked: root.cancelRequested()
-+            PlasmaComponents.Button {
-+                enabled: root.currentAction != null
-+                text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "OK")
-+                onClicked: root.currentAction()
-+            }
-+            PlasmaComponents.Button {
-+                text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Cancel")
-+                onClicked: root.cancelRequested()
-+            }
-         }
-     }
- }
-diff --git a/lookandfeel/contents/logout/LogoutButton.qml b/lookandfeel/contents/logout/LogoutButton.qml
-index 4c92657e..4de0b0d3 100644
---- a/lookandfeel/contents/logout/LogoutButton.qml
-+++ b/lookandfeel/contents/logout/LogoutButton.qml
-@@ -35,4 +35,5 @@ ActionButton {
-             easing.type: Easing.InOutQuad
-         }
-     }
-+    Keys.onPressed: countDownTimer.running = false
- }
--- 
-2.12.0
-

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

@@ -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
+

change-kioremote-severity.patch

@@ -1,25 +0,0 @@
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Subject: Change default log severity for log_kioremote
-References: boo#997173
-
-This category has a lot of debug output, so it should be disabled by
-default.
-
----
- kioslave/remote/CMakeLists.txt |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: plasma-workspace-5.7.95/kioslave/remote/CMakeLists.txt
-===================================================================
---- plasma-workspace-5.7.95.orig/kioslave/remote/CMakeLists.txt
-+++ plasma-workspace-5.7.95/kioslave/remote/CMakeLists.txt
-@@ -10,7 +10,7 @@ set(kio_remote_SRCS
- ecm_qt_declare_logging_category(kio_remote_SRCS HEADER debug.h
-                                                IDENTIFIER KIOREMOTE_LOG
-                                                CATEGORY_NAME log_kioremote
--                                               DEFAULT_SEVERITY Info)
-+                                               DEFAULT_SEVERITY Debug)
- 
- add_library(kio_remote MODULE ${kio_remote_SRCS})
- target_link_libraries(kio_remote KF5::KIOCore KF5::I18n)
-

plasma-workspace-5.10.0.tar.xz

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

plasma-workspace-5.9.5.tar.xz

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

plasma5-workspace.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+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
+
+- Update to 5.10.0
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.10.0.php
+- Changes since 5.9.95:
+  * Always add data sources in SystemMonitorEngine::sourceRequestEvent() (kde#380209)
+  * Fix co-installability with other DBus activated notification services
+  * We should not forget the launchers that are not currently shown
+  * remove useless debug
+  * don't check for panel visible during startup
+  * [Weather] Fix term used for thunderstorm in bbcukmet data db
+  * [Weather] Add missing strings from bbcukmet data db
+  * [Weather] Remove duplicated/bad strings from bbcukmet data db
+  * [Weather] Fix lookup of bbcukmet translations strings, stored in lowercase
+  * [Weather] Fix term used for thunderstorm in bbcukmet data db
+  * [Weather] Add missing strings from bbcukmet data db
+  * [Weather] Remove duplicated/bad strings from bbcukmet data db
+  * [Weather] Fix lookup of bbcukmet translations strings, stored in lowercase
+
+-------------------------------------------------------------------
+Thu May 11 20:26:32 CEST 2017 - fabian@ritter-vogt.de
+
+- Update to 5.9.95
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.9.95.php
+- Too many changes to list here
+- Remove patches, now upstream:
+  * change-kioremote-severity.patch
+  * 0001-Some-UI-fixes-for-logout-dialog.patch
+  * revert-autostart-krun.patch
+
 -------------------------------------------------------------------
 Thu Apr 27 21:06:41 UTC 2017 - lbeltrame@kde.org
 

plasma5-workspace.spec

@@ -16,34 +16,30 @@
 #
 
 
-%define kf5_version 5.29.0
+%define kf5_version 5.34.0
 
 %bcond_without lang
 Name:           plasma5-workspace
-Version:        5.9.5
+Version:        5.10.0
 Release:        0
-# Full Plasma 5 version (e.g. 5.9.4)
+# Full Plasma 5 version (e.g. 5.9.1)
 %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
-# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.4 in KUF)
+# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
 %{!?_plasma5_version: %global _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
 Summary:        The KDE Plasma Workspace Components
 License:        GPL-2.0+
 Group:          System/GUI/KDE
 Url:            http://www.kde.org/
-Source:         http://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz
+Source:         plasma-workspace-%{version}.tar.xz
 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
 # 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
+Patch1:         0001-Ignore-default-sddm-face-icons.patch
-# PATCHES 100-200 and above are from upstream 5.9 branch
+# PATCHES 100-200 and above are from upstream 5.10 branch
 # PATCH-FIX-UPSTREAM
-Patch100:       revert-autostart-krun.patch
+Patch100:       0001-dont-crash-if-we-don-t-have-a-launcherTasksModel.patch
-# PATCHES 201-300 and above are from upstream master/5.10 branch
+# PATCHES 201-300 and above are from upstream master/5.11 branch
-# PATCH-FIX-UPSTREAM
-Patch201:       0001-Some-UI-fixes-for-logout-dialog.patch
 BuildRequires:  breeze5-icons
 BuildRequires:  fdupes
 BuildRequires:  kf5-filesystem
@@ -215,9 +211,7 @@ workspace. Development files.
 %setup -q -n plasma-workspace-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch100 -p1
-%patch201 -p1
 
 %build
   %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
@@ -276,6 +270,7 @@ workspace. Development files.
 %{_kf5_bindir}/startkde
 %{_kf5_bindir}/startplasmacompositor
 %{_kf5_bindir}/systemmonitor
+%{_kf5_bindir}/plasma_waitforname
 %{_kf5_configdir}/autostart/plasmashell.desktop
 %{_kf5_configdir}/autostart/klipper.desktop
 %{_kf5_configdir}/autostart/krunner.desktop
@@ -301,6 +296,7 @@ workspace. Development files.
 %{_kf5_configkcfgdir}/freespacenotifier.kcfg
 %{_kf5_sharedir}/dbus-1/services/kf5_org.kde.kuiserver.service
 %{_kf5_sharedir}/dbus-1/services/org.kde.krunner.service
+%{_kf5_sharedir}/dbus-1/services/org.kde.plasma.Notifications.service
 %{_kf5_sharedir}/desktop-directories/
 %{_kf5_sharedir}/kconf_update/
 %dir %{_kf5_htmldir}

revert-autostart-krun.patch

@@ -1,82 +0,0 @@
-From ea3f87c5df0251838da71c473fd7b790c932d8b0 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Thu, 27 Apr 2017 15:52:39 +0100
-Subject: Revert "launch autostart apps in ksmserver using KRun"
-
-KRun::runApplication will show blocking error dialogs if it fails to
-find the executable
-This means we don't autostart the next app, which could be fatal if it
-comes before...
-
-Summary:
-...kwin/plasma
-We shouldn't be having blocking calls in ksmserver it can deadlock
-And even in the best case we'd still end up blocking ksplash for 30
-seconds
-
-We then port to KProcess which was part of the motivation behind the
-patch as it
-has better stdout handling
-
-This reverts commit 0f19e92f3e85d064de9cebf280fa8e085485c2e0.
-
-BUG: 379254
-
-Also added port of autostarting applications to KProcess
-It has better stdout handling
-
-Test Plan: Logged in, still got my main session
-
-Reviewers: #plasma, mart
-
-Reviewed By: mart
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D5618
----
- ksmserver/startup.cpp | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
-index e51278b..767116d 100644
---- a/ksmserver/startup.cpp
-+++ b/ksmserver/startup.cpp
-@@ -68,9 +68,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
- #include <kconfig.h>
- #include <kconfiggroup.h>
-+#include <kio/desktopexecparser.h>
- #include <KSharedConfig>
- #include <kprocess.h>
--#include <krun.h>
- #include <KNotifyConfig>
- #include <KService>
- 
-@@ -679,8 +679,19 @@ void KSMServer::slotAutoStart()
-         }
-         KService service(serviceName);
-         qCInfo(KSMSERVER) << "Starting autostart service " << serviceName;
--        if( !KRun::runApplication( service, QList<QUrl>(), nullptr, KRun::RunFlags(), QString(), "0" ))
--            qCInfo(KSMSERVER) << "autostart service" << serviceName << "failed to launch";
-+        auto p = new KProcess(this);
-+        auto arguments = KIO::DesktopExecParser(service, QList<QUrl>()).resultingArguments();
-+        if (arguments.isEmpty()) {
-+            qCInfo(KSMSERVER) << "failed to parse" << serviceName << "for autostart";
-+            continue;
-+        }
-+        auto program = arguments.takeFirst();
-+        p->setProgram(program, arguments);
-+        p->start();
-+        connect(p, static_cast<void (QProcess::*)(int)>(&QProcess::finished), [p](int exitCode) {
-+            qCInfo(KSMSERVER) << "autostart service" << p->program() << "finished with exit code " << exitCode;
-+            p->deleteLater();
-+        });
-     } while (true);
-     // Loop till we find a service that we can start.
- }
--- 
-cgit v0.11.2
-