Not sure this really needs a task, as the next time our CI does a unstable branch build the current patch will fail to apply, so I will remove it there. That will then be there and ready in the packaging for any merge from unstable -> stable when 5.13 is.branched.

From our CI.

https://kci.pangea.pub/job/bionic_unstable_plasma-desktop/93/console

14:11:16 dpkg-source --before-build source
14:11:16 dpkg-source: info: applying allow_uxterm_overrides.diff
14:11:16 dpkg-source: info: applying kubuntu_non_conflicting_toolbox_location.patch
14:11:16 patching file containments/desktop/package/contents/config/main.xml
14:11:16 Hunk #1 FAILED at 20.
14:11:16 1 out of 1 hunk FAILED
14:11:16 dpkg-source: info: the patch has fuzz which is not allowed, or is malformed
14:11:16 dpkg-source: info: if patch 'kubuntu_non_conflicting_toolbox_location.patch' is correctly applied by quilt, use 'quilt refresh' to update it
14:11:16 dpkg-source: info: restoring quilt backup files for kubuntu_non_conflicting_toolbox_location.patch
14:11:16 dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -E -b -B .pc/kubuntu_non_conflicting_toolbox_location.patch/ --reject-file=- < source/debian/patches/kubuntu_non_conflicting_toolbox_location.patch subprocess returned exit status 1
14:11:16 dpkg-buildpackage: error: dpkg-source --before-build source subprocess returned exit status 2
14:11:16 chown -R jenkins:jenkins /var/lib/jenkins/workspaces/bionic/unstable/plasma-desktop
14:11:16 /var/lib/jenkins/ci-tooling/lib/ci/sourcer_base.rb:115:in `dpkg_buildpackage': Could not run dpkg-buildpackage! (RuntimeError)

Change pushed to our kubuntu_unstable branch, which tracks KDE git master, and currently what will become 5.13

https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/plasma-desktop/commit/?id=906058cb693361b698461eb60e31228ab531e8da

I guess a more pertinent issue here, is do we want to try replacing our very simple "put it top right no matter what" patch in 5.12, with a backported version of Kai's more adaptive change?

Up to you; I don't have strong feelings on the matter.

In T8057#129981, @ngraham wrote:

Up to you; I don't have strong feelings on the matter.

Well, Kai's is more adaptive in that it takes account of RTL setups. May try putting it in stable and testing with what will become 5.12.3.

Also, apologies if my first comment seemed abrupt. Was not how I meant that to come across. :P

No worries, you're all good!