diff -Nru plasma-desktop-5.12.5/debian/changelog plasma-desktop-5.12.5/debian/changelog --- plasma-desktop-5.12.5/debian/changelog 2018-05-01 15:19:15.000000000 +0000 +++ plasma-desktop-5.12.5/debian/changelog 2018-05-01 15:19:15.000000000 +0000 @@ -1,6 +1,10 @@ -plasma-desktop (4:5.12.5-0ubuntu0.1~ubuntu18.04~ppa2) bionic; urgency=medium +plasma-desktop (4:5.12.5-0ubuntu0.1~ubuntu18.04~ppa3) bionic; urgency=medium * New upstream release (5.12.5) (LP: #1768245) + * Cherry pick upstream patch to fix a regression in 5.12.5, where + submenus do not update when switching between categories of the same + size + - debian/patches: upstream_fix-kicker-menu-regression.diff -- Rik Mills Tue, 01 May 2018 15:19:15 +0000 diff -Nru plasma-desktop-5.12.5/debian/patches/series plasma-desktop-5.12.5/debian/patches/series --- plasma-desktop-5.12.5/debian/patches/series 2018-05-01 15:19:15.000000000 +0000 +++ plasma-desktop-5.12.5/debian/patches/series 2018-05-01 15:19:15.000000000 +0000 @@ -1,2 +1,3 @@ allow_uxterm_overrides.diff upstream_place-toolbox-top-right.patch +upstream_fix-kicker-menu-regression.diff diff -Nru plasma-desktop-5.12.5/debian/patches/upstream_fix-kicker-menu-regression.diff plasma-desktop-5.12.5/debian/patches/upstream_fix-kicker-menu-regression.diff --- plasma-desktop-5.12.5/debian/patches/upstream_fix-kicker-menu-regression.diff 1970-01-01 00:00:00.000000000 +0000 +++ plasma-desktop-5.12.5/debian/patches/upstream_fix-kicker-menu-regression.diff 2018-05-01 15:19:15.000000000 +0000 @@ -0,0 +1,38 @@ +From: Eike Hein +Date: Wed, 9 May 2018 16:24:15 +0900 +Subject: Fix submenus not updating when switching between categories of the + same size + +Summary: +This fixes a regression introduced in 38403268aad3, which forgot to +handle the branch where the counts are the same. + +BUG:394013 + +Reviewers: #plasma + +Subscribers: plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D12774 +--- + applets/kicker/plugin/funnelmodel.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/applets/kicker/plugin/funnelmodel.cpp b/applets/kicker/plugin/funnelmodel.cpp +index 26cad55..165e43d 100644 +--- a/applets/kicker/plugin/funnelmodel.cpp ++++ b/applets/kicker/plugin/funnelmodel.cpp +@@ -81,6 +81,8 @@ void FunnelModel::setSourceModel(QAbstractItemModel *model) + setNewModel(); + endRemoveRows(); + } ++ } else { ++ setNewModel(); + } + + if (newCount > 0) { +-- +cgit v0.11.2 +