diff --git a/.gitignore b/.gitignore index e4d26f2..b1dbecf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/plasma-desktop-5.5.2.tar.xz -/plasma-desktop-5.5.3.tar.xz -/plasma-desktop-5.5.4.tar.xz -/plasma-desktop-5.5.5.tar.xz +/plasma-desktop-5.6.1.tar.xz diff --git a/Handle-non-existing-kickoffrc-correctly.patch b/Handle-non-existing-kickoffrc-correctly.patch deleted file mode 100644 index 1814500..0000000 --- a/Handle-non-existing-kickoffrc-correctly.patch +++ /dev/null @@ -1,76 +0,0 @@ -From fc9a550fbd0cb51f5342972948c38129de1bac35 Mon Sep 17 00:00:00 2001 -From: Eike Hein -Date: Sun, 27 Mar 2016 17:13:46 +0900 -Subject: [PATCH 44/46] Handle non-existing kickoffrc correctly. - -BUG:357029 ---- - .../contents/updates/obsolete_kickoffrc.js | 24 ++++++++++++++-------- - 1 file changed, 16 insertions(+), 8 deletions(-) - -diff --git a/desktoppackage/contents/updates/obsolete_kickoffrc.js b/desktoppackage/contents/updates/obsolete_kickoffrc.js -index a3e6e9f..b95dd46 100644 ---- a/desktoppackage/contents/updates/obsolete_kickoffrc.js -+++ b/desktoppackage/contents/updates/obsolete_kickoffrc.js -@@ -1,18 +1,26 @@ - var kickoffConfig = ConfigFile("kickoffrc"); - - kickoffConfig.group = "Favorites"; --var favorites = kickoffConfig.readEntry("FavoriteURLs").split(','); -+var favorites = kickoffConfig.readEntry("FavoriteURLs"); -+var haveFavorites = (favorites.length > 0); -+ -+if (haveFavorites) { -+ favorites = favorites.split(','); -+} - - kickoffConfig.group = "SystemApplications"; --var systemApplications = kickoffConfig.readEntry("DesktopFiles").split(','); -+var systemApplications = kickoffConfig.readEntry("DesktopFiles"); -+var haveSystemApplications = (systemApplications.length > 0); -+ -+if (haveSystemApplications) { -+ systemApplications = systemApplications.split(','); - --if (systemApplications.length) { - // This used to be hardcoded in Kickoff C++ code; it's now the KConfigXT - // default but needs to be added in when migrating from the rc file. - systemApplications.unshift("systemsettings.desktop"); - } - --if (favorites.length || systemApplications.length) { -+if (haveFavorites || haveSystemApplications) { - for (var i in panels()) { - var panel = panels()[i]; - -@@ -22,11 +30,11 @@ if (favorites.length || systemApplications.length) { - if (widget.type == "org.kde.plasma.kickoff") { - widget.currentConfigGroup = ["General"]; - -- if (favorites.length) { -+ if (haveFavorites) { - widget.writeConfig("favorites", favorites); - } - -- if (systemApplications.length) { -+ if (haveSystemApplications) { - widget.writeConfig("systemApplications", systemApplications); - } - } -@@ -42,11 +50,11 @@ if (favorites.length || systemApplications.length) { - if (widget.type == "org.kde.plasma.kickoff") { - widget.currentConfigGroup = ["General"]; - -- if (favorites.length) { -+ if (haveFavorites) { - widget.writeConfig("favorites", favorites); - } - -- if (systemApplications.length) { -+ if (haveSystemApplications) { - widget.writeConfig("systemApplications", systemApplications); - } - } --- -1.9.3 - diff --git a/Set-config-group.patch b/Set-config-group.patch deleted file mode 100644 index b243acf..0000000 --- a/Set-config-group.patch +++ /dev/null @@ -1,65 +0,0 @@ -From bc28403a08c81d2c07c4582622d9c138ede24704 Mon Sep 17 00:00:00 2001 -From: Eike Hein -Date: Sun, 27 Mar 2016 17:03:57 +0900 -Subject: [PATCH 1/2] Set config group. - -BUG:357029 ---- - desktoppackage/contents/updates/obsolete_kickoffrc.js | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/desktoppackage/contents/updates/obsolete_kickoffrc.js b/desktoppackage/contents/updates/obsolete_kickoffrc.js -index d92cae9..a3e6e9f 100644 ---- a/desktoppackage/contents/updates/obsolete_kickoffrc.js -+++ b/desktoppackage/contents/updates/obsolete_kickoffrc.js -@@ -6,13 +6,13 @@ var favorites = kickoffConfig.readEntry("FavoriteURLs").split(','); - kickoffConfig.group = "SystemApplications"; - var systemApplications = kickoffConfig.readEntry("DesktopFiles").split(','); - --if (systemApplications) { -+if (systemApplications.length) { - // This used to be hardcoded in Kickoff C++ code; it's now the KConfigXT - // default but needs to be added in when migrating from the rc file. - systemApplications.unshift("systemsettings.desktop"); - } - --if (favorites || systemApplications) { -+if (favorites.length || systemApplications.length) { - for (var i in panels()) { - var panel = panels()[i]; - -@@ -20,11 +20,13 @@ if (favorites || systemApplications) { - var widget = panel.widgetById(panel.widgetIds[j]); - - if (widget.type == "org.kde.plasma.kickoff") { -- if (favorites) { -+ widget.currentConfigGroup = ["General"]; -+ -+ if (favorites.length) { - widget.writeConfig("favorites", favorites); - } - -- if (systemApplications) { -+ if (systemApplications.length) { - widget.writeConfig("systemApplications", systemApplications); - } - } -@@ -38,11 +40,13 @@ if (favorites || systemApplications) { - var widget = desktop.widgetById(desktop.widgetIds[j]); - - if (widget.type == "org.kde.plasma.kickoff") { -- if (favorites) { -+ widget.currentConfigGroup = ["General"]; -+ -+ if (favorites.length) { - widget.writeConfig("favorites", favorites); - } - -- if (systemApplications) { -+ if (systemApplications.length) { - widget.writeConfig("systemApplications", systemApplications); - } - } --- -1.9.3 - diff --git a/TaskManager-Don-t-use-Plasma-theme-icons-in-task-ico.patch b/TaskManager-Don-t-use-Plasma-theme-icons-in-task-ico.patch deleted file mode 100644 index fff1bac..0000000 --- a/TaskManager-Don-t-use-Plasma-theme-icons-in-task-ico.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: David Rosca -Date: Fri, 19 Feb 2016 16:20:00 +0100 -Subject: [PATCH 519/545] TaskManager: Don't use Plasma theme icons in task - icon - -Summary: -Also disable animation for icon in tooltip (normal Plasma tooltips -no longer have animated icon too). - -BUG: 359387 - -Reviewers: #plasma, hein - -Reviewed By: hein - -Subscribers: plasma-devel - -Projects: #plasma - -Differential Revision: https://phabricator.kde.org/D991 --- -diff -up plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/Task.qml.0519 plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/Task.qml ---- plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/Task.qml.0519 2016-02-29 11:45:49.595021502 -0600 -+++ plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/Task.qml 2016-02-29 11:49:00.288093610 -0600 -@@ -270,6 +270,7 @@ MouseArea { - - active: task.containsMouse || task.showingContextMenu - enabled: true -+ usesPlasmaTheme: false - - source: model.DecorationRole - -diff -up plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml.0519 plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml ---- plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml.0519 2016-01-26 13:39:46.000000000 -0600 -+++ plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml 2016-02-29 11:45:49.595021502 -0600 -@@ -142,6 +142,8 @@ Column { - x: _s - width: units.iconSizes.desktop - height: width -+ animated: false -+ usesPlasmaTheme: false - source: icon - } - } diff --git a/plasma-desktop.spec b/plasma-desktop.spec index b978d6b..bedc6a2 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -3,11 +3,11 @@ Name: plasma-desktop Summary: Plasma Desktop shell -Version: 5.5.5 -Release: 5%{?dist} +Version: 5.6.1 +Release: 1%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) -URL: https://projects.kde.org/plasma-desktop +URL: https://quickgit.kde.org/?p=%{name}.git %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -29,12 +29,7 @@ Patch102: plasma-desktop-fedora_layout.patch ## upstream patches -## upstream patches (master branch) -Patch519: TaskManager-Don-t-use-Plasma-theme-icons-in-task-ico.patch -# No 'favorites' in KDE menu -# https://bugzilla.redhat.com/show_bug.cgi?id=1320395 -Patch520: Set-config-group.patch -Patch521: Handle-non-existing-kickoffrc-correctly.patch +## upstream patches ## upstreamable patches # missing '#include ' means PK never used @@ -124,12 +119,8 @@ BuildRequires: xorg-x11-drv-evdev-devel Requires: plasma-workspace >= %{majmin_ver} Requires: kf5-filesystem >= %{kf5_version} -# Install breeze -Requires: plasma-breeze >= %{majmin_ver} -Requires: breeze-icon-theme >= %{majmin_ver} -%if 0%{?fedora} < 23 -Requires: kde-style-breeze >= %{majmin_ver} -%endif +# Qt Integration (brings in Breeze) +Requires: plasma-integration >= %{majmin_ver} # Install systemsettings, full set of KIO slaves and write() notifications Requires: plasma-systemsettings >= %{majmin_ver} @@ -148,6 +139,12 @@ Provides: plasmashell = %{version}-%{release} Obsoletes: kde-workspace < 5.0.0-1 +Obsoletes: kactivities-workspace < 5.6.0 +Provides: kactivities-workspace = %{version}-%{release} + +# kimpanel moved here from kdeplasma-addons-5.5.x +Conflicts: kdeplasma-addons < 5.6.0 + %description %{summary}. @@ -168,9 +165,6 @@ BuildArch: noarch %prep %setup -q -%patch519 -p1 -%patch520 -p1 -%patch521 -p1 %patch50 -p1 -b .PackageKit %if 0%{?fedora} > 22 @@ -258,6 +252,7 @@ fi %{_kf5_plugindir}/kded/*.so %{_kf5_qmldir}/org/kde/plasma/activityswitcher %{_kf5_qmldir}/org/kde/private/desktopcontainment/* +%{_kf5_qmldir}/org/kde/activities/settings/ %{_kf5_datadir}/plasma/* %ifnarch s390 s390x %{_bindir}/kapplymousetheme @@ -270,6 +265,7 @@ fi %{_datadir}/config.kcfg/touchpaddaemon.kcfg %{_datadir}/dbus-1/interfaces/org.kde.touchpad.xml %endif +%{_kf5_qtplugindir}/plasma/dataengine/plasma_engine_kimpanel.so %{_kf5_datadir}/color-schemes %{_kf5_datadir}/kconf_update/* %{_kf5_datadir}/kdisplay @@ -283,7 +279,8 @@ fi %{_kf5_datadir}/kpackage/kcms/* %{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop %{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services/fonts.desktop -%{_kf5_datadir}/kcmsolidactions +%{_kf5_datadir}/kf5/kactivitymanagerd/workspace/ +%{_kf5_datadir}/kcmsolidactions/ %{_kf5_datadir}/solid/devices/*.desktop %config %{_sysconfdir}/dbus-1/system.d/*.conf %config %{_sysconfdir}/xdg/*.knsrc @@ -319,6 +316,9 @@ fi %changelog +* Fri Apr 08 2016 Rex Dieter - 5.6.1-1 +- 5.6.1 + * Mon Mar 28 2016 Rex Dieter 5.5.5-5 - upstream fixes for: No 'favorites' in F24 KDE menu (#1320395,kde#357029) diff --git a/sources b/sources index a980c1c..49fd61e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24dc314c2d6a8044d37f95bbb6faa7ba plasma-desktop-5.5.5.tar.xz +4ef14da95b219c50e3ea5cf032f38ec6 plasma-desktop-5.6.1.tar.xz