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"

Albert Vaca Cintora authored Feb 01, 2023 and Aleix Pol Gonzalez committed Feb 01, 2023

It was disabled 5 years ago due to issues that were not written down, in commit 687587ea.

Things have improved since then, both in libddc and in powerdevil (eg: cbd6d0ea), so we might want to give this a try.

Caveats:
- We still don't have support for N>1 separate brightness values, not here nor in the plasmoid. It is something we might want to add after this.
- `libddc` requires the user to be in the `i2c` group for it to work, which I'm not sure how we can achieve from plasma.

GIT_SILENT

Previously, getBatteries() returned all batteries, even those without support
for thresholds. While getthreshold simply skipped those where reading
fails, setthreshold exited early on the first failure, leaving the remaining
batteries untouched.

By already performing filtering in getBatteries(), this should now behave more
consistently and work also if not all batteries support thresholds.

BUG: 464535

There was no consensus for this in Plasma.
This reverts commit 13509a0b.

GIT_SILENT

BUG: 464251

Fixes wakeup removal for the current event from sometimes not rescheduling the timerfd wakeup for the next event, causing the current event to trigger for another cookie.

This happens because error checking condition was invalid; events can get removed from the middle of the list as well.

We experienced this issue in kclock, which can be read about here: https://bugs.kde.org/show_bug.cgi?id=464251

GIT_SILENT

GIT_SILENT

There apparently exists hardware that doesn't do that by itself.

BUG: 444029

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 BAT* naming convention is strictly an ACPI thing, so the charge
control helper fails to work on non-ACPI platforms (like many
embedded ARM devices including Apple Silicon Macs).

The correct way to enumerate batteries is to use the `type` property.

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"

Fixes #396635