diff options
| -rw-r--r-- | abs/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch | 35 | ||||
| -rw-r--r-- | abs/extra/upower/PKGBUILD | 32 |
2 files changed, 13 insertions, 54 deletions
diff --git a/abs/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch b/abs/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch deleted file mode 100644 index 2694334..0000000 --- a/abs/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch +++ /dev/null @@ -1,35 +0,0 @@ -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/abs/extra/upower/PKGBUILD b/abs/extra/upower/PKGBUILD index d27d378..7833118 100644 --- a/abs/extra/upower/PKGBUILD +++ b/abs/extra/upower/PKGBUILD @@ -1,29 +1,25 @@ -# $Id: PKGBUILD 166524 2012-09-09 15:41:20Z heftig $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower -pkgver=0.9.18 -pkgrel=2 +pkgver=0.99.3 +pkgrel=1 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' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd') -options=('!libtool') -source=($url/releases/$pkgname-$pkgver.tar.xz - 0001-Send-resume-signal-when-built-with-systemd-and-using.patch) +depends=('systemd' 'libusb' 'dbus-glib' 'libimobiledevice' 'libgudev') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python2') +backup=('etc/UPower/UPower.conf') +source=(http://upower.freedesktop.org/releases/$pkgname-$pkgver.tar.xz) +sha256sums=('697199bcc113bb069e6fb6bf4135536a702ba9847e46c5fc6df87d19624ddd38') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver - # 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 \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/$pkgname \ --disable-static @@ -31,8 +27,6 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } -md5sums=('bfaaa1e7f8479fca5594406b3c36dff9' - '188afea4919dc324b2efbae35d9d216a') |