commit powerdevil5 for openSUSE:Factory
Hello community, here is the log from the commit of package powerdevil5 for openSUSE:Factory checked in at 2018-04-30 22:48:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powerdevil5 (Old) and /work/SRC/openSUSE:Factory/.powerdevil5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "powerdevil5" Mon Apr 30 22:48:40 2018 rev:63 rq:601681 version:5.12.4 Changes: -------- --- /work/SRC/openSUSE:Factory/powerdevil5/powerdevil5.changes 2018-03-30 12:06:21.548041407 +0200 +++ /work/SRC/openSUSE:Factory/.powerdevil5.new/powerdevil5.changes 2018-04-30 22:48:56.354352287 +0200 @@ -1,0 +2,6 @@ +Thu Apr 26 19:15:15 UTC 2018 - fabian@ritter-vogt.de + +- Add patch to fix initial config generation (kde#391782): + * 0001-Ignore-migration-key-for-determining-whether-the-con.patch + +------------------------------------------------------------------- New: ---- 0001-Ignore-migration-key-for-determining-whether-the-con.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerdevil5.spec ++++++ --- /var/tmp/diff_new_pack.I46Gdr/_old 2018-04-30 22:48:57.010328354 +0200 +++ /var/tmp/diff_new_pack.I46Gdr/_new 2018-04-30 22:48:57.022327916 +0200 @@ -30,6 +30,7 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/plasma/%{version}/powerdevil-%{version}.tar.xz # PATCHES 000-100 and above are from upstream 5.12 branch +Patch1: 0001-Ignore-migration-key-for-determining-whether-the-con.patch # PATCHES 101-200 and above are from upstream master/5.13 branch Patch101: 0001-Use-platform-detection-from-KWorkspace-in-Powerdevil.patch BuildRequires: extra-cmake-modules >= 1.2.0 ++++++ 0001-Ignore-migration-key-for-determining-whether-the-con.patch ++++++
From be91abe7fc8cc731b57bec4cf2c004c07b0fd79b Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik <kde@privat.broulik.de> Date: Wed, 25 Apr 2018 10:56:16 +0200 Subject: [PATCH] Ignore "migration" key for determining whether the config is empty
Otherwise we would never generate the default power management configuration leading to it not suspending on lid close, not handling power buttons etc etc CHANGELOG: Fixed bug that caused power management system to not work on a fresh install Reviewed-By: David Edmundson BUG: 391782 FIXED-IN: 5.12.5 --- daemon/powerdevilcore.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/daemon/powerdevilcore.cpp b/daemon/powerdevilcore.cpp index 2cf936e..53b7521 100644 --- a/daemon/powerdevilcore.cpp +++ b/daemon/powerdevilcore.cpp @@ -108,9 +108,15 @@ void Core::onBackendReady() m_profilesConfig = KSharedConfig::openConfig("powermanagementprofilesrc", KConfig::CascadeConfig); + QStringList groups = m_profilesConfig->groupList(); + // the "migration" key is for shortcuts migration in added by migratePre512KeyboardShortcuts + // and as such our configuration would never be considered empty, ignore it! + groups.removeOne(QStringLiteral("migration")); + // Is it brand new? - if (m_profilesConfig->groupList().isEmpty()) { + if (groups.isEmpty()) { // Generate defaults + qCDebug(POWERDEVIL) << "Generating a default configuration"; bool toRam = m_backend->supportedSuspendMethods() & PowerDevil::BackendInterface::ToRam; bool toDisk = m_backend->supportedSuspendMethods() & PowerDevil::BackendInterface::ToDisk; ProfileGenerator::generateProfiles(toRam, toDisk); -- 2.16.2
participants (1)
-
root@hilbert.suse.de