diff --git a/.gitignore b/.gitignore index 064e057..1ace73b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/powerdevil-5.4.3.tar.xz -/powerdevil-5.4.95.tar.xz -/powerdevil-5.5.0.tar.xz -/powerdevil-5.5.1.tar.xz -/powerdevil-5.5.2.tar.xz /powerdevil-5.5.3.tar.xz diff --git a/0002-Don-t-consider-Unknown-output-to-be-an-external-moni.patch b/0002-Don-t-consider-Unknown-output-to-be-an-external-moni.patch new file mode 100644 index 0000000..5e95982 --- /dev/null +++ b/0002-Don-t-consider-Unknown-output-to-be-an-external-moni.patch @@ -0,0 +1,30 @@ +From fefe2878f5c204fa01306e9e6c60045295ef66a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= +Date: Mon, 11 Jan 2016 23:51:42 +0100 +Subject: [PATCH 2/2] Don't consider Unknown output to be an external monitor + +When laptop screen gets reported as 'Unknown', assume it's a laptop screen +and not an external screen, so that suspend-on-lid-close does not get disabled. + +REVIEW: 126721 +CCBUG: 357868 +--- + daemon/actions/bundled/handlebuttonevents.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/daemon/actions/bundled/handlebuttonevents.cpp b/daemon/actions/bundled/handlebuttonevents.cpp +index 7e1d16e..1c3a06d 100644 +--- a/daemon/actions/bundled/handlebuttonevents.cpp ++++ b/daemon/actions/bundled/handlebuttonevents.cpp +@@ -230,7 +230,7 @@ void HandleButtonEvents::checkOutputs() + bool hasExternalMonitor = false; + + for(const KScreen::OutputPtr &output : m_screenConfiguration->outputs()) { +- if (output->isConnected() && output->isEnabled() && output->type() != KScreen::Output::Panel) { ++ if (output->isConnected() && output->isEnabled() && output->type() != KScreen::Output::Panel && output->type() != KScreen::Output::Unknown) { + hasExternalMonitor = true; + break; + } +-- +2.5.0 + diff --git a/powerdevil.spec b/powerdevil.spec index 3033c5e..e1bb804 100644 --- a/powerdevil.spec +++ b/powerdevil.spec @@ -1,6 +1,6 @@ Name: powerdevil -Version: 5.5.3 -Release: 1%{?dist} +Version: 5.5.3 +Release: 2%{?dist} Summary: Manages the power consumption settings of a Plasma Shell License: GPLv2+ @@ -15,11 +15,11 @@ URL: https://projects.kde.org/powerdevil Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz ## upstream patches +Patch2: 0002-Don-t-consider-Unknown-output-to-be-an-external-moni.patch # TODO: document why this is (still) needed and not yet upstreamed? -- rex Patch100: powerdevil-enable-upower.patch -BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: kf5-kactivities-devel BuildRequires: kf5-kauth-devel @@ -97,6 +97,10 @@ rm %{buildroot}/%{_libdir}/libpowerdevil{configcommonprivate,core,ui}.so %changelog +* Thu Jan 14 2016 Rex Dieter - 5.5.3-2 +- backport https://git.reviewboard.kde.org/r/126721/ +- -BR: cmake + * Thu Jan 07 2016 Daniel Vrátil - 5.5.3-1 - Plasma 5.5.3