GitLab

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 51971ecc)

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"

Which is the required version
"CMAKE_MINIMUM_REQUIRED(VERSION 3.16.0 FATAL_ERROR)".

GIT_SILENT

...instead of manually setting CMP0063 to new.

GIT_SILENT

Fixes the build, which otherwise fails with
"ld: cannot find -lkwave: No such file or directory".

I suspect this broke by requiring a newer ECM version and newer cmake
policies, but it's the correct thing to do anyway.
The add_dependencies invocations look like an earlier try to fix the
symptoms of using the actual, verbatim library names instead of the
target names. They shouldn't be necessary anymore because cmake
automatically handles the dependencies now that it knows about the
targets.

(cherry picked from commit 0b7bbdb6)

(cherry picked from commit c18fb8e3)

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"

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

(cherry picked from commit 164f835e)

(cherry picked from commit 7da4da53)

(cherry picked from commit 054f14f2)

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 6fa7017b)