GitLab

(cherry picked from commit b29be5f5)

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 25f5d68b)

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"

Andreas Sturmlechner authored Mar 29, 2022 and Andreas Sturmlechner committed Apr 01, 2022

BUG: 451756



Thanks-to: Duncan <1i5t5.duncan@cox.net>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

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"

Heiko Becker authored Mar 09, 2022 and Heiko Becker committed Mar 12, 2022

It was disabled in 2011 when doing some dbus related changes.
Fortunately, kmix is organized in libraries nowadays and it's much
easier and quicker to build the test.

To be honest I'm not entirely sure it's a meaningful test, though,
but I guess it's better than nothing.

GIT_SILENT

Available since cmake 3.12.0.

GIT_SILENT

Available since extra-cmake-modules 5.41.0.

GIT_SILET

extra-cmake-modules comes with one since 5.56.0 and we require 5.68.0
already.

It's considered legacy.

GIT_SILENT

We require C++11 and with that it should not be necessary to include/
use tr1.

I'm not sure what purpose this served, but from the history I could
easily go back to, it was introduced with a 12 years old commit titled
"Put in right place". Which makes me assume this is a leftover from
the monolithic kdemultimedia, which had a find_package(TAGLIB).
Anyway, Taglib is never searched for, nor is the variable set manually,
so include_directories is passed an empty value.

With newer cmake we could just set CMAKE_CXX_STANDARD to 11, but
KDECompilerSettings already sets this for us.

(cherry picked from commit bd205add)

(cherry picked from commit b4c4f890)

(cherry picked from commit d52b4f06)

(cherry picked from commit 8a38a839)