diff options
Diffstat (limited to 'testing/upower')
| -rw-r--r-- | testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch | 35 | ||||
| -rw-r--r-- | testing/upower/PKGBUILD | 13 |
2 files changed, 44 insertions, 4 deletions
diff --git a/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch b/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch new file mode 100644 index 000000000..2694334c8 --- /dev/null +++ b/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch @@ -0,0 +1,35 @@ +From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Sun, 2 Sep 2012 04:36:13 +0200 +Subject: [PATCH] Send resume signal when built with systemd and using + pm-utils suspend + +This case was apparently overlooked when adding systemd support. + +Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +--- + src/linux/up-backend.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c +index ddd4472..52b430e 100644 +--- a/src/linux/up-backend.c ++++ b/src/linux/up-backend.c +@@ -603,10 +603,11 @@ gboolean + up_backend_emits_resuming (UpBackend *backend) + { + #ifdef HAVE_SYSTEMD +- return TRUE; +-#else +- return FALSE; ++ if (sd_booted ()) ++ return TRUE; ++ else + #endif ++ return FALSE; + } + + /** +-- +1.7.12 + diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD index 962c304bc..22697257d 100644 --- a/testing/upower/PKGBUILD +++ b/testing/upower/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165781 2012-08-29 21:43:32Z heftig $ +# $Id: PKGBUILD 165871 2012-09-02 02:46:11Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower pkgver=0.9.18 -pkgrel=1 +pkgrel=2 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" @@ -11,8 +11,10 @@ license=('GPL') depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd') options=('!libtool') -source=($url/releases/$pkgname-$pkgver.tar.xz) -md5sums=('bfaaa1e7f8479fca5594406b3c36dff9') +source=($url/releases/$pkgname-$pkgver.tar.xz + 0001-Send-resume-signal-when-built-with-systemd-and-using.patch) +md5sums=('bfaaa1e7f8479fca5594406b3c36dff9' + '188afea4919dc324b2efbae35d9d216a') build() { cd "$pkgname-$pkgver" @@ -20,6 +22,9 @@ build() { # put udev files in /usr/lib sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure + # https://bugs.freedesktop.org/show_bug.cgi?id=54371 + patch -Np1 -i ../0001-Send-resume-signal-when-built-with-systemd-and-using.patch + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/$pkgname \ |