From 6e575ab888cf5e054e529f7d0a5e25c61c36230d81ea567a4d282ff51a3d645f Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 8 Oct 2017 19:29:10 +0000 Subject: [PATCH 1/4] - Add patch to fix editing of system icons in the runner favorite area: * 0001-Fix-editing-items-in-SimpleFavoritesModel.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=353 --- ...diting-items-in-SimpleFavoritesModel.patch | 173 ++++++++++++++++++ plasma5-workspace.changes | 6 + plasma5-workspace.spec | 7 +- 3 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 0001-Fix-editing-items-in-SimpleFavoritesModel.patch diff --git a/0001-Fix-editing-items-in-SimpleFavoritesModel.patch b/0001-Fix-editing-items-in-SimpleFavoritesModel.patch new file mode 100644 index 0000000..dc33334 --- /dev/null +++ b/0001-Fix-editing-items-in-SimpleFavoritesModel.patch @@ -0,0 +1,173 @@ +From f078b1272d84f6b9271377900875d39f7d9fda84 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Sat, 7 Oct 2017 14:30:52 +0200 +Subject: [PATCH] Fix editing items in SimpleFavoritesModel + +Summary: +tools.js is supposed to support both KaStatsFavoritesModel (used for +favorite applications) and SimpleFavoritesModel (used for system actions, +like poweroff/reboot/logout). The latter did not work though, as tools.js +unconditionally calls methods only present in KaStatsFavoritesModel. +This commit makes KaStatsFavoritesModel API compatible to SimpleFavoritesModel +and changes the relevant code in tools.js to support both. + +Additionally, this syncs applets/kickoff/package/contents/code/tools.js again. + +BUG: 385463 + +Test Plan: +Before this patch it wasn't possible to remove system actions from +the favorites bar. + +Reviewers: #plasma + +Subscribers: plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D8178 +--- + applets/kicker/package/contents/code/tools.js | 12 ++++++------ + applets/kicker/plugin/kastatsfavoritesmodel.cpp | 4 ++-- + applets/kickoff/package/contents/code/tools.js | 24 +++++++++++++----------- + 3 files changed, 21 insertions(+), 19 deletions(-) + +diff --git a/applets/kicker/package/contents/code/tools.js b/applets/kicker/package/contents/code/tools.js +index c6fc3d9f..df3a3444 100644 +--- a/applets/kicker/package/contents/code/tools.js ++++ b/applets/kicker/package/contents/code/tools.js +@@ -44,9 +44,9 @@ function createFavoriteActions(favoriteModel, favoriteId) { + return null; + } + +- var activities = favoriteModel.activities.runningActivities; + +- if (activities.length <= 1) { ++ if (favoriteModel.activities === undefined || ++ favoriteModel.activities.runningActivities.length <= 1) { + var action = {}; + + if (favoriteModel.isFavorite(favoriteId)) { +@@ -70,6 +70,8 @@ function createFavoriteActions(favoriteModel, favoriteId) { + + var linkedActivities = favoriteModel.linkedActivitiesFor(favoriteId); + ++ var activities = favoriteModel.activities.runningActivities; ++ + // Adding the item to link/unlink to all activities + + var linkedToAllActivities = +@@ -180,12 +182,10 @@ function handleFavoriteAction(actionId, actionArgument) { + + if (actionId == "_kicker_favorite_remove") { + console.log("Removing from all activities"); +- favoriteModel.removeFavoriteFrom(favoriteId, ":any"); +- ++ favoriteModel.removeFavorite(favoriteId); + } else if (actionId == "_kicker_favorite_add") { + console.log("Adding to global activity"); +- favoriteModel.addFavoriteTo(favoriteId, ":global"); +- ++ favoriteModel.addFavorite(favoriteId); + } else if (actionId == "_kicker_favorite_remove_from_activity") { + console.log("Removing from a specific activity"); + favoriteModel.removeFavoriteFrom(favoriteId, actionArgument.favoriteActivity); +diff --git a/applets/kicker/plugin/kastatsfavoritesmodel.cpp b/applets/kicker/plugin/kastatsfavoritesmodel.cpp +index 787a6676..da89c0ac 100644 +--- a/applets/kicker/plugin/kastatsfavoritesmodel.cpp ++++ b/applets/kicker/plugin/kastatsfavoritesmodel.cpp +@@ -570,13 +570,13 @@ void KAStatsFavoritesModel::portOldFavorites(const QStringList &ids) + void KAStatsFavoritesModel::addFavorite(const QString &id, int index) + { + DEBUG << "addFavorite" << id << index << " -->"; +- addFavoriteTo(id, Activity::current(), index); ++ addFavoriteTo(id, QStringLiteral(":global")); + } + + void KAStatsFavoritesModel::removeFavorite(const QString &id) + { + DEBUG << "removeFavorite" << id << " -->"; +- removeFavoriteFrom(id, Activity::current()); ++ removeFavoriteFrom(id, QStringLiteral(":any")); + } + + void KAStatsFavoritesModel::addFavoriteTo(const QString &id, const QString &activityId, int index) +diff --git a/applets/kickoff/package/contents/code/tools.js b/applets/kickoff/package/contents/code/tools.js +index 545d7aff..df3a3444 100644 +--- a/applets/kickoff/package/contents/code/tools.js ++++ b/applets/kickoff/package/contents/code/tools.js +@@ -29,6 +29,7 @@ function fillActionMenu(actionMenu, actionList, favoriteModel, favoriteId) { + if (actionList && actionList.length > 0) { + var separator = { "type": "separator" }; + actionList.unshift(separator); ++ // actionList = actions.concat(actionList); // this crashes Qt O.o + actionList.unshift.apply(actionList, actions); + } else { + actionList = actions; +@@ -39,18 +40,13 @@ function fillActionMenu(actionMenu, actionList, favoriteModel, favoriteId) { + } + + function createFavoriteActions(favoriteModel, favoriteId) { +- // Don't allow changes to favorites when system is immutable. +- if (plasmoid.immutability === PlasmaCore.Types.SystemImmutable) { +- return null; +- } +- + if (favoriteModel === null || !favoriteModel.enabled || favoriteId == null) { + return null; + } + +- var activities = favoriteModel.activities.runningActivities; + +- if (activities.length <= 1) { ++ if (favoriteModel.activities === undefined || ++ favoriteModel.activities.runningActivities.length <= 1) { + var action = {}; + + if (favoriteModel.isFavorite(favoriteId)) { +@@ -74,6 +70,8 @@ function createFavoriteActions(favoriteModel, favoriteId) { + + var linkedActivities = favoriteModel.linkedActivitiesFor(favoriteId); + ++ var activities = favoriteModel.activities.runningActivities; ++ + // Adding the item to link/unlink to all activities + + var linkedToAllActivities = +@@ -165,25 +163,29 @@ function triggerAction(model, index, actionId, actionArgument) { + + if (closeRequested) { + plasmoid.expanded = false; ++ ++ return true; + } ++ ++ return false; + } + + function handleFavoriteAction(actionId, actionArgument) { + var favoriteId = actionArgument.favoriteId; + var favoriteModel = actionArgument.favoriteModel; + ++ console.log(actionId); ++ + if (favoriteModel === null || favoriteId == null) { + return null; + } + + if (actionId == "_kicker_favorite_remove") { + console.log("Removing from all activities"); +- favoriteModel.removeFavoriteFrom(favoriteId, ":any"); +- ++ favoriteModel.removeFavorite(favoriteId); + } else if (actionId == "_kicker_favorite_add") { + console.log("Adding to global activity"); +- favoriteModel.addFavoriteTo(favoriteId, ":global"); +- ++ favoriteModel.addFavorite(favoriteId); + } else if (actionId == "_kicker_favorite_remove_from_activity") { + console.log("Removing from a specific activity"); + favoriteModel.removeFavoriteFrom(favoriteId, actionArgument.favoriteActivity); +-- +2.14.1 + diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index dbc37f0..39137a8 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Oct 8 19:28:35 UTC 2017 - fabian@ritter-vogt.de + +- Add patch to fix editing of system icons in the runner favorite area: + * 0001-Fix-editing-items-in-SimpleFavoritesModel.patch + ------------------------------------------------------------------- Thu Oct 5 12:39:18 CEST 2017 - fabian@ritter-vogt.de diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 178c780..8b6fbe6 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -36,8 +36,10 @@ Source1: baselibs.conf 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 Patch1: 0001-Ignore-default-sddm-face-icons.patch -# PATCHES 100-200 and above are from upstream 5.10 branch -# PATCHES 201-300 and above are from upstream master/5.11 branch +# PATCHES 100-200 and above are from upstream 5.11 branch +# PATCH-FIX-UPSTREAM (https://phabricator.kde.org/D8178) +Patch100: 0001-Fix-editing-items-in-SimpleFavoritesModel.patch +# PATCHES 201-300 and above are from upstream master/5.12 branch BuildRequires: breeze5-icons BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -251,6 +253,7 @@ Plasma 5 session with Wayland from a display manager. %setup -q -n plasma-workspace-%{version} %patch0 -p1 %patch1 -p1 +%patch100 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} From 72eee4c35dc35a4a56a775f72083bde38125a9d0a8514ed0339d34166180a74d Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 8 Oct 2017 19:29:53 +0000 Subject: [PATCH 2/4] Whoops, wrong package. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=354 --- ...diting-items-in-SimpleFavoritesModel.patch | 173 ------------------ plasma5-workspace.changes | 6 - plasma5-workspace.spec | 3 - 3 files changed, 182 deletions(-) delete mode 100644 0001-Fix-editing-items-in-SimpleFavoritesModel.patch diff --git a/0001-Fix-editing-items-in-SimpleFavoritesModel.patch b/0001-Fix-editing-items-in-SimpleFavoritesModel.patch deleted file mode 100644 index dc33334..0000000 --- a/0001-Fix-editing-items-in-SimpleFavoritesModel.patch +++ /dev/null @@ -1,173 +0,0 @@ -From f078b1272d84f6b9271377900875d39f7d9fda84 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Sat, 7 Oct 2017 14:30:52 +0200 -Subject: [PATCH] Fix editing items in SimpleFavoritesModel - -Summary: -tools.js is supposed to support both KaStatsFavoritesModel (used for -favorite applications) and SimpleFavoritesModel (used for system actions, -like poweroff/reboot/logout). The latter did not work though, as tools.js -unconditionally calls methods only present in KaStatsFavoritesModel. -This commit makes KaStatsFavoritesModel API compatible to SimpleFavoritesModel -and changes the relevant code in tools.js to support both. - -Additionally, this syncs applets/kickoff/package/contents/code/tools.js again. - -BUG: 385463 - -Test Plan: -Before this patch it wasn't possible to remove system actions from -the favorites bar. - -Reviewers: #plasma - -Subscribers: plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D8178 ---- - applets/kicker/package/contents/code/tools.js | 12 ++++++------ - applets/kicker/plugin/kastatsfavoritesmodel.cpp | 4 ++-- - applets/kickoff/package/contents/code/tools.js | 24 +++++++++++++----------- - 3 files changed, 21 insertions(+), 19 deletions(-) - -diff --git a/applets/kicker/package/contents/code/tools.js b/applets/kicker/package/contents/code/tools.js -index c6fc3d9f..df3a3444 100644 ---- a/applets/kicker/package/contents/code/tools.js -+++ b/applets/kicker/package/contents/code/tools.js -@@ -44,9 +44,9 @@ function createFavoriteActions(favoriteModel, favoriteId) { - return null; - } - -- var activities = favoriteModel.activities.runningActivities; - -- if (activities.length <= 1) { -+ if (favoriteModel.activities === undefined || -+ favoriteModel.activities.runningActivities.length <= 1) { - var action = {}; - - if (favoriteModel.isFavorite(favoriteId)) { -@@ -70,6 +70,8 @@ function createFavoriteActions(favoriteModel, favoriteId) { - - var linkedActivities = favoriteModel.linkedActivitiesFor(favoriteId); - -+ var activities = favoriteModel.activities.runningActivities; -+ - // Adding the item to link/unlink to all activities - - var linkedToAllActivities = -@@ -180,12 +182,10 @@ function handleFavoriteAction(actionId, actionArgument) { - - if (actionId == "_kicker_favorite_remove") { - console.log("Removing from all activities"); -- favoriteModel.removeFavoriteFrom(favoriteId, ":any"); -- -+ favoriteModel.removeFavorite(favoriteId); - } else if (actionId == "_kicker_favorite_add") { - console.log("Adding to global activity"); -- favoriteModel.addFavoriteTo(favoriteId, ":global"); -- -+ favoriteModel.addFavorite(favoriteId); - } else if (actionId == "_kicker_favorite_remove_from_activity") { - console.log("Removing from a specific activity"); - favoriteModel.removeFavoriteFrom(favoriteId, actionArgument.favoriteActivity); -diff --git a/applets/kicker/plugin/kastatsfavoritesmodel.cpp b/applets/kicker/plugin/kastatsfavoritesmodel.cpp -index 787a6676..da89c0ac 100644 ---- a/applets/kicker/plugin/kastatsfavoritesmodel.cpp -+++ b/applets/kicker/plugin/kastatsfavoritesmodel.cpp -@@ -570,13 +570,13 @@ void KAStatsFavoritesModel::portOldFavorites(const QStringList &ids) - void KAStatsFavoritesModel::addFavorite(const QString &id, int index) - { - DEBUG << "addFavorite" << id << index << " -->"; -- addFavoriteTo(id, Activity::current(), index); -+ addFavoriteTo(id, QStringLiteral(":global")); - } - - void KAStatsFavoritesModel::removeFavorite(const QString &id) - { - DEBUG << "removeFavorite" << id << " -->"; -- removeFavoriteFrom(id, Activity::current()); -+ removeFavoriteFrom(id, QStringLiteral(":any")); - } - - void KAStatsFavoritesModel::addFavoriteTo(const QString &id, const QString &activityId, int index) -diff --git a/applets/kickoff/package/contents/code/tools.js b/applets/kickoff/package/contents/code/tools.js -index 545d7aff..df3a3444 100644 ---- a/applets/kickoff/package/contents/code/tools.js -+++ b/applets/kickoff/package/contents/code/tools.js -@@ -29,6 +29,7 @@ function fillActionMenu(actionMenu, actionList, favoriteModel, favoriteId) { - if (actionList && actionList.length > 0) { - var separator = { "type": "separator" }; - actionList.unshift(separator); -+ // actionList = actions.concat(actionList); // this crashes Qt O.o - actionList.unshift.apply(actionList, actions); - } else { - actionList = actions; -@@ -39,18 +40,13 @@ function fillActionMenu(actionMenu, actionList, favoriteModel, favoriteId) { - } - - function createFavoriteActions(favoriteModel, favoriteId) { -- // Don't allow changes to favorites when system is immutable. -- if (plasmoid.immutability === PlasmaCore.Types.SystemImmutable) { -- return null; -- } -- - if (favoriteModel === null || !favoriteModel.enabled || favoriteId == null) { - return null; - } - -- var activities = favoriteModel.activities.runningActivities; - -- if (activities.length <= 1) { -+ if (favoriteModel.activities === undefined || -+ favoriteModel.activities.runningActivities.length <= 1) { - var action = {}; - - if (favoriteModel.isFavorite(favoriteId)) { -@@ -74,6 +70,8 @@ function createFavoriteActions(favoriteModel, favoriteId) { - - var linkedActivities = favoriteModel.linkedActivitiesFor(favoriteId); - -+ var activities = favoriteModel.activities.runningActivities; -+ - // Adding the item to link/unlink to all activities - - var linkedToAllActivities = -@@ -165,25 +163,29 @@ function triggerAction(model, index, actionId, actionArgument) { - - if (closeRequested) { - plasmoid.expanded = false; -+ -+ return true; - } -+ -+ return false; - } - - function handleFavoriteAction(actionId, actionArgument) { - var favoriteId = actionArgument.favoriteId; - var favoriteModel = actionArgument.favoriteModel; - -+ console.log(actionId); -+ - if (favoriteModel === null || favoriteId == null) { - return null; - } - - if (actionId == "_kicker_favorite_remove") { - console.log("Removing from all activities"); -- favoriteModel.removeFavoriteFrom(favoriteId, ":any"); -- -+ favoriteModel.removeFavorite(favoriteId); - } else if (actionId == "_kicker_favorite_add") { - console.log("Adding to global activity"); -- favoriteModel.addFavoriteTo(favoriteId, ":global"); -- -+ favoriteModel.addFavorite(favoriteId); - } else if (actionId == "_kicker_favorite_remove_from_activity") { - console.log("Removing from a specific activity"); - favoriteModel.removeFavoriteFrom(favoriteId, actionArgument.favoriteActivity); --- -2.14.1 - diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 39137a8..dbc37f0 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Sun Oct 8 19:28:35 UTC 2017 - fabian@ritter-vogt.de - -- Add patch to fix editing of system icons in the runner favorite area: - * 0001-Fix-editing-items-in-SimpleFavoritesModel.patch - ------------------------------------------------------------------- Thu Oct 5 12:39:18 CEST 2017 - fabian@ritter-vogt.de diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 8b6fbe6..2fc0036 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -37,8 +37,6 @@ 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 Patch1: 0001-Ignore-default-sddm-face-icons.patch # PATCHES 100-200 and above are from upstream 5.11 branch -# PATCH-FIX-UPSTREAM (https://phabricator.kde.org/D8178) -Patch100: 0001-Fix-editing-items-in-SimpleFavoritesModel.patch # PATCHES 201-300 and above are from upstream master/5.12 branch BuildRequires: breeze5-icons BuildRequires: fdupes @@ -253,7 +251,6 @@ Plasma 5 session with Wayland from a display manager. %setup -q -n plasma-workspace-%{version} %patch0 -p1 %patch1 -p1 -%patch100 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} From 457a325c6626c8a1ce7cc91af0b5b96666bbd51e6333a6ec37b11df6395d3da6 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 11 Oct 2017 18:00:20 +0000 Subject: [PATCH 3/4] Accepting request 533431 from home:wolfi323:test - Add fix-switch-user.patch to fix being unable to switch users from the Switch User screen OBS-URL: https://build.opensuse.org/request/show/533431 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=356 --- fix-switch-user.patch | 29 +++++++++++++++++++++++++++++ plasma5-workspace.changes | 6 ++++++ plasma5-workspace.spec | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 fix-switch-user.patch diff --git a/fix-switch-user.patch b/fix-switch-user.patch new file mode 100644 index 0000000..19f7e0e --- /dev/null +++ b/fix-switch-user.patch @@ -0,0 +1,29 @@ +From ac40f7dec47df9c48fa55d90be67ea4cbebcb09d Mon Sep 17 00:00:00 2001 +From: Kai Uwe Broulik +Date: Wed, 11 Oct 2017 16:03:46 +0200 +Subject: Revert "Remove pointless data copy in lockscreen delegate" + +The switch user greeter accesses it to get the "vtNumber" when you click the "Switch" button. + +CHANGELOG: Fixed being unable to switch users from the Switch User screen + +This reverts commit cc8647481095f5631ef8136945ee5d2d06981fd6. +--- + lookandfeel/contents/components/UserDelegate.qml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lookandfeel/contents/components/UserDelegate.qml b/lookandfeel/contents/components/UserDelegate.qml +index b74e657..acd08e3 100644 +--- a/lookandfeel/contents/components/UserDelegate.qml ++++ b/lookandfeel/contents/components/UserDelegate.qml +@@ -28,6 +28,7 @@ Item { + + property bool isCurrent: true + ++ readonly property var m: model + property string name + property string userName + property string avatarPath +-- +cgit v0.11.2 + diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index dbc37f0..d4c6334 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 11 14:35:10 UTC 2017 - wbauer@tmo.at + +- Add fix-switch-user.patch to fix being unable to switch users + from the Switch User screen + ------------------------------------------------------------------- Thu Oct 5 12:39:18 CEST 2017 - fabian@ritter-vogt.de diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 2fc0036..816f460 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -37,6 +37,7 @@ 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 Patch1: 0001-Ignore-default-sddm-face-icons.patch # PATCHES 100-200 and above are from upstream 5.11 branch +Patch100: fix-switch-user.patch # PATCHES 201-300 and above are from upstream master/5.12 branch BuildRequires: breeze5-icons BuildRequires: fdupes @@ -251,6 +252,7 @@ Plasma 5 session with Wayland from a display manager. %setup -q -n plasma-workspace-%{version} %patch0 -p1 %patch1 -p1 +%patch100 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} From 3e7accad48d3cdb3392a41383f9f3da197e33b7f5b2ba4fe04ce4cd2d87db0cb Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 17 Oct 2017 20:36:44 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=357 --- fix-switch-user.patch | 29 ----------------------------- plasma-workspace-5.11.0.tar.xz | 3 --- plasma-workspace-5.11.1.tar.xz | 3 +++ plasma5-workspace.changes | 17 +++++++++++++++++ plasma5-workspace.spec | 6 ++---- 5 files changed, 22 insertions(+), 36 deletions(-) delete mode 100644 fix-switch-user.patch delete mode 100644 plasma-workspace-5.11.0.tar.xz create mode 100644 plasma-workspace-5.11.1.tar.xz diff --git a/fix-switch-user.patch b/fix-switch-user.patch deleted file mode 100644 index 19f7e0e..0000000 --- a/fix-switch-user.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ac40f7dec47df9c48fa55d90be67ea4cbebcb09d Mon Sep 17 00:00:00 2001 -From: Kai Uwe Broulik -Date: Wed, 11 Oct 2017 16:03:46 +0200 -Subject: Revert "Remove pointless data copy in lockscreen delegate" - -The switch user greeter accesses it to get the "vtNumber" when you click the "Switch" button. - -CHANGELOG: Fixed being unable to switch users from the Switch User screen - -This reverts commit cc8647481095f5631ef8136945ee5d2d06981fd6. ---- - lookandfeel/contents/components/UserDelegate.qml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lookandfeel/contents/components/UserDelegate.qml b/lookandfeel/contents/components/UserDelegate.qml -index b74e657..acd08e3 100644 ---- a/lookandfeel/contents/components/UserDelegate.qml -+++ b/lookandfeel/contents/components/UserDelegate.qml -@@ -28,6 +28,7 @@ Item { - - property bool isCurrent: true - -+ readonly property var m: model - property string name - property string userName - property string avatarPath --- -cgit v0.11.2 - diff --git a/plasma-workspace-5.11.0.tar.xz b/plasma-workspace-5.11.0.tar.xz deleted file mode 100644 index b9cee20..0000000 --- a/plasma-workspace-5.11.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c043d05a12cdb1d31b3e47bb3c8bdb312ea4889cdf5d069dcf3f18d729becd3 -size 6369264 diff --git a/plasma-workspace-5.11.1.tar.xz b/plasma-workspace-5.11.1.tar.xz new file mode 100644 index 0000000..a4a9dd4 --- /dev/null +++ b/plasma-workspace-5.11.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e72409aa480079325905d36ceadafc9cbdfaf955d62c16c12b6a29f7b5bc4bb +size 6369588 diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index d4c6334..021d04b 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Oct 17 17:19:19 CEST 2017 - fabian@ritter-vogt.de + +- Update to 5.11.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.11.1.php +- Changes since 5.11.0: + * [LauncherTasksModel] Try resolving absolute path to applications: URL before adding launcher + * [Task Tools] Treat applications: and respective absolute path equal in launcherUrlsMatch (kde#385594) + * [StartupTasksModel] Try resolving startup application id to applications: URL + * Fix "postEvent: null receiver" warning due to nullptr->deleteLater() + * Remove compilation flag for non-existing source file + * Revert "Remove pointless data copy in lockscreen delegate" +- Remove patches, now upstream: + * fix-switch-user.patch + ------------------------------------------------------------------- Wed Oct 11 14:35:10 UTC 2017 - wbauer@tmo.at diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 816f460..3a0f510 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -20,7 +20,7 @@ %bcond_without lang Name: plasma5-workspace -Version: 5.11.0 +Version: 5.11.1 Release: 0 # Full Plasma 5 version (e.g. 5.9.1) %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} @@ -30,14 +30,13 @@ Summary: The KDE Plasma Workspace Components License: GPL-2.0+ Group: System/GUI/KDE 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 # 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 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 # PATCHES 100-200 and above are from upstream 5.11 branch -Patch100: fix-switch-user.patch # PATCHES 201-300 and above are from upstream master/5.12 branch BuildRequires: breeze5-icons BuildRequires: fdupes @@ -252,7 +251,6 @@ Plasma 5 session with Wayland from a display manager. %setup -q -n plasma-workspace-%{version} %patch0 -p1 %patch1 -p1 -%patch100 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}