forked from pool/powerdevil6
Plasma 6.1.1
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/powerdevil6?expand=0&rev=22
This commit is contained in:
parent
3e605ee375
commit
eea0e8d39e
@ -1,8 +1,9 @@
|
|||||||
From 93066eb9ec30ec23ca0eba8eebf4148533f5bd90 Mon Sep 17 00:00:00 2001
|
From fa941131af6c15686a9d0a49d36c5d5461325bb3 Mon Sep 17 00:00:00 2001
|
||||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
Date: Mon, 17 Jun 2024 11:49:22 +0200
|
Date: Wed, 26 Jun 2024 12:00:04 +0200
|
||||||
Subject: [PATCH] Revert "Added setting for battery conservation mode (Lenovo)"
|
Subject: [PATCH] Revert "Added setting for battery conservation mode (Lenovo)"
|
||||||
|
|
||||||
|
This reverts commit 7da820f5ba64766b15c1451ad0fbed3b714ed307.
|
||||||
This reverts commit 53f688de8eff37a52efed55b52d9e51f5217a185.
|
This reverts commit 53f688de8eff37a52efed55b52d9e51f5217a185.
|
||||||
---
|
---
|
||||||
daemon/chargethreshold_helper_actions.actions | 120 -------------
|
daemon/chargethreshold_helper_actions.actions | 120 -------------
|
||||||
@ -18,11 +19,11 @@ This reverts commit 53f688de8eff37a52efed55b52d9e51f5217a185.
|
|||||||
kcmodule/profiles/ui/GlobalConfig.qml | 16 +-
|
kcmodule/profiles/ui/GlobalConfig.qml | 16 +-
|
||||||
11 files changed, 43 insertions(+), 376 deletions(-)
|
11 files changed, 43 insertions(+), 376 deletions(-)
|
||||||
|
|
||||||
Index: powerdevil-6.1.0/daemon/chargethreshold_helper_actions.actions
|
diff --git a/daemon/chargethreshold_helper_actions.actions b/daemon/chargethreshold_helper_actions.actions
|
||||||
===================================================================
|
index ce1fb3f3..ff5299e8 100644
|
||||||
--- powerdevil-6.1.0.orig/daemon/chargethreshold_helper_actions.actions
|
--- a/daemon/chargethreshold_helper_actions.actions
|
||||||
+++ powerdevil-6.1.0/daemon/chargethreshold_helper_actions.actions
|
+++ b/daemon/chargethreshold_helper_actions.actions
|
||||||
@@ -231,111 +231,3 @@ Description[zh_CN]=请进行身份验证
|
@@ -235,123 +235,3 @@ Description[zh_CN]=请进行身份验证以设置电池充电限制。
|
||||||
Description[zh_TW]=認證以設定電池充電限制。
|
Description[zh_TW]=認證以設定電池充電限制。
|
||||||
Policy=auth_admin
|
Policy=auth_admin
|
||||||
Persistence=session
|
Persistence=session
|
||||||
@ -33,6 +34,7 @@ Index: powerdevil-6.1.0/daemon/chargethreshold_helper_actions.actions
|
|||||||
-Name[bg]=Проверка на режима за пестене на батерията
|
-Name[bg]=Проверка на режима за пестене на батерията
|
||||||
-Name[ca]=Comprova el mode de conservació de la bateria
|
-Name[ca]=Comprova el mode de conservació de la bateria
|
||||||
-Name[ca@valencia]=Comprova el mode de conservació de la bateria
|
-Name[ca@valencia]=Comprova el mode de conservació de la bateria
|
||||||
|
-Name[cs]=Zkontrolovat režim šetření baterie
|
||||||
-Name[en_GB]=Check battery conservation mode
|
-Name[en_GB]=Check battery conservation mode
|
||||||
-Name[eo]=Kontroli baterikonservan reĝimon
|
-Name[eo]=Kontroli baterikonservan reĝimon
|
||||||
-Name[es]=Comprobar el modo de conservación de la batería
|
-Name[es]=Comprobar el modo de conservación de la batería
|
||||||
@ -48,6 +50,8 @@ Index: powerdevil-6.1.0/daemon/chargethreshold_helper_actions.actions
|
|||||||
-Name[pl]=Odczytaj tryb zarządzania baterią
|
-Name[pl]=Odczytaj tryb zarządzania baterią
|
||||||
-Name[sk]=Skontrolovať režim ochrany batérie
|
-Name[sk]=Skontrolovať režim ochrany batérie
|
||||||
-Name[sl]=Preverite način varčevanja z baterijo
|
-Name[sl]=Preverite način varčevanja z baterijo
|
||||||
|
-Name[sv]=Kontrollera batteriets konserveringsläge
|
||||||
|
-Name[ta]=மின்கல சேமிப்பு பயன்முறையின் நிலைகாண்
|
||||||
-Name[tr]=Pil Tasarrufu Kipini Denetle
|
-Name[tr]=Pil Tasarrufu Kipini Denetle
|
||||||
-Name[uk]=Перевірка режиму консервації акумулятора
|
-Name[uk]=Перевірка режиму консервації акумулятора
|
||||||
-Name[x-test]=xxCheck battery conservation modexx
|
-Name[x-test]=xxCheck battery conservation modexx
|
||||||
@ -58,6 +62,7 @@ Index: powerdevil-6.1.0/daemon/chargethreshold_helper_actions.actions
|
|||||||
-Description[bg]=Удостоверете автентичността си, за да проверите текущото състояние на режима за пестене на батерията.
|
-Description[bg]=Удостоверете автентичността си, за да проверите текущото състояние на режима за пестене на батерията.
|
||||||
-Description[ca]=Autenticació per a comprovar l'estat actual del mode de conservació de la bateria.
|
-Description[ca]=Autenticació per a comprovar l'estat actual del mode de conservació de la bateria.
|
||||||
-Description[ca@valencia]=Autenticació per a comprovar l'estat actual del mode de conservació de la bateria.
|
-Description[ca@valencia]=Autenticació per a comprovar l'estat actual del mode de conservació de la bateria.
|
||||||
|
-Description[cs]=Ověřte totožnost abyste zjistili stav režimu šetření baterie.
|
||||||
-Description[en_GB]=Authenticate to check the current state of battery conservation mode.
|
-Description[en_GB]=Authenticate to check the current state of battery conservation mode.
|
||||||
-Description[eo]=Aŭtentiĝu por kontroli la aktualan staton de bateriokonserva reĝimo.
|
-Description[eo]=Aŭtentiĝu por kontroli la aktualan staton de bateriokonserva reĝimo.
|
||||||
-Description[es]=Debe autenticarse para comprobar el estado actual del modo de conservación de la batería.
|
-Description[es]=Debe autenticarse para comprobar el estado actual del modo de conservación de la batería.
|
||||||
@ -73,6 +78,8 @@ Index: powerdevil-6.1.0/daemon/chargethreshold_helper_actions.actions
|
|||||||
-Description[pl]=Uwierzytelnij, aby odczytaj tryb zarządzania baterią.
|
-Description[pl]=Uwierzytelnij, aby odczytaj tryb zarządzania baterią.
|
||||||
-Description[sk]=Overenie totožnosti na zobrazenie aktuálneho režimu ochrany batérie.
|
-Description[sk]=Overenie totožnosti na zobrazenie aktuálneho režimu ochrany batérie.
|
||||||
-Description[sl]=Avtenticirajte se, da preverite trenutno stanje načina varčevanja baterije.
|
-Description[sl]=Avtenticirajte se, da preverite trenutno stanje načina varčevanja baterije.
|
||||||
|
-Description[sv]=Ange behörighet för att se nuvarande tillstånd hos batteriets konserveringsläge.
|
||||||
|
-Description[ta]=மின்கல சேமிப்பு பயன்முறையின் தற்போதைய நிலையைக் காண சான்றளிக்கவும்.
|
||||||
-Description[tr]=Pil tasarrufu kipinin geçerli durumunu denetlemek için kimliğinizi doğrulayın.
|
-Description[tr]=Pil tasarrufu kipinin geçerli durumunu denetlemek için kimliğinizi doğrulayın.
|
||||||
-Description[uk]=Пройдіть розпізнавання для перевірки поточного стану режиму консервації акумулятора.
|
-Description[uk]=Пройдіть розпізнавання для перевірки поточного стану режиму консервації акумулятора.
|
||||||
-Description[x-test]=xxAuthenticate to check the current state of battery conservation mode.xx
|
-Description[x-test]=xxAuthenticate to check the current state of battery conservation mode.xx
|
||||||
@ -87,6 +94,7 @@ Index: powerdevil-6.1.0/daemon/chargethreshold_helper_actions.actions
|
|||||||
-Name[bg]=Задаване на режим за пестене на батерията
|
-Name[bg]=Задаване на режим за пестене на батерията
|
||||||
-Name[ca]=Estableix el mode de conservació de la bateria
|
-Name[ca]=Estableix el mode de conservació de la bateria
|
||||||
-Name[ca@valencia]=Establix el mode de conservació de la bateria
|
-Name[ca@valencia]=Establix el mode de conservació de la bateria
|
||||||
|
-Name[cs]=Nastavte režim šetření baterie
|
||||||
-Name[en_GB]=Set battery conservation mode
|
-Name[en_GB]=Set battery conservation mode
|
||||||
-Name[eo]=Agordi baterikonservan reĝimon
|
-Name[eo]=Agordi baterikonservan reĝimon
|
||||||
-Name[es]=Definir el modo de conservación de la batería
|
-Name[es]=Definir el modo de conservación de la batería
|
||||||
@ -102,6 +110,8 @@ Index: powerdevil-6.1.0/daemon/chargethreshold_helper_actions.actions
|
|||||||
-Name[pl]=Ustaw tryb zarządzania baterią
|
-Name[pl]=Ustaw tryb zarządzania baterią
|
||||||
-Name[sk]=Nastaviť režim ochrany batérie
|
-Name[sk]=Nastaviť režim ochrany batérie
|
||||||
-Name[sl]=Nastavi način varčevanja baterije
|
-Name[sl]=Nastavi način varčevanja baterije
|
||||||
|
-Name[sv]=Ställ in batteriets konserveringsläge
|
||||||
|
-Name[ta]=மின்கல சேமிப்பு பயன்முறையை அமை
|
||||||
-Name[tr]=Pil Tasarrufu Kipini Ayarla
|
-Name[tr]=Pil Tasarrufu Kipini Ayarla
|
||||||
-Name[uk]=Встановлення режиму консервації акумулятора
|
-Name[uk]=Встановлення режиму консервації акумулятора
|
||||||
-Name[x-test]=xxSet battery conservation modexx
|
-Name[x-test]=xxSet battery conservation modexx
|
||||||
@ -112,6 +122,7 @@ Index: powerdevil-6.1.0/daemon/chargethreshold_helper_actions.actions
|
|||||||
-Description[bg]=Удостоверете автентичността си, за да зададете режима за пестене на батерията.
|
-Description[bg]=Удостоверете автентичността си, за да зададете режима за пестене на батерията.
|
||||||
-Description[ca]=Autenticació per a establir el mode de conservació de la bateria.
|
-Description[ca]=Autenticació per a establir el mode de conservació de la bateria.
|
||||||
-Description[ca@valencia]=Autenticació per a establir el mode de conservació de la bateria.
|
-Description[ca@valencia]=Autenticació per a establir el mode de conservació de la bateria.
|
||||||
|
-Description[cs]=Ověřte totožnost pro nastavení režimu šetření baterie.
|
||||||
-Description[en_GB]=Authenticate to set the battery conservation mode.
|
-Description[en_GB]=Authenticate to set the battery conservation mode.
|
||||||
-Description[eo]=Aŭtentiĝu por meti la bateriokonservan reĝimon.
|
-Description[eo]=Aŭtentiĝu por meti la bateriokonservan reĝimon.
|
||||||
-Description[es]=Debe autenticarse para definir el modo de conservación de la batería.
|
-Description[es]=Debe autenticarse para definir el modo de conservación de la batería.
|
||||||
@ -127,6 +138,8 @@ Index: powerdevil-6.1.0/daemon/chargethreshold_helper_actions.actions
|
|||||||
-Description[pl]=Uwierzytelnij, aby ustawić tryb zarządzania baterią.
|
-Description[pl]=Uwierzytelnij, aby ustawić tryb zarządzania baterią.
|
||||||
-Description[sk]=Overenie totožnosti na nastavenie režimu ochrany batérie.
|
-Description[sk]=Overenie totožnosti na nastavenie režimu ochrany batérie.
|
||||||
-Description[sl]=Avtenticirajte se, da bi nastavili način varčevanje baterije.
|
-Description[sl]=Avtenticirajte se, da bi nastavili način varčevanje baterije.
|
||||||
|
-Description[sv]=Ange behörighet för att ställa in batteriets konserveringsläge.
|
||||||
|
-Description[ta]=மின்கல சேமிப்பு பயன்முறையை அமைக்க சான்றளிக்கவும்.
|
||||||
-Description[tr]=Pil tasarrufu kipini ayarlamak için kimliğinizi doğrulayın.
|
-Description[tr]=Pil tasarrufu kipini ayarlamak için kimliğinizi doğrulayın.
|
||||||
-Description[uk]=Пройдіть розпізнавання для встановлення режиму консервації акумулятора.
|
-Description[uk]=Пройдіть розпізнавання для встановлення режиму консервації акумулятора.
|
||||||
-Description[x-test]=xxAuthenticate to set the battery conservation mode.xx
|
-Description[x-test]=xxAuthenticate to set the battery conservation mode.xx
|
||||||
@ -134,10 +147,10 @@ Index: powerdevil-6.1.0/daemon/chargethreshold_helper_actions.actions
|
|||||||
-Description[zh_TW]=認證以設定電池保護模式。
|
-Description[zh_TW]=認證以設定電池保護模式。
|
||||||
-Policy=auth_admin
|
-Policy=auth_admin
|
||||||
-Persistence=session
|
-Persistence=session
|
||||||
Index: powerdevil-6.1.0/daemon/chargethresholdhelper.cpp
|
diff --git a/daemon/chargethresholdhelper.cpp b/daemon/chargethresholdhelper.cpp
|
||||||
===================================================================
|
index fb801d92..6c4e0afe 100644
|
||||||
--- powerdevil-6.1.0.orig/daemon/chargethresholdhelper.cpp
|
--- a/daemon/chargethresholdhelper.cpp
|
||||||
+++ powerdevil-6.1.0/daemon/chargethresholdhelper.cpp
|
+++ b/daemon/chargethresholdhelper.cpp
|
||||||
@@ -1,6 +1,5 @@
|
@@ -1,6 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* SPDX-FileCopyrightText: 2020 Kai Uwe Broulik <kde@broulik.de>
|
* SPDX-FileCopyrightText: 2020 Kai Uwe Broulik <kde@broulik.de>
|
||||||
@ -153,13 +166,10 @@ Index: powerdevil-6.1.0/daemon/chargethresholdhelper.cpp
|
|||||||
|
|
||||||
static const QString s_chargeStartThreshold = QStringLiteral("charge_control_start_threshold");
|
static const QString s_chargeStartThreshold = QStringLiteral("charge_control_start_threshold");
|
||||||
static const QString s_chargeEndThreshold = QStringLiteral("charge_control_end_threshold");
|
static const QString s_chargeEndThreshold = QStringLiteral("charge_control_end_threshold");
|
||||||
@@ -174,56 +172,6 @@ ActionReply ChargeThresholdHelper::setth
|
@@ -177,56 +175,6 @@ ActionReply ChargeThresholdHelper::setthreshold(const QVariantMap &args)
|
||||||
return reply;
|
return ActionReply();
|
||||||
}
|
}
|
||||||
|
|
||||||
- return ActionReply();
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-// This handles Lenovo's "battery conservation mode" that limits the threshold to a fixed value
|
-// This handles Lenovo's "battery conservation mode" that limits the threshold to a fixed value
|
||||||
-// This value differs from model to model (most 55-60%, others ~80%) and is unknown (last checked in Kernel 6.3)
|
-// This value differs from model to model (most 55-60%, others ~80%) and is unknown (last checked in Kernel 6.3)
|
||||||
-ActionReply ChargeThresholdHelper::getconservationmode(const QVariantMap &args)
|
-ActionReply ChargeThresholdHelper::getconservationmode(const QVariantMap &args)
|
||||||
@ -207,13 +217,16 @@ Index: powerdevil-6.1.0/daemon/chargethresholdhelper.cpp
|
|||||||
- return reply;
|
- return reply;
|
||||||
- }
|
- }
|
||||||
-
|
-
|
||||||
return ActionReply();
|
- return ActionReply();
|
||||||
}
|
-}
|
||||||
|
-
|
||||||
|
KAUTH_HELPER_MAIN("org.kde.powerdevil.chargethresholdhelper", ChargeThresholdHelper)
|
||||||
|
|
||||||
Index: powerdevil-6.1.0/daemon/chargethresholdhelper.h
|
#include "moc_chargethresholdhelper.cpp"
|
||||||
===================================================================
|
diff --git a/daemon/chargethresholdhelper.h b/daemon/chargethresholdhelper.h
|
||||||
--- powerdevil-6.1.0.orig/daemon/chargethresholdhelper.h
|
index b0f93722..fd5a8221 100644
|
||||||
+++ powerdevil-6.1.0/daemon/chargethresholdhelper.h
|
--- a/daemon/chargethresholdhelper.h
|
||||||
|
+++ b/daemon/chargethresholdhelper.h
|
||||||
@@ -1,6 +1,5 @@
|
@@ -1,6 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* SPDX-FileCopyrightText: 2020 Kai Uwe Broulik <kde@broulik.de>
|
* SPDX-FileCopyrightText: 2020 Kai Uwe Broulik <kde@broulik.de>
|
||||||
@ -229,10 +242,10 @@ Index: powerdevil-6.1.0/daemon/chargethresholdhelper.h
|
|||||||
- ActionReply getconservationmode(const QVariantMap &args);
|
- ActionReply getconservationmode(const QVariantMap &args);
|
||||||
- ActionReply setconservationmode(const QVariantMap &args);
|
- ActionReply setconservationmode(const QVariantMap &args);
|
||||||
};
|
};
|
||||||
Index: powerdevil-6.1.0/daemon/dbus/org.kde.Solid.PowerManagement.xml
|
diff --git a/daemon/dbus/org.kde.Solid.PowerManagement.xml b/daemon/dbus/org.kde.Solid.PowerManagement.xml
|
||||||
===================================================================
|
index 18240feb..5cb5a0ac 100644
|
||||||
--- powerdevil-6.1.0.orig/daemon/dbus/org.kde.Solid.PowerManagement.xml
|
--- a/daemon/dbus/org.kde.Solid.PowerManagement.xml
|
||||||
+++ powerdevil-6.1.0/daemon/dbus/org.kde.Solid.PowerManagement.xml
|
+++ b/daemon/dbus/org.kde.Solid.PowerManagement.xml
|
||||||
@@ -31,9 +31,6 @@
|
@@ -31,9 +31,6 @@
|
||||||
<method name="hasDualGpu">
|
<method name="hasDualGpu">
|
||||||
<arg type="b" direction="out" />
|
<arg type="b" direction="out" />
|
||||||
@ -253,10 +266,10 @@ Index: powerdevil-6.1.0/daemon/dbus/org.kde.Solid.PowerManagement.xml
|
|||||||
<signal name="chargeStartThresholdChanged">
|
<signal name="chargeStartThresholdChanged">
|
||||||
<arg type="i" direction="out" />
|
<arg type="i" direction="out" />
|
||||||
</signal>
|
</signal>
|
||||||
Index: powerdevil-6.1.0/daemon/powerdevilcore.cpp
|
diff --git a/daemon/powerdevilcore.cpp b/daemon/powerdevilcore.cpp
|
||||||
===================================================================
|
index 77d3b98b..10d9c8af 100644
|
||||||
--- powerdevil-6.1.0.orig/daemon/powerdevilcore.cpp
|
--- a/daemon/powerdevilcore.cpp
|
||||||
+++ powerdevil-6.1.0/daemon/powerdevilcore.cpp
|
+++ b/daemon/powerdevilcore.cpp
|
||||||
@@ -70,7 +70,6 @@ Core::Core(QObject *parent)
|
@@ -70,7 +70,6 @@ Core::Core(QObject *parent)
|
||||||
discreteGpuJob->start();
|
discreteGpuJob->start();
|
||||||
|
|
||||||
@ -315,10 +328,10 @@ Index: powerdevil-6.1.0/daemon/powerdevilcore.cpp
|
|||||||
int Core::chargeStartThreshold() const
|
int Core::chargeStartThreshold() const
|
||||||
{
|
{
|
||||||
return m_chargeStartThreshold;
|
return m_chargeStartThreshold;
|
||||||
Index: powerdevil-6.1.0/daemon/powerdevilcore.h
|
diff --git a/daemon/powerdevilcore.h b/daemon/powerdevilcore.h
|
||||||
===================================================================
|
index 1e3fd1d7..4cf6c1fd 100644
|
||||||
--- powerdevil-6.1.0.orig/daemon/powerdevilcore.h
|
--- a/daemon/powerdevilcore.h
|
||||||
+++ powerdevil-6.1.0/daemon/powerdevilcore.h
|
+++ b/daemon/powerdevilcore.h
|
||||||
@@ -105,7 +105,6 @@ public Q_SLOTS:
|
@@ -105,7 +105,6 @@ public Q_SLOTS:
|
||||||
bool isLidPresent() const;
|
bool isLidPresent() const;
|
||||||
bool isActionSupported(const QString &actionName);
|
bool isActionSupported(const QString &actionName);
|
||||||
@ -351,10 +364,10 @@ Index: powerdevil-6.1.0/daemon/powerdevilcore.h
|
|||||||
int m_chargeStartThreshold = 0;
|
int m_chargeStartThreshold = 0;
|
||||||
int m_chargeStopThreshold = 100;
|
int m_chargeStopThreshold = 100;
|
||||||
|
|
||||||
Index: powerdevil-6.1.0/kcmodule/profiles/ExternalServiceSettings.cpp
|
diff --git a/kcmodule/profiles/ExternalServiceSettings.cpp b/kcmodule/profiles/ExternalServiceSettings.cpp
|
||||||
===================================================================
|
index 70f2953b..7e704cc2 100644
|
||||||
--- powerdevil-6.1.0.orig/kcmodule/profiles/ExternalServiceSettings.cpp
|
--- a/kcmodule/profiles/ExternalServiceSettings.cpp
|
||||||
+++ powerdevil-6.1.0/kcmodule/profiles/ExternalServiceSettings.cpp
|
+++ b/kcmodule/profiles/ExternalServiceSettings.cpp
|
||||||
@@ -1,7 +1,6 @@
|
@@ -1,7 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* SPDX-FileCopyrightText: 2008-2010 Dario Freddi <drf@kde.org>
|
* SPDX-FileCopyrightText: 2008-2010 Dario Freddi <drf@kde.org>
|
||||||
@ -453,7 +466,7 @@ Index: powerdevil-6.1.0/kcmodule/profiles/ExternalServiceSettings.cpp
|
|||||||
-
|
-
|
||||||
- const auto data = job->data();
|
- const auto data = job->data();
|
||||||
- setSavedBatteryConservationMode(data.value(QStringLiteral("batteryConservationModeEnabled")).toBool());
|
- setSavedBatteryConservationMode(data.value(QStringLiteral("batteryConservationModeEnabled")).toBool());
|
||||||
- setBatteryConservationMode(m_batteryConservationMode);
|
- setBatteryConservationMode(m_savedBatteryConservationMode);
|
||||||
- m_isBatteryConservationModeSupported = true;
|
- m_isBatteryConservationModeSupported = true;
|
||||||
- });
|
- });
|
||||||
+ } else {
|
+ } else {
|
||||||
@ -553,7 +566,7 @@ Index: powerdevil-6.1.0/kcmodule/profiles/ExternalServiceSettings.cpp
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool ExternalServiceSettings::isChargeStartThresholdSupported() const
|
bool ExternalServiceSettings::isChargeStartThresholdSupported() const
|
||||||
@@ -198,21 +137,6 @@ void ExternalServiceSettings::setSavedCh
|
@@ -198,21 +137,6 @@ void ExternalServiceSettings::setSavedChargeStopThreshold(int threshold)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -575,10 +588,10 @@ Index: powerdevil-6.1.0/kcmodule/profiles/ExternalServiceSettings.cpp
|
|||||||
int ExternalServiceSettings::chargeStartThreshold() const
|
int ExternalServiceSettings::chargeStartThreshold() const
|
||||||
{
|
{
|
||||||
return m_chargeStartThreshold;
|
return m_chargeStartThreshold;
|
||||||
Index: powerdevil-6.1.0/kcmodule/profiles/ExternalServiceSettings.h
|
diff --git a/kcmodule/profiles/ExternalServiceSettings.h b/kcmodule/profiles/ExternalServiceSettings.h
|
||||||
===================================================================
|
index c9205273..01f3525f 100644
|
||||||
--- powerdevil-6.1.0.orig/kcmodule/profiles/ExternalServiceSettings.h
|
--- a/kcmodule/profiles/ExternalServiceSettings.h
|
||||||
+++ powerdevil-6.1.0/kcmodule/profiles/ExternalServiceSettings.h
|
+++ b/kcmodule/profiles/ExternalServiceSettings.h
|
||||||
@@ -1,6 +1,5 @@
|
@@ -1,6 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* SPDX-FileCopyrightText: 2023 Jakob Petsovits <jpetso@petsovits.com>
|
* SPDX-FileCopyrightText: 2023 Jakob Petsovits <jpetso@petsovits.com>
|
||||||
@ -594,7 +607,7 @@ Index: powerdevil-6.1.0/kcmodule/profiles/ExternalServiceSettings.h
|
|||||||
|
|
||||||
class QWindow;
|
class QWindow;
|
||||||
|
|
||||||
@@ -21,28 +19,23 @@ class ExternalServiceSettings : public Q
|
@@ -21,28 +19,23 @@ class ExternalServiceSettings : public QObject
|
||||||
|
|
||||||
Q_PROPERTY(int chargeStartThreshold READ chargeStartThreshold WRITE setChargeStartThreshold NOTIFY chargeStartThresholdChanged)
|
Q_PROPERTY(int chargeStartThreshold READ chargeStartThreshold WRITE setChargeStartThreshold NOTIFY chargeStartThresholdChanged)
|
||||||
Q_PROPERTY(int chargeStopThreshold READ chargeStopThreshold WRITE setChargeStopThreshold NOTIFY chargeStopThresholdChanged)
|
Q_PROPERTY(int chargeStopThreshold READ chargeStopThreshold WRITE setChargeStopThreshold NOTIFY chargeStopThresholdChanged)
|
||||||
@ -660,11 +673,11 @@ Index: powerdevil-6.1.0/kcmodule/profiles/ExternalServiceSettings.h
|
|||||||
bool m_chargeStopThresholdMightNeedReconnect;
|
bool m_chargeStopThresholdMightNeedReconnect;
|
||||||
};
|
};
|
||||||
|
|
||||||
Index: powerdevil-6.1.0/kcmodule/profiles/PowerKCM.cpp
|
diff --git a/kcmodule/profiles/PowerKCM.cpp b/kcmodule/profiles/PowerKCM.cpp
|
||||||
===================================================================
|
index bd999ff8..85184994 100644
|
||||||
--- powerdevil-6.1.0.orig/kcmodule/profiles/PowerKCM.cpp
|
--- a/kcmodule/profiles/PowerKCM.cpp
|
||||||
+++ powerdevil-6.1.0/kcmodule/profiles/PowerKCM.cpp
|
+++ b/kcmodule/profiles/PowerKCM.cpp
|
||||||
@@ -151,7 +151,6 @@ PowerKCM::PowerKCM(QObject *parent, cons
|
@@ -151,7 +151,6 @@ PowerKCM::PowerKCM(QObject *parent, const KPluginMetaData &metaData)
|
||||||
this,
|
this,
|
||||||
&PowerKCM::isChargeStartThresholdSupportedChanged);
|
&PowerKCM::isChargeStartThresholdSupportedChanged);
|
||||||
connect(m_externalServiceSettings, &ExternalServiceSettings::isChargeStopThresholdSupportedChanged, this, &PowerKCM::isChargeStopThresholdSupportedChanged);
|
connect(m_externalServiceSettings, &ExternalServiceSettings::isChargeStopThresholdSupportedChanged, this, &PowerKCM::isChargeStopThresholdSupportedChanged);
|
||||||
@ -672,7 +685,7 @@ Index: powerdevil-6.1.0/kcmodule/profiles/PowerKCM.cpp
|
|||||||
connect(m_externalServiceSettings,
|
connect(m_externalServiceSettings,
|
||||||
&ExternalServiceSettings::chargeStopThresholdMightNeedReconnectChanged,
|
&ExternalServiceSettings::chargeStopThresholdMightNeedReconnectChanged,
|
||||||
this,
|
this,
|
||||||
@@ -291,11 +290,6 @@ void PowerKCM::setSupportsBatteryProfile
|
@@ -291,11 +290,6 @@ void PowerKCM::setSupportsBatteryProfiles(bool supportsBatteryProfiles)
|
||||||
Q_EMIT supportsBatteryProfilesChanged();
|
Q_EMIT supportsBatteryProfilesChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -684,11 +697,11 @@ Index: powerdevil-6.1.0/kcmodule/profiles/PowerKCM.cpp
|
|||||||
bool PowerKCM::isChargeStartThresholdSupported() const
|
bool PowerKCM::isChargeStartThresholdSupported() const
|
||||||
{
|
{
|
||||||
return m_externalServiceSettings->isChargeStartThresholdSupported();
|
return m_externalServiceSettings->isChargeStartThresholdSupported();
|
||||||
Index: powerdevil-6.1.0/kcmodule/profiles/PowerKCM.h
|
diff --git a/kcmodule/profiles/PowerKCM.h b/kcmodule/profiles/PowerKCM.h
|
||||||
===================================================================
|
index 36814ad0..efcfcb18 100644
|
||||||
--- powerdevil-6.1.0.orig/kcmodule/profiles/PowerKCM.h
|
--- a/kcmodule/profiles/PowerKCM.h
|
||||||
+++ powerdevil-6.1.0/kcmodule/profiles/PowerKCM.h
|
+++ b/kcmodule/profiles/PowerKCM.h
|
||||||
@@ -65,7 +65,6 @@ class PowerKCM : public KQuickManagedCon
|
@@ -65,7 +65,6 @@ class PowerKCM : public KQuickManagedConfigModule
|
||||||
Q_PROPERTY(bool isLidPresent READ isLidPresent NOTIFY isLidPresentChanged)
|
Q_PROPERTY(bool isLidPresent READ isLidPresent NOTIFY isLidPresentChanged)
|
||||||
Q_PROPERTY(bool isPowerButtonPresent READ isPowerButtonPresent NOTIFY isPowerButtonPresentChanged)
|
Q_PROPERTY(bool isPowerButtonPresent READ isPowerButtonPresent NOTIFY isPowerButtonPresentChanged)
|
||||||
|
|
||||||
@ -712,10 +725,10 @@ Index: powerdevil-6.1.0/kcmodule/profiles/PowerKCM.h
|
|||||||
void isChargeStartThresholdSupportedChanged();
|
void isChargeStartThresholdSupportedChanged();
|
||||||
void isChargeStopThresholdSupportedChanged();
|
void isChargeStopThresholdSupportedChanged();
|
||||||
void chargeStopThresholdMightNeedReconnectChanged();
|
void chargeStopThresholdMightNeedReconnectChanged();
|
||||||
Index: powerdevil-6.1.0/kcmodule/profiles/ui/GlobalConfig.qml
|
diff --git a/kcmodule/profiles/ui/GlobalConfig.qml b/kcmodule/profiles/ui/GlobalConfig.qml
|
||||||
===================================================================
|
index 454f6326..511824ac 100644
|
||||||
--- powerdevil-6.1.0.orig/kcmodule/profiles/ui/GlobalConfig.qml
|
--- a/kcmodule/profiles/ui/GlobalConfig.qml
|
||||||
+++ powerdevil-6.1.0/kcmodule/profiles/ui/GlobalConfig.qml
|
+++ b/kcmodule/profiles/ui/GlobalConfig.qml
|
||||||
@@ -221,18 +221,7 @@ Kirigami.ScrollablePage {
|
@@ -221,18 +221,7 @@ Kirigami.ScrollablePage {
|
||||||
id: chargeLimitHeader
|
id: chargeLimitHeader
|
||||||
Kirigami.FormData.label: i18nc("@title:group", "Charge Limit")
|
Kirigami.FormData.label: i18nc("@title:group", "Charge Limit")
|
||||||
@ -746,3 +759,6 @@ Index: powerdevil-6.1.0/kcmodule/profiles/ui/GlobalConfig.qml
|
|||||||
implicitWidth: Kirigami.Units.gridUnit * 16
|
implicitWidth: Kirigami.Units.gridUnit * 16
|
||||||
text: i18nc("@info", "Regularly charging the battery close to 100%, or fully discharging it, may accelerate deterioration of battery health. By limiting the maximum battery charge, you can help extend the battery lifespan.")
|
text: i18nc("@info", "Regularly charging the battery close to 100%, or fully discharging it, may accelerate deterioration of battery health. By limiting the maximum battery charge, you can help extend the battery lifespan.")
|
||||||
}
|
}
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:445b2a5366bc1d64b04547efe6e713b75a2d3309fe4727e9edf6157be6dd4580
|
|
||||||
size 961412
|
|
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIyBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmZqzAsACgkQ11dEg7tX
|
|
||||||
sY0+RQ/455BDBUWMCeMpFvREcQ1y9+jl7JnPLNLbuIQaRgyFmBlmnadEikzR64Hb
|
|
||||||
pfmuC7vB41ycvZHZgsPpK4MnGun+9NpqFQRMGvdSPL+MdutRHqSraIDs5obWEwm8
|
|
||||||
hhi2B7EFofhmX3wZQ+l8sWHbwM2e7V/DbyKpb83LgAdLzGW5o+n13l/r3gFWR5Mk
|
|
||||||
C7QqVLJh52ifvgRwYLQLY530FtA8ckVM1KuArKruQ7r2Xkezg0Sm5/WPIRYmmNmE
|
|
||||||
cG3evaw1RvoI8nVSOHmKytuU6RRcF+jq1eUhE9fqSYvklbGzZhu2LURcCVqFjVN+
|
|
||||||
yITdnBpva+RRDIOO52R6dDuNUi2JxuHZFqk8+Nrp6FJ3PkzbSfc25Kun7rMhZG/G
|
|
||||||
SnZbSE06flppMNNJ7PQlzTmQ+Ns83m6GpS4dyEIeOI9xhL43hl+k2tM/GGkHCORe
|
|
||||||
5fkE5YB+tMWBHmgeDqfoH4MeNXj1Qk/pjDd89KI36gdA5Yd5Rjrd7kFIt/HEuVUP
|
|
||||||
qtLwmRqAjXkBawb3bB9mn5YeQzfOBHCAebpbsD3pv0bTQfIuw1deGowFEspupa1M
|
|
||||||
bDV6lNW7x/6MzMhyodAa+6JNeJ+8iG6GheHd1I/Vv25uYdLdkP2o7NPC1iEgCH5P
|
|
||||||
y2yxKaD1lwohKZ6UofVxYqT27XUsL54YRqaWmREAtjLab9+rEA==
|
|
||||||
=a7Py
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
powerdevil-6.1.1.tar.xz
Normal file
3
powerdevil-6.1.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:495076e90366898399f6c2fee22a2d1fe9698524a7c6f2cacd82f8ca8d699f27
|
||||||
|
size 963752
|
16
powerdevil-6.1.1.tar.xz.sig
Normal file
16
powerdevil-6.1.1.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmZ65XMACgkQ11dEg7tX
|
||||||
|
sY24NQ/6Atvmt7dFvNao5o1f4/b0jgHol3f0dJ3IG/mqdA5vjooq7te6C8uOJRU8
|
||||||
|
+BahhG6IPNkAvG467ZAboXX/nj4eiflDXgSmbkSmf0LJ/KzlvyEJ118ksLJ2pibj
|
||||||
|
mfm7MERkTrNr3JN/lk3v1wBCaRro9hmWiXhUi/znt1h0QK661gjP8Df7Z53ijrL1
|
||||||
|
nRDJ6nJ7FaesoTxRs2/m0BCYrBKWIpk5fAX/yH+QKqss6egUDLaZCQajFpXumqbV
|
||||||
|
G9goeYIC477aRSNqGz0DAeZKfzezyQd6zukGaC5e4R2cYJmmHb8JKfBYutV7grEc
|
||||||
|
6HnI9rot96ueCKvg4YNugSfI3zIWXku1fPYrKkVWK7v3fTa73xOHJvGz8mOHgSXM
|
||||||
|
MsYIigMZwAvPsKufxEnoK90owSjVlsYAIjgt6TNuj+qdOssxXCpBFSVoIkOzel9d
|
||||||
|
Jbt7w5NGhrvHdwZC8vz2z+HGioLQQgP39+IAqcgCErETGq0oFdX4w8VAVGj/qYes
|
||||||
|
XB5tCak/jpk+3BPFR3RJT+5M+Hf/X1cLSZNuAQ769IlGGaYFPhnh/lqKjv/rXK8x
|
||||||
|
mrttorCG0zbPBhwrURexYa2L02BMeXzmhBJTRwjCtAHViWcq/mOkmJVvRH+zgakQ
|
||||||
|
E+6ioVdHk7EtDeProIttnuJwHuq3AN5AQh8jaWPqqZUvZqFOK/w=
|
||||||
|
=Q/XA
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jun 25 17:15:54 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
- Update to 6.1.1:
|
||||||
|
* New bugfix release
|
||||||
|
* For more details see https://kde.org/announcements/plasma/6/6.1.1
|
||||||
|
- Changes since 6.1.0:
|
||||||
|
* update version for new release
|
||||||
|
* Fix initial UI state of Battery protection setting (kde#488954)
|
||||||
|
* daemon: Limit KAuth backlighthelper calls to only one at a time (kde#481003)
|
||||||
|
* skip ddcutil initialization when POWERDEVIL_NO_DDCUTIL is set
|
||||||
|
* update version for new release
|
||||||
|
- Rebase 0001-Revert-Added-setting-for-battery-conservation-mode-L.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jun 17 09:43:38 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
|
Mon Jun 17 09:43:38 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
%define rname powerdevil
|
%define rname powerdevil
|
||||||
%bcond_without released
|
%bcond_without released
|
||||||
Name: powerdevil6
|
Name: powerdevil6
|
||||||
Version: 6.1.0
|
Version: 6.1.1
|
||||||
Release: 0
|
Release: 0
|
||||||
# Full Plasma 6 version (e.g. 6.0.0)
|
# Full Plasma 6 version (e.g. 6.0.0)
|
||||||
%{!?_plasma6_bugfix: %define _plasma6_bugfix %{version}}
|
%{!?_plasma6_bugfix: %define _plasma6_bugfix %{version}}
|
||||||
@ -31,9 +31,9 @@ Release: 0
|
|||||||
Summary: KDE Power Management module
|
Summary: KDE Power Management module
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
URL: https://www.kde.org
|
URL: https://www.kde.org
|
||||||
Source: %{rname}-%{version}.tar.xz
|
Source: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz
|
||||||
%if %{with released}
|
%if %{with released}
|
||||||
Source1: %{rname}-%{version}.tar.xz.sig
|
Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig
|
||||||
Source2: plasma.keyring
|
Source2: plasma.keyring
|
||||||
%endif
|
%endif
|
||||||
# PATCH-BREAK-OPENSUSE waiting for review (boo#1226424)
|
# PATCH-BREAK-OPENSUSE waiting for review (boo#1226424)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user