upower: update to 0.99.0.
This commit is contained in:
Duncaen
parent
968c1f0350
commit
5ae56516c7
|
|
@ -0,0 +1,34 @@
|
|||
From b9cff29978113aefe3ad18521f383f12ab099a34 Mon Sep 17 00:00:00 2001
|
||||
From: Cosimo Cecchi <cosimo@endlessm.com>
|
||||
Date: Tue, 25 Feb 2014 09:43:04 +0000
|
||||
Subject: Create the history directory at runtime
|
||||
|
||||
In addition to build time - this increases compatibilty with OSTree,
|
||||
which starts out with an empty /var.
|
||||
|
||||
Signed-off-by: Richard Hughes <richard@hughsie.com>
|
||||
---
|
||||
diff --git a/src/up-history.c b/src/up-history.c
|
||||
index f9d0fdf..795b093 100644
|
||||
--- a/src/up-history.c
|
||||
+++ b/src/up-history.c
|
||||
@@ -414,6 +414,7 @@ up_history_set_directory (UpHistory *history, const gchar *dir)
|
||||
{
|
||||
g_free (history->priv->dir);
|
||||
history->priv->dir = g_strdup (dir);
|
||||
+ g_mkdir_with_parents (dir, 0755);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -887,7 +888,8 @@ up_history_init (UpHistory *history)
|
||||
history->priv->data_time_full = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
|
||||
history->priv->data_time_empty = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
|
||||
history->priv->max_data_age = UP_HISTORY_DEFAULT_MAX_DATA_AGE;
|
||||
- history->priv->dir = g_build_filename (HISTORY_DIR, NULL);
|
||||
+
|
||||
+ up_history_set_directory (history, HISTORY_DIR);
|
||||
}
|
||||
|
||||
/**
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
From 0d64bbddaa0078ef148d609a3cfad854cf00d7de Mon Sep 17 00:00:00 2001
|
||||
From: Martin Pitt <martinpitt@gnome.org>
|
||||
Date: Fri, 08 Nov 2013 13:59:50 +0000
|
||||
Subject: lib: Fix segfault on getting property when daemon is not running
|
||||
|
||||
This fixes "upower --version" when the daemon is not running, and thus the
|
||||
client proxy is NULL.
|
||||
---
|
||||
diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c
|
||||
index 35d7b5d..17fb02d 100644
|
||||
--- a/libupower-glib/up-client.c
|
||||
+++ b/libupower-glib/up-client.c
|
||||
@@ -322,6 +322,9 @@ up_client_get_property (GObject *object,
|
||||
UpClient *client;
|
||||
client = UP_CLIENT (object);
|
||||
|
||||
+ if (client->priv->proxy == NULL)
|
||||
+ return;
|
||||
+
|
||||
switch (prop_id) {
|
||||
case PROP_DAEMON_VERSION:
|
||||
g_value_set_string (value, up_client_glue_get_daemon_version (client->priv->proxy));
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
From dbf7eb7e557674a9b888a088f1cae4f36b77e14d Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Wed, 23 Apr 2014 13:34:24 +0000
|
||||
Subject: daemon: Fix shutdown on boot on some machines
|
||||
|
||||
On the Lenovo A600 all-in-one, there's a HCI/HID dual-mode Broadcom
|
||||
device which will try to get the battery level of the supplied
|
||||
mouse and keyboard, but will usually fail to do so.
|
||||
|
||||
So we have a battery of type "battery" (it's not either a mouse or
|
||||
a keyboard, as it's supposed to handle both) but our display device
|
||||
battery code doesn't check whether those batteries are power supplies
|
||||
or not, using this "empty" (0% after the check timed out) battery in
|
||||
the shutdown policy.
|
||||
|
||||
Check better for power supply devices, not all the "battery" types
|
||||
are power supply batteries, they might be non-power supply ones
|
||||
from unknown device types.
|
||||
---
|
||||
diff --git a/src/up-daemon.c b/src/up-daemon.c
|
||||
index df0a7b7..ef90be4 100644
|
||||
--- a/src/up-daemon.c
|
||||
+++ b/src/up-daemon.c
|
||||
@@ -208,6 +208,7 @@ up_daemon_update_display_battery (UpDaemon *daemon)
|
||||
gdouble energy_rate = 0.0;
|
||||
gint64 time_to_empty = 0;
|
||||
gint64 time_to_full = 0;
|
||||
+ gboolean power_supply = FALSE;
|
||||
|
||||
device = g_ptr_array_index (array, i);
|
||||
g_object_get (device,
|
||||
@@ -219,6 +220,7 @@ up_daemon_update_display_battery (UpDaemon *daemon)
|
||||
"energy-rate", &energy_rate,
|
||||
"time-to-empty", &time_to_empty,
|
||||
"time-to-full", &time_to_full,
|
||||
+ "power-supply", &power_supply,
|
||||
NULL);
|
||||
|
||||
/* When we have a UPS, it's either a desktop, and
|
||||
@@ -236,7 +238,8 @@ up_daemon_update_display_battery (UpDaemon *daemon)
|
||||
is_present_total = TRUE;
|
||||
break;
|
||||
}
|
||||
- if (kind != UP_DEVICE_KIND_BATTERY)
|
||||
+ if (kind != UP_DEVICE_KIND_BATTERY ||
|
||||
+ power_supply == FALSE)
|
||||
continue;
|
||||
|
||||
/* If one battery is charging, then the composite is charging
|
||||
@@ -389,17 +392,21 @@ up_daemon_refresh_battery_devices (UpDaemon *daemon)
|
||||
guint i;
|
||||
GPtrArray *array;
|
||||
UpDevice *device;
|
||||
- UpDeviceKind type;
|
||||
|
||||
/* refresh all devices in array */
|
||||
array = up_device_list_get_array (daemon->priv->power_devices);
|
||||
for (i=0; i<array->len; i++) {
|
||||
+ UpDeviceKind type;
|
||||
+ gboolean power_supply;
|
||||
+
|
||||
device = (UpDevice *) g_ptr_array_index (array, i);
|
||||
/* only refresh battery devices */
|
||||
g_object_get (device,
|
||||
"type", &type,
|
||||
+ "power-supply", &power_supply,
|
||||
NULL);
|
||||
- if (type == UP_DEVICE_KIND_BATTERY)
|
||||
+ if (type == UP_DEVICE_KIND_BATTERY &&
|
||||
+ power_supply)
|
||||
up_device_refresh_internal (device);
|
||||
}
|
||||
g_ptr_array_unref (array);
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
From d650df8af80b734f6c44a0acb2080493330b8836 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Wed, 23 Apr 2014 13:20:37 +0000
|
||||
Subject: lib: Fix typo in g-i annotation
|
||||
|
||||
Missing colon.
|
||||
---
|
||||
diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c
|
||||
index 17fb02d..582fac9 100644
|
||||
--- a/libupower-glib/up-client.c
|
||||
+++ b/libupower-glib/up-client.c
|
||||
@@ -131,7 +131,7 @@ up_client_get_devices (UpClient *client)
|
||||
* @client: a #UpClient instance.
|
||||
*
|
||||
* Get the composite display device.
|
||||
- * Return value: (transfer full) a #UpClient object, or %NULL on error.
|
||||
+ * Return value: (transfer full): a #UpClient object, or %NULL on error.
|
||||
*
|
||||
* Since: 1.0
|
||||
**/
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
# Template file for 'upower'
|
||||
pkgname=upower
|
||||
version=0.99.0
|
||||
revision=5
|
||||
revision=6
|
||||
patch_args="-Np1"
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --with-backend=linux"
|
||||
hostmakedepends="pkg-config intltool libxslt docbook-xsl $(vopt_if gir gobject-introspection)"
|
||||
makedepends="libusb-devel libgudev-devel dbus-glib-devel libimobiledevice-devel>=1.2
|
||||
polkit-devel $(vopt_if systemd systemd-devel)"
|
||||
conf_files="/etc/UPower/UPower.conf"
|
||||
make_dirs="/var/lib/upower 0755 root root"
|
||||
short_desc="Abstraction for enumerating power devices"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-2"
|
||||
|
|
|
|||
Loading…
Reference in New Issue