summaryrefslogtreecommitdiff
path: root/upower
diff options
context:
space:
mode:
authorDanny Rawlins <monster.romster@gmail.com>2016-06-20 08:50:43 +1000
committerDanny Rawlins <monster.romster@gmail.com>2016-06-20 08:50:43 +1000
commit95c08601e07ee0811c70e83bb089cefad6ab956a (patch)
tree8ab70645c562cc0af30308215d2e5d90dade01dd /upower
parent0aea1ad8a4554303fa5490dc592468cfa94b8092 (diff)
downloadopt-95c08601e07ee0811c70e83bb089cefad6ab956a.tar.gz
opt-95c08601e07ee0811c70e83bb089cefad6ab956a.tar.xz
upower: 0.99.3 -> 0.99.4 removed dep polkit, new dep gobject-introspection
Diffstat (limited to 'upower')
-rw-r--r--upower/.footprint1
-rw-r--r--upower/.md5sum3
-rw-r--r--upower/Pkgfile9
-rw-r--r--upower/fix-critical-action.patch28
4 files changed, 37 insertions, 4 deletions
diff --git a/upower/.footprint b/upower/.footprint
index b8e22bafb..36d04a5ea 100644
--- a/upower/.footprint
+++ b/upower/.footprint
@@ -15,6 +15,7 @@ drwxr-xr-x root/root usr/etc/dbus-1/system.d/
-rw-r--r-- root/root usr/etc/dbus-1/system.d/org.freedesktop.UPower.conf
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/libupower-glib/
+-rw-r--r-- root/root usr/include/libupower-glib/up-autocleanups.h
-rw-r--r-- root/root usr/include/libupower-glib/up-client.h
-rw-r--r-- root/root usr/include/libupower-glib/up-device.h
-rw-r--r-- root/root usr/include/libupower-glib/up-history-item.h
diff --git a/upower/.md5sum b/upower/.md5sum
index 42fc9f399..4783c987b 100644
--- a/upower/.md5sum
+++ b/upower/.md5sum
@@ -1 +1,2 @@
-a9c95d0545bc23d784642c11e157cfbf upower-0.99.3.tar.xz
+15ae9162959c6221c6d8c72c486e1299 fix-critical-action.patch
+78800e1ac7f92b24aabdf433e38f75d2 upower-0.99.4.tar.xz
diff --git a/upower/Pkgfile b/upower/Pkgfile
index 43812d37d..4b43cf250 100644
--- a/upower/Pkgfile
+++ b/upower/Pkgfile
@@ -2,16 +2,19 @@
# URL: http://upower.freedesktop.org/
# Maintainer: Danny Rawlins, crux at romster dot me
# Packager: Alan Mizrahi, alan at mizrahi dot com dot ve
-# Depends on: dbus-glib gudev intltool libusb polkit
+# Depends on: dbus-glib gobject-introspection intltool libgudev libusb
name=upower
-version=0.99.3
+version=0.99.4
release=1
-source=(http://$name.freedesktop.org/releases/$name-$version.tar.xz)
+source=(http://$name.freedesktop.org/releases/$name-$version.tar.xz
+ fix-critical-action.patch)
build() {
cd $name-$version
+ patch -p 1 -i $SRC/fix-critical-action.patch
+
./configure \
--prefix=/usr \
--sysconfdir=/usr/etc \
diff --git a/upower/fix-critical-action.patch b/upower/fix-critical-action.patch
new file mode 100644
index 000000000..6afe9b7a9
--- /dev/null
+++ b/upower/fix-critical-action.patch
@@ -0,0 +1,28 @@
+From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 23 Feb 2016 09:51:07 +0100
+Subject: daemon: fix get_critical_action()
+
+Fix copy&paste error from e7e9156f that called the wrong _complete_ function
+for up_daemon_get_critical_action().
+
+https://bugs.freedesktop.org/show_bug.cgi?id=94262
+
+diff --git a/src/up-daemon.c b/src/up-daemon.c
+index be14cbe..e95f904 100644
+--- a/src/up-daemon.c
++++ b/src/up-daemon.c
+@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton,
+ GDBusMethodInvocation *invocation,
+ UpDaemon *daemon)
+ {
+- up_exported_daemon_complete_get_display_device (skeleton, invocation,
+- up_backend_get_critical_action (daemon->priv->backend));
++ up_exported_daemon_complete_get_critical_action (skeleton, invocation,
++ up_backend_get_critical_action (daemon->priv->backend));
+ return TRUE;
+ }
+
+--
+cgit v0.10.2
+

Generated by cgit