Accepting request 1185035 from KDE:Frameworks

Plasma 6.1.2 (forwarded request 1184925 from Vogtinator) OBS-URL: https://build.opensuse.org/request/show/1185035 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/powerdevil6?expand=0&rev=9
2024-07-04 14:21:18 +00:00 · 2024-07-04 14:21:18 +00:00 · 6205063123
commit 6205063123
parent 648efbe1ec dceb88e1d3
7 changed files with 51 additions and 33 deletions
--- a/0001-Revert-Added-setting-for-battery-conservation-mode-L.patch
+++ b/0001-Revert-Added-setting-for-battery-conservation-mode-L.patch
@ -1,12 +1,12 @@
-From fa941131af6c15686a9d0a49d36c5d5461325bb3 Mon Sep 17 00:00:00 2001
+From 66422f7144b23123020e1d7a64b66ee70c77bb63 Mon Sep 17 00:00:00 2001
 From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Wed, 26 Jun 2024 12:00:04 +0200
+Date: Tue, 2 Jul 2024 21:02:15 +0200
 Subject: [PATCH] Revert "Added setting for battery conservation mode (Lenovo)"

 This reverts commit 7da820f5ba64766b15c1451ad0fbed3b714ed307.
 This reverts commit 53f688de8eff37a52efed55b52d9e51f5217a185.
 ---
- daemon/chargethreshold_helper_actions.actions | 120 -------------
+ daemon/chargethreshold_helper_actions.actions | 124 --------------
 daemon/chargethresholdhelper.cpp              |  52 ------
 daemon/chargethresholdhelper.h                |   4 -
 daemon/dbus/org.kde.Solid.PowerManagement.xml |   6 -
@ -17,13 +17,13 @@ This reverts commit 53f688de8eff37a52efed55b52d9e51f5217a185.
 kcmodule/profiles/PowerKCM.cpp                |   6 -
 kcmodule/profiles/PowerKCM.h                  |   3 -
 kcmodule/profiles/ui/GlobalConfig.qml         |  16 +-
- 11 files changed, 43 insertions(+), 376 deletions(-)
+ 11 files changed, 43 insertions(+), 380 deletions(-)

 diff --git a/daemon/chargethreshold_helper_actions.actions b/daemon/chargethreshold_helper_actions.actions
-index ce1fb3f3..ff5299e8 100644
+index 19587346..ff5299e8 100644
 --- a/daemon/chargethreshold_helper_actions.actions
 +++ b/daemon/chargethreshold_helper_actions.actions
-@@ -235,123 +235,3 @@ Description[zh_CN]=请进行身份验证以设置电池充电限制。
+@@ -235,127 +235,3 @@ Description[zh_CN]=请进行身份验证以设置电池充电限制。
 Description[zh_TW]=認證以設定電池充電限制。
 Policy=auth_admin
 Persistence=session
@ -43,6 +43,7 @@ index ce1fb3f3..ff5299e8 100644
 -Name[he]=בדיקת מצב שימור סוללה
 -Name[hu]=Akkumulátorkíméló mód ellenőrzése
 -Name[ia]=Verifica le modo de conservation de batteria
+-Name[is]=Athuga sparnaðarsnið rafhlöðu
 -Name[it]=Controlla la modalità di risparmio della batteria
 -Name[ka]=ელემენტის შენახვის რეჟიმის შემოწმება
 -Name[lt]=Tikrinti akumuliatoriaus saugojimo veikseną
@ -71,6 +72,7 @@ index ce1fb3f3..ff5299e8 100644
 -Description[he]=יש לעבור אימות כדי לבדוק את מה המצב הנוכחי של מצב שימור הסוללה.
 -Description[hu]=Hitelesítés szükséges az akkumulátorkímélő mód jelenlegi állapotának ellenőrzéséhez.
 -Description[ia]=Authentica per verificar le stato currente del modo de conservation de batteria.
+-Description[is]=Auðkenndu þig til að sjá núverandi sparnaðarsnið rafhlöðu.
 -Description[it]=Autenticati per controllare lo stato attuale della modalità di risparmio della batteria.
 -Description[ka]=გაიარეთ ავთენტიკაცია ელემენტის შენახვის მიმდინარე რეჟიმის მისაღებად.
 -Description[lt]=Norint tikrinti akumuliatoriaus saugojimo veikseną, turi būti nustatyta tapatybė.
@ -103,6 +105,7 @@ index ce1fb3f3..ff5299e8 100644
 -Name[he]=הגדרת מצב שימור סוללה
 -Name[hu]=Akkumulátorkímélő mód beállítása
 -Name[ia]=Fixa le modo de conservation del batteria
+-Name[is]=Stilla sparnaðarsnið rafhlöðu
 -Name[it]=Imposta la modalità di risparmio della batteria
 -Name[ka]=ელემენტის შენახვის რეჟიმის დაყენება
 -Name[lt]=Nustatyti akumuliatoriaus saugojimo veikseną
@ -131,6 +134,7 @@ index ce1fb3f3..ff5299e8 100644
 -Description[he]=יש לעבור אימות כדי להגדיר את מצב שימור הסוללה.
 -Description[hu]=Hitelesítés szükséges az akkumulátorkímélő mód beállításához.
 -Description[ia]=Authentica per fixar le modo de conservation de batteria.
+-Description[is]=Auðkenndu þig til að stilla sparnaðarsnið rafhlöðu.
 -Description[it]=Autenticati per impostare la modalità di risparmio della batteria.
 -Description[ka]=გაიარეთ ავთენტიკაცია ელემენტის შენახვის დონის დასაყენებლად.
 -Description[lt]=Norint nustatyti akumuliatoriaus saugojimo veikseną, turi būti nustatyta tapatybė.
@ -267,7 +271,7 @@ index 18240feb..5cb5a0ac 100644
       <arg type="i" direction="out" />
     </signal>
 diff --git a/daemon/powerdevilcore.cpp b/daemon/powerdevilcore.cpp
-index 77d3b98b..10d9c8af 100644
+index 915ca0ad..dec3aa41 100644
 --- a/daemon/powerdevilcore.cpp
 +++ b/daemon/powerdevilcore.cpp
@@ -70,7 +70,6 @@ Core::Core(QObject *parent)
@ -278,7 +282,7 @@ index 77d3b98b..10d9c8af 100644
 }
 
 Core::~Core()
-@@ -271,7 +270,6 @@ void Core::reparseConfiguration()
+@@ -266,7 +265,6 @@ void Core::reparseConfiguration()
     }
 
     readChargeThreshold();
@ -286,7 +290,7 @@ index 77d3b98b..10d9c8af 100644
 }
 
 QString Core::currentProfile() const
-@@ -954,29 +952,6 @@ void Core::readChargeThreshold()
+@@ -949,29 +947,6 @@ void Core::readChargeThreshold()
     job->start();
 }
 
@ -316,7 +320,7 @@ index 77d3b98b..10d9c8af 100644
 SuspendController *Core::suspendController()
 {
     return m_suspendController.get();
-@@ -1021,11 +996,6 @@ bool Core::hasDualGpu() const
+@@ -1017,11 +992,6 @@ bool Core::hasDualGpu() const
     return m_hasDualGpu;
 }
 
@ -329,10 +333,10 @@ index 77d3b98b..10d9c8af 100644
 {
     return m_chargeStartThreshold;
 diff --git a/daemon/powerdevilcore.h b/daemon/powerdevilcore.h
-index 1e3fd1d7..4cf6c1fd 100644
+index 02fe8430..634ee7ff 100644
 --- a/daemon/powerdevilcore.h
 +++ b/daemon/powerdevilcore.h
-@@ -105,7 +105,6 @@ public Q_SLOTS:
+@@ -106,7 +106,6 @@ public Q_SLOTS:
     bool isLidPresent() const;
     bool isActionSupported(const QString &actionName);
     bool hasDualGpu() const;
@ -340,7 +344,7 @@ index 1e3fd1d7..4cf6c1fd 100644
     int chargeStartThreshold() const;
     int chargeStopThreshold() const;
 
-@@ -124,7 +123,6 @@ Q_SIGNALS:
+@@ -125,7 +124,6 @@ Q_SIGNALS:
     void batteryRemainingTimeChanged(qulonglong time);
     void smoothedBatteryRemainingTimeChanged(qulonglong time);
     void lidClosedChanged(bool closed);
--- a/powerdevil-6.1.1.tar.xz
+++ b/powerdevil-6.1.1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:495076e90366898399f6c2fee22a2d1fe9698524a7c6f2cacd82f8ca8d699f27
-size 963752
--- a/powerdevil-6.1.1.tar.xz.sig
+++ b/powerdevil-6.1.1.tar.xz.sig
@ -1,16 +0,0 @@
-----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-----
--- a/powerdevil-6.1.2.tar.xz
+++ b/powerdevil-6.1.2.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4a8b85536f69e223697bd1c7abd1dc3fc283a71c5b5cc09a91a247d85d85014
+size 964468
--- a/powerdevil-6.1.2.tar.xz.sig
+++ b/powerdevil-6.1.2.tar.xz.sig
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmaEDG4ACgkQ11dEg7tX
+sY1n4A/+Nh+aiRxWHtdTuwY+0sH2RSZ3v03Q0fWigtQ6yKHW1hkL8Rgfdw1dNPng
+zLfts+O2Qsjg3TKNbwr3Mi8jcb91e14RbcrA06NbNoiIF/9FbCNlpEjxTXP7veNd
+y19H8ByQxuz8Xe7GDj6LCp9BhaD0nMSMONa1aicFV/l+80eeYM33dE5tpBXi/QnO
+b+sUmBD7816GcWvzxxz5/Jor6BrzGxTBq4Z2BYTfCxSkwXqGRT4EXzn1MY7cuynd
+LDGLDmKwjqhr7d2expvXsOcdMTssR7Go2HHM5Hil9M/Shqjl+SQq3u3AhKOx0jeh
+5pH8D+Y0QE7Rv4vcxkZm+GWv+lSFJ8rdwH4vLr7Df/EkDOu22L+m6Ko11/GYXf9p
+56TTtuGqPc4fx+brNm3ZyDYy1h2c/T4lGCHx7qW+qWiqRTcabIEkNLibFrnoffsd
+GHfBPimtJGsk9IUXe89B0ZF+STJZ2Wi+GbZ3kyvS/jwQ4Tin6fZZyKce3wLH0BMt
+GtVfJ6qRYv1DUOaTOD2C2FvWjxHx+cSF8ou143SUryV9hJk0kvbERhaooeZhQAOC
+7jq5RcT8wB8B9Y65VOSrFELY5exUJMrQiyxQdUXDO3PG285QidXGgAwIzFaVTEpF
+EMW2CbwjBHO3bp9NIJrliUR5fGMKxyT87wzF1MXQWyw6j1Y+cms=
+=em90
+-----END PGP SIGNATURE-----
--- a/powerdevil6.changes
+++ b/powerdevil6.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Jul  2 17:34:34 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.1.2:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.1.2
+- Changes since 6.1.1:
+  * daemon/controllers: Reintroduce a mutex around ddca_open_display2() (kde#489169)
+  * update version for new release
+  * ddcutildisplay: give some time before changing brightness after the monitor resumes
+  * core: reload actions on brightness controller changes
+  * update version for new release
+- Rebase 0001-Revert-Added-setting-for-battery-conservation-mode-L.patch
+
 -------------------------------------------------------------------
 Tue Jun 25 17:15:54 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>

--- a/powerdevil6.spec
+++ b/powerdevil6.spec
@ -22,7 +22,7 @@
 %define rname powerdevil
 %bcond_without released
 Name:           powerdevil6
-Version:        6.1.1
+Version:        6.1.2
 Release:        0
 # Full Plasma 6 version (e.g. 6.0.0)
 %{!?_plasma6_bugfix: %define _plasma6_bugfix %{version}}