[arch-commits] Commit in upower/repos (6 files)
Jan Steffens
heftig at archlinux.org
Sun Sep 2 02:46:12 UTC 2012
Date: Saturday, September 1, 2012 @ 22:46:11
Author: heftig
Revision: 165871
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
upower/repos/testing-i686/0001-Send-resume-signal-when-built-with-systemd-and-using.patch
(from rev 165870, upower/trunk/0001-Send-resume-signal-when-built-with-systemd-and-using.patch)
upower/repos/testing-i686/PKGBUILD
(from rev 165870, upower/trunk/PKGBUILD)
upower/repos/testing-x86_64/0001-Send-resume-signal-when-built-with-systemd-and-using.patch
(from rev 165870, upower/trunk/0001-Send-resume-signal-when-built-with-systemd-and-using.patch)
upower/repos/testing-x86_64/PKGBUILD
(from rev 165870, upower/trunk/PKGBUILD)
Deleted:
upower/repos/testing-i686/PKGBUILD
upower/repos/testing-x86_64/PKGBUILD
--------------------------------------------------------------------------------+
testing-i686/0001-Send-resume-signal-when-built-with-systemd-and-using.patch | 35 ++++
testing-i686/PKGBUILD | 71 +++++-----
testing-x86_64/0001-Send-resume-signal-when-built-with-systemd-and-using.patch | 35 ++++
testing-x86_64/PKGBUILD | 71 +++++-----
4 files changed, 146 insertions(+), 66 deletions(-)
Copied: upower/repos/testing-i686/0001-Send-resume-signal-when-built-with-systemd-and-using.patch (from rev 165870, upower/trunk/0001-Send-resume-signal-when-built-with-systemd-and-using.patch)
===================================================================
--- testing-i686/0001-Send-resume-signal-when-built-with-systemd-and-using.patch (rev 0)
+++ testing-i686/0001-Send-resume-signal-when-built-with-systemd-and-using.patch 2012-09-02 02:46:11 UTC (rev 165871)
@@ -0,0 +1,35 @@
+From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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 at 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
+
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2012-09-02 02:44:51 UTC (rev 165870)
+++ testing-i686/PKGBUILD 2012-09-02 02:46:11 UTC (rev 165871)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=upower
-pkgver=0.9.18
-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)
-md5sums=('bfaaa1e7f8479fca5594406b3c36dff9')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # put udev files in /usr/lib
- sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/$pkgname \
- --disable-static
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: upower/repos/testing-i686/PKGBUILD (from rev 165870, upower/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-09-02 02:46:11 UTC (rev 165871)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=upower
+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' '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)
+md5sums=('bfaaa1e7f8479fca5594406b3c36dff9'
+ '188afea4919dc324b2efbae35d9d216a')
+
+build() {
+ 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 \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/$pkgname \
+ --disable-static
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
Copied: upower/repos/testing-x86_64/0001-Send-resume-signal-when-built-with-systemd-and-using.patch (from rev 165870, upower/trunk/0001-Send-resume-signal-when-built-with-systemd-and-using.patch)
===================================================================
--- testing-x86_64/0001-Send-resume-signal-when-built-with-systemd-and-using.patch (rev 0)
+++ testing-x86_64/0001-Send-resume-signal-when-built-with-systemd-and-using.patch 2012-09-02 02:46:11 UTC (rev 165871)
@@ -0,0 +1,35 @@
+From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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 at 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
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2012-09-02 02:44:51 UTC (rev 165870)
+++ testing-x86_64/PKGBUILD 2012-09-02 02:46:11 UTC (rev 165871)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=upower
-pkgver=0.9.18
-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)
-md5sums=('bfaaa1e7f8479fca5594406b3c36dff9')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # put udev files in /usr/lib
- sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/$pkgname \
- --disable-static
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: upower/repos/testing-x86_64/PKGBUILD (from rev 165870, upower/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-09-02 02:46:11 UTC (rev 165871)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=upower
+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' '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)
+md5sums=('bfaaa1e7f8479fca5594406b3c36dff9'
+ '188afea4919dc324b2efbae35d9d216a')
+
+build() {
+ 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 \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/$pkgname \
+ --disable-static
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
More information about the arch-commits
mailing list