GitLab

(cherry picked from commit d1489e5d)

The local cmake modules should, in this case, be preferred compared to
the ones in ECM, or the build will not be probably configured,
causing includes not to be found, and thus ending up in failure.

The local cmake modules should, in this case, be preferred compared to
the ones in ECM, or the build will not be probably configured,
causing includes not to be found, and thus ending up in failure.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 6e306325)

(cherry picked from commit 9a0181ec)

Conflicts:
	CMakeLists.txt

I introduced this bug in commit a800c1b3 trying to fix a different
memory mis-using bug. Sigh.

In this case playlists that reserve additional columns would get a valid
memory assignment but would be copied into the memory block incorrectly.
This needed a back_inserter as well.

Thanks to Markus for pointing out the regression, then opening a bug,
then leaving a comment to point out both of these, and then drafting a
patch that fixes the bug.

I can confirm it works in my testing, it also seems to address a bug
relating to playback stopping abrupting at the end of a track instead of
skipping to the next track, but who knows at this point.

BUG:420718
FIXED-IN:20.04.1

(cherry picked from commit a22c1fc8)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"