From ebcedebacb7e3905125ccd1d37c74606923503ad9edef9ac2fed9ed9909d786f Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 24 Feb 2017 15:35:27 +0000 Subject: [PATCH] - Add patch to fix regression in Plasma 5.9: * 0001-Fix-another-regression-with-rearranging-launchers-in.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=299 --- ...ession-with-rearranging-launchers-in.patch | 59 +++++++++++++++++++ plasma5-workspace.changes | 6 ++ plasma5-workspace.spec | 3 + 3 files changed, 68 insertions(+) create mode 100644 0001-Fix-another-regression-with-rearranging-launchers-in.patch diff --git a/0001-Fix-another-regression-with-rearranging-launchers-in.patch b/0001-Fix-another-regression-with-rearranging-launchers-in.patch new file mode 100644 index 0000000..5575d30 --- /dev/null +++ b/0001-Fix-another-regression-with-rearranging-launchers-in.patch @@ -0,0 +1,59 @@ +From 6cfca1bdf34232d1722c88be22804e65d1c445da Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Fri, 24 Feb 2017 16:34:20 +0100 +Subject: [PATCH] Fix another regression with rearranging launchers in an + activities world. + +Summary: +The new activity-aware implementation of +LauncherTasksModel::setLauncherList() would only accept the passed list +when it changed any activities associations, not when the order changed. +This would effectively turn TasksModel::move involving launcher tasks +into a no-op. + +Rearranging launchers works like this: +1. A client calls TasksModel::move one or many times. TasksModel::move + updates TasksModel's internal sort mapping and implements it, causing + a visible order change in any views. +2. When it is done calling move(), the client calls + TasksModel::syncLaunchers. TasksModel::syncLaunchers calls + LauncherTasksModel::setLauncherList with a new list derived from + its sort mapping, and updates its sort mapping in expectation of + row indices changing in the launcher tasks source model. + +Due to the above bug, the sort mapping would be adjusted in expectation +of changes the launcher tasks model would not actually do, appearing to +undo the moves the next time a view is updated from source data. + +CCMAIL:ivan.cukic@kde.org + +Reviewers: #plasma, davidedmundson, mart + +Reviewed By: mart + +Subscribers: broulik, fvogt, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D4749 +--- + libtaskmanager/launchertasksmodel.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libtaskmanager/launchertasksmodel.cpp b/libtaskmanager/launchertasksmodel.cpp +index b3cba5ed..a0b3745b 100644 +--- a/libtaskmanager/launchertasksmodel.cpp ++++ b/libtaskmanager/launchertasksmodel.cpp +@@ -449,7 +449,8 @@ void LauncherTasksModel::setLauncherList(const QStringList &serializedLaunchers) + } + } + +- if (newActivitiesForLauncher != d->activitiesForLauncher) { ++ if (newLaunchersOrder != d->launchersOrder ++ || newActivitiesForLauncher != d->activitiesForLauncher) { + // Common case optimization: If the list changed but its size + // did not (e.g. due to reordering by a user of this model), + // just clear the caches and announce new data instead of +-- +2.11.0 + diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 4ec0066..f1a5ba3 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 23 17:55:21 UTC 2017 - fabian@ritter-vogt.de + +- Add patch to fix regression in Plasma 5.9: + * 0001-Fix-another-regression-with-rearranging-launchers-in.patch + ------------------------------------------------------------------- Mon Feb 20 10:30:06 UTC 2017 - wbauer@tmo.at diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 4732440..b741593 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -39,6 +39,8 @@ 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 # PATCHES 100-200 and above are from upstream 5.9 branch +# PATCH-FIX-UPSTREAM 0001-Fix-another-regression-with-rearranging-launchers-in.patch hein@kde.org -- Fix another regression with rearranging launchers in an activities world. +Patch100: 0001-Fix-another-regression-with-rearranging-launchers-in.patch # PATCHES 201-300 and above are from upstream master/5.10 branch BuildRequires: breeze5-icons BuildRequires: fdupes @@ -210,6 +212,7 @@ workspace. Development files. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch100 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}