[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD systemd209.patch)

[Andrea Scarpino]

    Date: Wednesday, February 26, 2014 @ 09:26:20
  Author: andrea
Revision: 206441

upgpkg: kdebase-workspace 4.11.6-3

Fix compatibility with systemd >= 209

Added:
  kdebase-workspace/trunk/systemd209.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD

------------------+
 PKGBUILD         |   11 ++++++++---
 systemd209.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-26 07:02:43 UTC (rev 206440)
+++ PKGBUILD	2014-02-26 08:26:20 UTC (rev 206441)
@@ -6,7 +6,7 @@
 _pkgname=kde-workspace
 pkgver=4.11.6
 _pkgver=4.12.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -28,7 +28,8 @@
 backup=('usr/share/config/kdm/kdmrc')
 source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
-        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+        'systemd209.patch')
 sha1sums=('f1da23a472064307dcd244605a7004701982e5de'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
@@ -37,7 +38,8 @@
           'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
+          'd509dac592bd8b310df27991b208c95b6d907514'
+          'cf57f90debbdabb359272e87696280f8df423fba')
 
 prepare() {
         mkdir build
@@ -51,6 +53,9 @@
 
         # KDEBUG#202629
         patch -p0 -i "${srcdir}"/terminate-server.patch
+
+        # KDEBUG#331403
+        patch -p1 -i "${srcdir}"/systemd209.patch
 }
 
 build() {

Added: systemd209.patch
===================================================================
--- systemd209.patch	                        (rev 0)
+++ systemd209.patch	2014-02-26 08:26:20 UTC (rev 206441)
@@ -0,0 +1,32 @@
+commit 7584a63924620bac3bd87277c11cdb8cdb5018b1
+Author: Raymond Wooninck <tittiatcoke at gmail.com>
+Date:   Tue Feb 25 20:12:58 2014 +0100
+
+    Perform the systemd version evaluation through a regular expression to be more flexible for changes in the version string that systemd returns (Based on Review request 115271)
+
+diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
+index cc3b6ad..70124ad 100644
+--- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
++++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
+@@ -41,13 +41,17 @@
+ 
+ bool checkSystemdVersion(uint requiredVersion)
+ {
+-    bool ok;
+ 
+     QDBusInterface systemdIface("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager",
+                                 QDBusConnection::systemBus(), 0);
+-    const uint version = systemdIface.property("Version").toString().section(' ', 1).toUInt(&ok);
+-    if (ok) {
+-       return (version >= requiredVersion);
++
++    const QString reply = systemdIface.property("Version").toString();
++
++    QRegExp expsd("(systemd )?([0-9]+)");
++
++    if (expsd.exactMatch(reply)) {
++        const uint version = expsd.cap(2).toUInt();
++        return (version >= requiredVersion);
+     }
+ 
+     // Since version 1.11 Upstart user sessions implement the exact same API as logind