[kde-workspace] respin systemd_login1 patch
Rex Dieter
rdieter at fedoraproject.org
Tue Jan 22 14:28:49 UTC 2013
commit 799f3d1ba3728dc3422549cae64b9241eb385f60
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Jan 22 08:28:44 2013 -0600
respin systemd_login1 patch
...orkspace-4.9.98-powerdevil_systemd_login1.patch | 28 ++++++++++----------
kde-workspace.spec | 9 ++++--
2 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/kde-workspace-4.9.97-powerdevil_systemd_login1.patch b/kde-workspace-4.9.98-powerdevil_systemd_login1.patch
similarity index 95%
rename from kde-workspace-4.9.97-powerdevil_systemd_login1.patch
rename to kde-workspace-4.9.98-powerdevil_systemd_login1.patch
index 9b69956..ee3e3b6 100644
--- a/kde-workspace-4.9.97-powerdevil_systemd_login1.patch
+++ b/kde-workspace-4.9.98-powerdevil_systemd_login1.patch
@@ -72,10 +72,10 @@ index 0000000..c7e33ba
+#endif //LOGIN1SUSPENDJOB_H
diff --git a/powerdevil/daemon/backends/upower/login1suspendjob.cpp b/powerdevil/daemon/backends/upower/login1suspendjob.cpp
new file mode 100644
-index 0000000..1fe34bb
+index 0000000..3ec0ddc
--- /dev/null
+++ b/powerdevil/daemon/backends/upower/login1suspendjob.cpp
-@@ -0,0 +1,100 @@
+@@ -0,0 +1,99 @@
+/* This file is part of the KDE project
+ Copyright (C) 2006 Kevin Ottens <ervin at kde.org>
+ Copyright (C) 2010 Alejandro Fiestas <alex at eyeos.org>
@@ -166,8 +166,7 @@ index 0000000..1fe34bb
+ const QDBusPendingReply<void> reply = *watcher;
+ if (!reply.isError()) {
+ emitResult();
-+ }
-+ else {
++ } else {
+ kWarning() << "Failed to start suspend job" << reply.error().name() << reply.error().message();
+ }
+
@@ -207,7 +206,7 @@ index ba942bd..ae3d754 100644
bool m_lidIsPresent;
bool m_lidIsClosed;
diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
-index 97a409b..2c00ac0 100644
+index 97a409b..dd2cff8 100644
--- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
+++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
@@ -2,7 +2,7 @@
@@ -263,38 +262,39 @@ index 97a409b..2c00ac0 100644
+ if (m_login1Interface) {
+ QDBusPendingReply<QString> canSuspend = m_login1Interface.data()->asyncCall("CanSuspend");
+ canSuspend.waitForFinished();
-+ if (canSuspend.isValid() && canSuspend.value() != "no")
++ if (canSuspend.isValid() && (canSuspend.value() == "yes" || canSuspend.value() == "challenge"))
+ supported |= ToRam;
+
+ QDBusPendingReply<QString> canHibernate = m_login1Interface.data()->asyncCall("CanHibernate");
+ canHibernate.waitForFinished();
-+ if (canHibernate.isValid() && canHibernate.value() != "no")
++ if (canHibernate.isValid() && (canHibernate.value() == "yes" || canHibernate.value() == "challenge"))
+ supported |= ToDisk;
+
+ QDBusPendingReply<QString> canHybridSleep = m_login1Interface.data()->asyncCall("CanHybridSleep");
+ canHybridSleep.waitForFinished();
-+ if (canHybridSleep.isValid() && canHybridSleep.value() != "no")
++ if (canHybridSleep.isValid() && (canHybridSleep.value() == "yes" || canHybridSleep.value() == "challenge"))
+ supported |= HybridSuspend;
+ } else {
if (m_upowerInterface->canSuspend() && m_upowerInterface->SuspendAllowed()) {
kDebug() << "Can suspend";
supported |= ToRam;
-@@ -125,7 +150,13 @@ void PowerDevilUPowerBackend::init()
+@@ -125,7 +150,14 @@ void PowerDevilUPowerBackend::init()
}
}
- connect(m_upowerInterface, SIGNAL(Resuming()), this, SIGNAL(resumeFromSuspend()));
++#if 0
+ // CHECKME if login1 indeed has the resuming signal, it doesn't yet :/
+ // "resuming" signal
+ if (m_login1Interface) {
+ connect(m_login1Interface.data(), SIGNAL(PrepareForSleep(bool)), this, SLOT(slotLogin1Resuming(bool)));
-+ } else {
++ } else
++#endif
+ connect(m_upowerInterface, SIGNAL(Resuming()), this, SIGNAL(resumeFromSuspend()));
-+ }
// battery
QList<RecallNotice> recallList;
-@@ -246,7 +277,11 @@ bool PowerDevilUPowerBackend::setBrightness(float brightnessValue, PowerDevil::B
+@@ -246,7 +278,11 @@ bool PowerDevilUPowerBackend::setBrightness(float brightnessValue, PowerDevil::B
KJob* PowerDevilUPowerBackend::suspend(PowerDevil::BackendInterface::SuspendMethod method)
{
@@ -307,7 +307,7 @@ index 97a409b..2c00ac0 100644
}
void PowerDevilUPowerBackend::enumerateDevices()
-@@ -337,4 +372,11 @@ void PowerDevilUPowerBackend::slotPropertyChanged()
+@@ -337,4 +373,11 @@ void PowerDevilUPowerBackend::slotPropertyChanged()
m_onBattery = onBattery;
}
@@ -344,7 +344,7 @@ index bbe2f45..aac4b12 100644
void start();
diff --git a/powerdevil/daemon/backends/upower/upowersuspendjob.cpp b/powerdevil/daemon/backends/upower/upowersuspendjob.cpp
-index fa64ab0..8b183e7 100644
+index 536a7e1..08a850a 100644
--- a/powerdevil/daemon/backends/upower/upowersuspendjob.cpp
+++ b/powerdevil/daemon/backends/upower/upowersuspendjob.cpp
@@ -25,7 +25,6 @@
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 93c4ad2..7dc636a 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -5,7 +5,7 @@
Summary: KDE Workspace
Name: kde-workspace
Version: 4.9.98
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
URL: https://projects.kde.org/projects/kde/kde-workspace
@@ -91,7 +91,7 @@ Patch53: kde-workspace-4.7.95-kdm_xauth.patch
# bring systemd-login1 power love to powerdevil
# https://git.reviewboard.kde.org/r/108407/
-Patch54: kde-workspace-4.9.97-powerdevil_systemd_login1.patch
+Patch54: kde-workspace-4.9.98-powerdevil_systemd_login1.patch
# pam/systemd bogosity: kdm restart/shutdown does not work
# http://bugzilla.redhat.com/796969
@@ -436,7 +436,7 @@ Requires: akonadi
%patch51 -p1 -b .add_apper_to_kickoff_favorites
%patch52 -p1 -b .bz#732830-login
%patch53 -p1 -b .kdm_xauth
-#patch54 -p1 -b .powerdevil_systemd_login1
+%patch54 -p1 -b .powerdevil_systemd_login1
%patch57 -p1 -b .bug796969
%patch62 -p0 -b .systemd-displaymanager
@@ -973,6 +973,9 @@ fi
%changelog
+* Tue Jan 22 2013 Rex Dieter <rdieter at fedoraproject.org> 4.9.98-2
+- respin systemd_login1 patch
+
* Sun Jan 20 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.9.98-1
- 4.9.98
More information about the scm-commits
mailing list