From ad9a5272c5d0f29a7c04e1e9a5d5f0682e7267df Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 26 Apr 2018 21:49:32 +0200 Subject: plasma/powerdevil: patched a regression PowerDevil fails to configure power settings on a fresh install. This is fixed in 5.12.5 but it was annoying enough to already provide a patched 5.12.4 version. --- kde/build/powerdevil | 1 + kde/patch/powerdevil.patch | 4 +++ .../powerdevil/powerdevil-5.12.4_firstrun.patch | 42 ++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 kde/build/powerdevil create mode 100644 kde/patch/powerdevil.patch create mode 100644 kde/patch/powerdevil/powerdevil-5.12.4_firstrun.patch diff --git a/kde/build/powerdevil b/kde/build/powerdevil new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/kde/build/powerdevil @@ -0,0 +1 @@ +2 diff --git a/kde/patch/powerdevil.patch b/kde/patch/powerdevil.patch new file mode 100644 index 0000000..4b5d4e6 --- /dev/null +++ b/kde/patch/powerdevil.patch @@ -0,0 +1,4 @@ +# PowerDevil fails to setup power settings on a fresh install. +# Fixed in 5.12.5. +cat $CWD/patch/powerdevil/powerdevil-5.12.4_firstrun.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/powerdevil/powerdevil-5.12.4_firstrun.patch b/kde/patch/powerdevil/powerdevil-5.12.4_firstrun.patch new file mode 100644 index 0000000..165e67b --- /dev/null +++ b/kde/patch/powerdevil/powerdevil-5.12.4_firstrun.patch @@ -0,0 +1,42 @@ +From be91abe7fc8cc731b57bec4cf2c004c07b0fd79b Mon Sep 17 00:00:00 2001 +From: Kai Uwe Broulik +Date: Wed, 25 Apr 2018 10:56:16 +0200 +Subject: 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); +-- +cgit v0.11.2 + -- cgit v1.2.3