| 1 |
dilfridge 14/02/25 23:57:17 |
| 2 |
|
| 3 |
Added: powerdevil-4.11.6-systemd.patch |
| 4 |
Log: |
| 5 |
Add backport for correct detection of systemd-210, bug 502440 |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 84AD142F) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 kde-base/powerdevil/files/powerdevil-4.11.6-systemd.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/powerdevil/files/powerdevil-4.11.6-systemd.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/powerdevil/files/powerdevil-4.11.6-systemd.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: powerdevil-4.11.6-systemd.patch |
| 16 |
=================================================================== |
| 17 |
From 5dc2b9a5c09d95ba9a17ac00056213082feb8d90 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Raymond Wooninck <tittiatcoke@×××××.com> |
| 19 |
Date: Tue, 25 Feb 2014 19:59:36 +0100 |
| 20 |
Subject: [PATCH] Perform the systemd version evaluation through a regular |
| 21 |
expression to be more flexible for changes in the version string that systemd |
| 22 |
returns |
| 23 |
|
| 24 |
REVIEW: 115271 |
| 25 |
--- |
| 26 |
.../daemon/backends/upower/powerdevilupowerbackend.cpp | 12 ++++++++---- |
| 27 |
1 file changed, 8 insertions(+), 4 deletions(-) |
| 28 |
|
| 29 |
diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp |
| 30 |
index eae5436..94b20f1 100644 |
| 31 |
--- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp |
| 32 |
+++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp |
| 33 |
@@ -40,13 +40,17 @@ |
| 34 |
|
| 35 |
bool checkSystemdVersion(uint requiredVersion) |
| 36 |
{ |
| 37 |
- bool ok; |
| 38 |
|
| 39 |
QDBusInterface systemdIface("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", |
| 40 |
QDBusConnection::systemBus(), 0); |
| 41 |
- const uint version = systemdIface.property("Version").toString().section(' ', 1).toUInt(&ok); |
| 42 |
- if (ok) { |
| 43 |
- return (version >= requiredVersion); |
| 44 |
+ |
| 45 |
+ const QString reply = systemdIface.property("Version").toString(); |
| 46 |
+ |
| 47 |
+ QRegExp expsd("(systemd )?([0-9]+)"); |
| 48 |
+ |
| 49 |
+ if (expsd.exactMatch(reply)) { |
| 50 |
+ const uint version = expsd.cap(2).toUInt(); |
| 51 |
+ return (version >= requiredVersion); |
| 52 |
} |
| 53 |
|
| 54 |
// Since version 1.11 Upstart user sessions implement the exact same API as logind |
| 55 |
-- |
| 56 |
1.9.0 |
Archives