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"

If you want git blame to ignore formatting revisions run:
git config blame.ignoreRevsFile .git-blame-ignore-revs

Define minimum versions for Qt and KF5 according to Plasma standard

Remove/simplify unneeded calls

Use imported targets instead of setting include dirs

Use C++17

As discussed in https://mail.kde.org/pipermail/plasma-devel/2021-February/119329.html

GIT_SILENT

The configurator used a fixed temporary directory for the CSD button
files, and never deleted it. This is not feasible on multi-user systems.
Change it to use a random path which is cleaned up afterwards.

BUG: 433608
FIXED-IN: 5.21.2

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"

The Aurorae decoration engine in KWin checks for svgz icons if the svg
does not exist. Do the same thing here.

BUG: 432712

Otherwise we alter the config for everything in the same process.
Leading to for example a wrong initial read of the AnimationDurationFactor
inside ConfigValueProvider.

This makes it easier to build against both Qt5 and Qt6

GIT_SILENT

KColorScheme uses KSharedConfig::openConfig() when no config is specified,
we were watching a KSharedConfig::openConfig("kdeglobals") which seemingly
is not updated instantly because it technically is different even though
effectively it's the same config. Watching the same configs solves the theme
not updating when the global theme is switched
BUG:421745
FIXED-IN:5.21

GIT_SILENT

GIT_SILENT

This would break application like zenity which output to stdout.

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"

Since the kcms' code moved, we need to update 
our little "Documentation".

Now we are no longer use gtk.css file inside ~/.config/gtk-3.0/ directory
for window decorations. To load decorations into GTK apps we now exclusively
use GTK module.

The module is a GTK-app addon, that loads the buttons on application startup,
then it reacts to changes of windows_decorations.css file in config directory
and loads and unloads it dynamically depending on its presence.

For example: file is present - it is loaded on the startup, file is deleted -
it is unloaded, file is created or changed - it is loaded, while the past
version of it is unloaded.

File presence is controlled by kde-gtk-config kded5 module.

BUG: 428322
BUG: 428120
BUG: 428842

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"

/bin/ld: CMakeFiles/gtkconfig.dir/configvalueprovider.cpp.o: in function `ConfigValueProvider::windowDecorationsButtonsImages() const':
/home/kde-dev/kde/src/kde-gtk-config/kded/configvalueprovider.cpp:205: undefined reference to `DecorationPainter::ButtonGeometry'
/bin/ld: /bin/ld: DWARF error: could not find variable specification at offset 28298
kwin_bridge/libKWinBridge.a(auroraedecorationpainter.cpp.o): in function `AuroraeDecorationPainter::paintButton(QPainter&, QString const&, QString const&) const':
/home/kde-dev/kde/src/kde-gtk-config/kded/kwin_bridge/auroraedecorationpainter.cpp:29: undefined reference to `DecorationPainter::ButtonGeometry'
/bin/ld: kwin_bridge/libKWinBridge.a(dummydecorationbridge.cpp.o): in function `KDecoration2::DummyDecorationBridge::paintButton(QPainter&, QString const&, QString const&)':
/home/kde-dev/kde/src/kde-gtk-config/kded/kwin_bridge/dummydecorationbridge.cpp:107: undefined reference to `DecorationPainter::ButtonGeometry'
/bin/ld: /home/kde-dev/kde/src/kde-gtk-config/kded/kwin_bridge/dummydecorationbridge.cpp:135: undefined reference to `DecorationPainter::ButtonGeometry'
/bin/ld: kwin_bridge/libKWinBridge.a(dummydecorationbridge.cpp.o): in function `KDecoration2::DummyDecorationBridge::passMouseHoverEventToButton(KDecoration2::DecorationButton*) const':
/home/kde-dev/kde/src/kde-gtk-config/kded/kwin_bridge/dummydecorationbridge.cpp:177: undefined reference to `DecorationPainter::ButtonGeometry'
/bin/ld: kwin_bridge/libKWinBridge.a(dummydecorationbridge.cpp.o):/home/kde-dev/kde/src/kde-gtk-config/kded/kwin_bridge/dummydecorationbridge.cpp:178: more undefined references to `DecorationPainter::ButtonGeometry' follow
collect2: error: ld returned 1 exit status

after patch it compiles without any problem

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"

GTK4 seems to be coming out later this year (Plasma 5.21 should release after GTK4 releases), and there doesn't seem to be any major changes coming up in regards to how configuration will be handled.

As such, this patch begins writing out to GTK4 configuration files.

Code has been refactored to reduce duplication of similar code between GTK3 and GTK4, and elements shared between both have dropped the GTK3 prefix.

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"

For the short period of time we disable the animation for various
effects that can occur when decoration is being rendered to file.

This should prevent the decoration to render itself at the beginning
of the animation (i.e. first "frame").

BUG: 426687

kde-gtk-config looks up the relevant library, and tries to fall back to
breeze if nothing matches.

An unrelated bug means breeze users are always in this fallback path.

Name == "Breeze" only works on English.
We should be checking the ID.

GIT_SILENT

It isn't used anywhere

GIT_SILENT

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"