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

0001-take-the-proper-default-at-first-start.patch

@@ -1,30 +0,0 @@
-From 3b2d770df42def293dbf4fed6bc2a1431b78490d Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Fri, 26 Sep 2014 15:43:22 +0200
-Subject: [PATCH 1/1] take the proper default at first start
-
-wallpaper.configuration.Image is empty at first start, but the
-image wallpaper object has the proper default
-
-BUG:339414
----
- wallpapers/image/imagepackage/contents/ui/main.qml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/wallpapers/image/imagepackage/contents/ui/main.qml b/wallpapers/image/imagepackage/contents/ui/main.qml
-index 3ec8391..d81bd29 100644
---- a/wallpapers/image/imagepackage/contents/ui/main.qml
-+++ b/wallpapers/image/imagepackage/contents/ui/main.qml
-@@ -86,6 +86,9 @@ Rectangle {
-     }
- 
-     Component.onCompleted: {
-+        if (!configuredImage && imageWallpaper.wallpaperPath) {
-+            return;
-+        }
-         imageWallpaper.addUrl(configuredImage)
-         if (wallpaper.pluginName == "org.kde.slideshow") {
-             wallpaper.setAction("next", i18nd("plasma_applet_org.kde.image","Next Wallpaper Image"),"user-desktop");
--- 
-2.1.0
-

0002-Fix-NotificationPopup-size.patch

@@ -1,37 +0,0 @@
-From 268c1d250fad9421c1787355a2b6fae4e8d1ef2a Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Sat, 27 Sep 2014 21:32:17 +0200
-Subject: [PATCH 2/5] Fix NotificationPopup size
-
-REVIEW: 120390
----
- applets/notifications/package/contents/ui/NotificationPopup.qml | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/applets/notifications/package/contents/ui/NotificationPopup.qml b/applets/notifications/package/contents/ui/NotificationPopup.qml
-index 63036f1..26c7ed2 100644
---- a/applets/notifications/package/contents/ui/NotificationPopup.qml
-+++ b/applets/notifications/package/contents/ui/NotificationPopup.qml
-@@ -18,6 +18,8 @@
-  */
- 
- import QtQuick 2.0
-+import QtQuick.Layouts 1.1
-+
- import org.kde.plasma.core 2.0 as PlasmaCore
- import org.kde.plasma.components 2.0 as PlasmaComponents
- import org.kde.plasma.extras 2.0 as PlasmaExtras
-@@ -57,8 +59,8 @@ PlasmaCore.Dialog {
- 
-     mainItem: MouseEventListener {
-         id: root
--        height: Math.max(actionsColumn.height + closeButton.height + (3 * units.smallSpacing), (4.5 * units.gridUnit))
--        width: Math.round(23 * units.gridUnit)
-+        Layout.minimumWidth: Math.round(23 * units.gridUnit)
-+        Layout.minimumHeight: Math.max(actionsColumn.height + closeButton.height + (3 * units.smallSpacing), (4.5 * units.gridUnit))
- 
-         state: "controlsHidden"
-         hoverEnabled: true
--- 
-2.1.0
-

0004-Show-application-title-if-Status-Notifier-Item-does-.patch

@@ -1,78 +0,0 @@
-From 909f1f1ad82248aea6581f8b6576675877ea18b5 Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Sun, 28 Sep 2014 19:41:15 +0200
-Subject: [PATCH 4/5] Show application title if Status Notifier Item does not
- provide a tooltip
-
-A custom tooltip text is not mandated by the SNI spec. Instead, we just show
-the application name and icon if none is given.
-This fixes Steam not having a tooltip and restores Plasma 4.x behavior.
-
-REVIEW: 120407
-BUG: 337710
-FIXED-IN: 5.1
----
- .../dbussystemtray/dbussystemtraytask.cpp          | 42 ++++++++++++++++------
- 1 file changed, 31 insertions(+), 11 deletions(-)
-
-diff --git a/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp b/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
-index 14458e9..f878ffd 100644
---- a/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
-+++ b/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
-@@ -420,22 +420,42 @@ void DBusSystemTrayTask::syncIcons(const Plasma::DataEngine::Data &properties)
- 
- void DBusSystemTrayTask::syncToolTip(const QString &title, const QString &subTitle, const QIcon &toolTipIcon)
- {
--    if (title != m_tooltipTitle) {
--        m_tooltipTitle = title;
--        emit changedTooltipTitle();
--    }
-+    if (title.isEmpty() && subTitle.isEmpty()) {
-+        // if empty tooltip use application name as fallback
-+        if (m_tooltipTitle != name()) {
-+            m_tooltipTitle = name();
-+            emit changedTooltipTitle();
-+        }
-+
-+        if (!m_tooltipText.isEmpty()) {
-+            m_tooltipText.clear();
-+            emit changedTooltipText();
-+        }
-+    } else {
-+        if (title != m_tooltipTitle) {
-+            m_tooltipTitle = title;
-+            emit changedTooltipTitle();
-+        }
- 
--    if (subTitle != m_tooltipText) {
--        m_tooltipText = subTitle;
--        emit changedTooltipText();
-+        if (subTitle != m_tooltipText) {
-+            m_tooltipText = subTitle;
-+            emit changedTooltipText();
-+        }
-     }
- 
--    bool is_icon_name_changed = (m_tooltipIcon.name() != toolTipIcon.name());
-+    bool iconNameChanged = false;
- 
--    m_tooltipIcon = toolTipIcon;
--    emit changedTooltip();
-+    if (toolTipIcon.isNull()) {
-+        iconNameChanged = m_tooltipIcon.name() != m_icon.name();
-+        m_tooltipIcon = m_icon;
-+    } else {
-+        iconNameChanged = m_tooltipIcon.name() != toolTipIcon.name();
-+        m_tooltipIcon = toolTipIcon;
-+        emit changedTooltip();
-+    }
- 
--    if (is_icon_name_changed) {
-+    emit changedTooltip();
-+    if (iconNameChanged) {
-         emit changedTooltipIconName();
-     }
- }
--- 
-2.1.0
-

plasma-workspace-5.0.95.tar.xz

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

plasma-workspace-5.1.0.tar.xz

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

plasma5-workspace.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Oct  9 21:24:39 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.1 Final:
+  * Bugfixes since RC1
+  * For more details please see:
+    https://www.kde.org/announcements/plasma-5.1.0.php
+- Drop 0002-Fix-NotificationPopup-size.patch,
+  0001-take-the-proper-default-at-first-start.patch and
+  0004-Show-application-title-if-Status-Notifier-Item-does-.patch,
+  merged upstream
+- Hardcode versions of plasma-framework-componets and
+  plasma-framework-private packages, as upstream doesn't
+  keep backwards compability there
+
 -------------------------------------------------------------------
 Fri Sep 26 09:20:21 UTC 2014 - hrvoje.senjan@gmail.com
 

plasma5-workspace.spec

@@ -17,7 +17,7 @@
 
 
 Name:           plasma5-workspace
-Version:        5.0.95
+Version:        5.1.0
 Release:        0
 Summary:        The KDE Plasma Workspace Components
 License:        GPL-2.0+
@@ -32,13 +32,6 @@ Patch0:         0001-Rename-qdbus-in-startkde.patch
 Patch1:         create_kdehome.patch
 # PATCH-FIX_OPENSUSE 0003-Remove-export-of-QT_PLUGIN_PATH.patch -- we install plugins to directory known to Qt5, so export just pollutes both Qt4 and Qt5 plugins
 Patch2:         0003-Remove-export-of-QT_PLUGIN_PATH.patch
-# PATCH-FIX_UPSTREAM 0001-take-the-proper-default-at-first-start.patch -- kde#339216, kde#339414
-Patch3:         0001-take-the-proper-default-at-first-start.patch
-# PATCHES 100-200 are taken from upstream
-# PATCH-FIX_UPSTREAM 0002-Fix-NotificationPopup-size.patch
-Patch100:       0002-Fix-NotificationPopup-size.patch
-# PATCH-FIX_UPSTREAM 0004-Show-application-title-if-Status-Notifier-Item-does-.patch
-Patch101:       0004-Show-application-title-if-Status-Notifier-Item-does-.patch
 BuildRequires:  alsa-devel
 BuildRequires:  baloo5-devel >= 5.0.0
 BuildRequires:  kactivities5-devel >= 5.0.0
@@ -112,6 +105,9 @@ Requires:       solid-imports
 # dialog/platformtheme/etc
 Requires:       frameworkintegration-plugin
 Requires:       libkscreen2-plugin
+# hardcode versions of plasma-framework-componets and plasma-framework-private packages, as upstream doesn't keep backwards compability there
+%requires_eq plasma-framework-componets
+%requires_eq plasma-framework-private
 # de-facto even required...
 Recommends:     kactivities5
 # we want wallpaper previews
@@ -179,9 +175,6 @@ workspace. Development files.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch100 -p1
-%patch101 -p1
 
 %build
   %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5