From 870527386e33c72826da94aee783bb212b06c53a Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 11 Sep 2012 00:03:28 +0000
Subject: Tue Sep 11 00:03:27 UTC 2012

---
 ...-signal-when-built-with-systemd-and-using.patch | 35 ++++++++++++++++++++++
 extra/upower/PKGBUILD                              | 24 ++++++++-------
 2 files changed, 49 insertions(+), 10 deletions(-)
 create mode 100644 extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch

(limited to 'extra/upower')

diff --git a/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch b/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch
new file mode 100644
index 000000000..2694334c8
--- /dev/null
+++ b/extra/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/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index 4b1454406..bbcc86679 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,17 +1,20 @@
-# $Id: PKGBUILD 164370 2012-07-31 19:43:25Z eric $
+# $Id: PKGBUILD 166524 2012-09-09 15:41:20Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.17
+pkgver=0.9.18
 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"
 license=('GPL')
-depends=('systemd-tools' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
+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)
+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"
@@ -19,11 +22,13 @@ 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/upower \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --disable-static
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname \
+    --disable-static
   make
 }
 
@@ -31,4 +36,3 @@ package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('9ef7fc8ec438542f014f3a34552822aa')
-- 
cgit v1.2.3-54-g00ecf