diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-05 04:00:14 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-05 04:00:14 +0000 |
| commit | 4f7963b7ddc283ae57ceb68e7f4d51b3994e0070 (patch) | |
| tree | 6ebcd67cfca9e9554f131b1ae746d9819f599294 /extra/kdebase-workspace | |
| parent | a78b434ff9cfdfb3d175c900ff622a561b84123f (diff) | |
Wed Mar 5 03:57:00 UTC 2014
Diffstat (limited to 'extra/kdebase-workspace')
| -rw-r--r-- | extra/kdebase-workspace/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/kdebase-workspace/systemd209.patch | 32 |
2 files changed, 41 insertions, 4 deletions
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 90b77805d..d08be502f 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 205802 2014-02-10 11:01:54Z andrea $ +# $Id: PKGBUILD 206679 2014-03-04 18:38:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgname=kdebase-workspace _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 @@ install="${pkgname}.install" 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 @@ sha1sums=('f1da23a472064307dcd244605a7004701982e5de' 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' 'c079ebd157c836ba996190f0d2bcea1a7828d02c' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') + 'd509dac592bd8b310df27991b208c95b6d907514' + 'cf57f90debbdabb359272e87696280f8df423fba') prepare() { mkdir build @@ -51,6 +53,9 @@ prepare() { # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch + + # KDEBUG#331403 + patch -p1 -i "${srcdir}"/systemd209.patch } build() { diff --git a/extra/kdebase-workspace/systemd209.patch b/extra/kdebase-workspace/systemd209.patch new file mode 100644 index 000000000..42b3f5efe --- /dev/null +++ b/extra/kdebase-workspace/systemd209.patch @@ -0,0 +1,32 @@ +commit 7584a63924620bac3bd87277c11cdb8cdb5018b1 +Author: Raymond Wooninck <tittiatcoke@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 |