diff options
| -rw-r--r-- | sys-power/upower/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-power/upower/Manifest | 21 | ||||
| -rw-r--r-- | sys-power/upower/files/upower-0.9.23-clamp_percentage_for_overfull_batt.patch | 72 | ||||
| -rw-r--r-- | sys-power/upower/files/upower-0.9.23-create-dir-runtime.patch | 34 | ||||
| -rw-r--r-- | sys-power/upower/files/upower-0.9.23-fix-segfault.patch | 24 | ||||
| -rw-r--r-- | sys-power/upower/upower-0.9.23-r3.ebuild | 90 |
6 files changed, 15 insertions, 234 deletions
diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog index 2e2f89b0fcf2..4436c949cdb5 100644 --- a/sys-power/upower/ChangeLog +++ b/sys-power/upower/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-power/upower # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.164 2014/09/19 16:38:22 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.165 2014/09/19 17:06:03 ssuominen Exp $ + + 19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> + -files/upower-0.9.23-clamp_percentage_for_overfull_batt.patch, + -files/upower-0.9.23-create-dir-runtime.patch, + -files/upower-0.9.23-fix-segfault.patch, -upower-0.9.23-r3.ebuild: + old 19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> upower-0.99.1.ebuild: amd64/arm/ppc/ppc64/x86 stable wrt #523044 diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest index e2e0cbaf5356..aeeb01d044fc 100644 --- a/sys-power/upower/Manifest +++ b/sys-power/upower/Manifest @@ -1,29 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX upower-0.9.23-clamp_percentage_for_overfull_batt.patch 3396 SHA256 16c43fbd1a31b88b115392ecb29c449bebe0f8e70530fb965dca49cf0925b131 SHA512 6bb869f1e2c5d93983b20bb65f5fc0803709b690f70b17a78204c98afca41a97b60b1c3cf8f564c931f189bd2db1dab00cd42121f5f022b5e8f0f044faf836d7 WHIRLPOOL 2d0dcf6c5d1246a940db43a38d7c5f429331dc69bd3e40fcac5679f3e2663c5ef1927e9e29fc0fabcf7e21e7693486db0f7b703e8dd36eba4be33d8366861074 -AUX upower-0.9.23-create-dir-runtime.patch 1164 SHA256 6324c148d436e3f898b73b445411f29a7527c65ffedb574ef658c1eaaa1aa4de SHA512 1aaec53df73aa50fabffaddd380800f7ed78caddc02b16834831aa1faa09c795e0def04493f64d852a9b07b9ef4007352e111c5d7cdc1f1b2ed8043c445751f2 WHIRLPOOL 4347f169597c8e144081673d038809a4f0525410aef7e3ff3b713f22dd28e1d7f4bcc69413be2d3c87e7e228dc8da6cfab7b6a3e63feeafafb6e8dc5d4d3a018 -AUX upower-0.9.23-fix-segfault.patch 829 SHA256 c80d1510b3e3d0579ddbec328d2800ab7e112378f9a8ff9ef152d72de50a45c3 SHA512 31a6b5414ddd17cbbcf318da98907d745910e7632ea9a4d4d5c02eaaae87857b5bb88f9ab2f336f7b24637727005fb839f8c9564b82e56ae0065d57b1ce19ad2 WHIRLPOOL 4286fadfbb45b89891ca4aed49b11cde70afa357101f4b9b150d9f68e548af28436fa25a9d8143f7d90daaff0ee22238dd017f10e1e34e58a226553a84724682 AUX upower-0.99.0-create-dir-runtime.patch 1164 SHA256 6324c148d436e3f898b73b445411f29a7527c65ffedb574ef658c1eaaa1aa4de SHA512 1aaec53df73aa50fabffaddd380800f7ed78caddc02b16834831aa1faa09c795e0def04493f64d852a9b07b9ef4007352e111c5d7cdc1f1b2ed8043c445751f2 WHIRLPOOL 4347f169597c8e144081673d038809a4f0525410aef7e3ff3b713f22dd28e1d7f4bcc69413be2d3c87e7e228dc8da6cfab7b6a3e63feeafafb6e8dc5d4d3a018 AUX upower-0.99.0-fix-segfault.patch 829 SHA256 c80d1510b3e3d0579ddbec328d2800ab7e112378f9a8ff9ef152d72de50a45c3 SHA512 31a6b5414ddd17cbbcf318da98907d745910e7632ea9a4d4d5c02eaaae87857b5bb88f9ab2f336f7b24637727005fb839f8c9564b82e56ae0065d57b1ce19ad2 WHIRLPOOL 4286fadfbb45b89891ca4aed49b11cde70afa357101f4b9b150d9f68e548af28436fa25a9d8143f7d90daaff0ee22238dd017f10e1e34e58a226553a84724682 AUX upower-0.99.0-fix-shutdown-on-boot.patch 2583 SHA256 5af2d8aa09f64988eade79ac30d20236076a00b4878c77c6fbca5eefa78e21c6 SHA512 b422bc4bc4258532d817fad250c50101886cd4542c42c4617ddd846db9a908ac8da8a8e977a9ea6d20421db768097735a13bcc1c3282df6cc1da88390ffc3ecd WHIRLPOOL 29ac060035968328263b59139260c21e52a5a4620bb784fb437ee27ac04a91a9a94344dc700a21b1a08150ed727c2aa9c5365d2db72d6e6febc540f551b46dc5 AUX upower-0.99.0-fix-typing-error.patch 711 SHA256 9eca510c8d9e8daba99815dfc1fe853270e55d22ab9657d6f458ec492b9a880b SHA512 b40bef2c98af8ae0fe571fb8f9be43602b0309db68fedafaefaf22682d344c640c5d7e6a173a5bc889e5fe8d6a647cbc07b767ef1adc0570ee45d03d94a52370 WHIRLPOOL cca6101b3d9abca0f3085f49fc5c91a862f1c1b29966d0a168a257a15a67b7c8d54df27501118b476a77d3c1742962fc2053d007ea3a66572721a6e027669de8 -DIST upower-0.9.23.tar.xz 425804 SHA256 433252b0a8e9ab4bed7e17ee3ee5b7cef6d527b1f5401ee32212d82a9682981b SHA512 526ef95e43faf61744ba2bbf80bae23bc5c8672130563a87a7f18f00d85b16e2069814ad70dd66ce6ce698037b522d78579cc2135e2af0c2a636230cfa662c6d WHIRLPOOL 1599739198767ea6c70e133d50302a62a5b0b07c3786057b75636167c80b02d8e0ab6cc4781ac08994b249ffb57875bf186923d441e0b10e73c238b6be5b3538 DIST upower-0.99.0.tar.xz 429076 SHA256 5f354b9949108cb21180224ef3dba33b41c9221a79f71a8f76c47f56246a39a1 SHA512 efb9544730a1baa8abdc5af4b5320ec1fa7518bdaa9e56129eef4aa4caf8167c7bf72f7bc0e71ca7b6d127a1464462667b86039a4c5248c8c75c66334e038ea7 WHIRLPOOL 15634811ae267a9811933c75af25321e885d9646782c21cac237d20bea4a673930af3bf9a1873d5295e31676714c64ef6fb187c780b903e872e4e6677b615e20 DIST upower-0.99.1.tar.xz 428072 SHA256 8c4de2101958ef2a0522e1bd1893caf9678cd3de45410e246fce2b4635315600 SHA512 3a413234226a957e8dcb60a1b8a73a4d1b9eb34705b01b404580a34c2a9e61a30b20e8ccefe72dc3457ea305beb910fc02ce76469982c95cbf0ed6bc785b7783 WHIRLPOOL d526c9a23e225287738c19c5f8cd0ab2fc07e780d4f1bf5014da2d026c22af3801b500d0f8898a901fbfbbf8b5e93a90392531f66747c07280393a7e61370b66 -EBUILD upower-0.9.23-r3.ebuild 2127 SHA256 4b48f467fbd43e2b2adae3818c7fd09b6f47babdd365f1b54b60d351af171937 SHA512 897ca69f85c6275f1a9c9bd5425703fa9d9edaeb693671dc4d63acebcc9a9036ff1cdcb50e31bab02edafb815ebfbe2e117288fb97273b590b0ac0fd03b11bd2 WHIRLPOOL 8e343024dcfd9e10b6da1d1b5b53638a241c5d6218ca04a05601267dc0dcd8389622828a5a64ce776ad2e0051f3e29617f014691a5c6319cc32ad08b2390f8df EBUILD upower-0.99.0-r1.ebuild 2178 SHA256 014379d9e3c5bd415147e37371629ae0f18392b7ed1b16d3b5bcbeb543e42d40 SHA512 221eb19ae394c3ef27bf53895bd97dade15ccfe15076eaac72486b2a6db849b555ff3ec7ac61a71fe97e0b13f61bdcf241cb3f067062bbf353384887bf26492f WHIRLPOOL 170628c391ac3e9926d86e5e9f667067df588e1481eecb97a5c5dc6288b612c70797d7ebef52899410945f0f2b2a54635a40eeed88c7edef081db2ef73e7394d EBUILD upower-0.99.1.ebuild 1964 SHA256 a23ed43f48ea523b27eabb215665f69804d8c0cae6dcb1f63fe8a7efe8dc2375 SHA512 7d287f687af5fbd344cfaed052b6ac14f98e63d0441575510f901ea46259bb14e05b58530e0acd9e2397f6330f64828b4435488244efb65dd2beb260f0c2c581 WHIRLPOOL 2e21be0ff6da805d8a474b6ce044012bfcc5c8bad3ec9df4effaa2dc6be6014003892e1b137ec85a76cfd1d2dab8fad732986743b958bb7db452856806b44bd9 -MISC ChangeLog 21806 SHA256 e93e58878bda4b35c46319cdf12c30fac6d9b92f4fda4fdbcf35b038dc3d448d SHA512 213a23a0739b9f58fd4a56a72365dd7ebd912915e9e565b3124f7eb0b4a5aac238fb9cc7c79ad052b628144d689e94db0eb038e9fd5e506ea4b18a7aa5406f3b WHIRLPOOL dc2e5969b21d64dff003f094c5c7ed67f4bb9da0d8ab2d5c7b9eccc98f03781e80d757093c46d556974f5c839476d98649972c15ea81eb80382e1a3205f85dad +MISC ChangeLog 22050 SHA256 33742fa42b993a4bc743dff4098416d1f6172e0cbb1a841718c5341d8965f838 SHA512 35074ea672ad8652bc73b07986a72b96c289a86c9d2b8229b8b4911f2143b0b1498373f8d364ba9ceaeb717d12561d8b0cac6457134560366b0e9ab0b4269e42 WHIRLPOOL 2b14bf6c95db5f6cf1ebd39340af5aa686303c182df4f0aa150a8193aeaba5e951e0778e6385cfaf1d3e2f5f052e4c2dedc9d9fed16e82299cda1c9eb5d1c3cf MISC metadata.xml 239 SHA256 5d929c534d63615358eacbd035a386109d5deebdc7bb562511b4a6338ee2bbb8 SHA512 ab6b74388bf69a67b0d1f4283475f97eb5a731f31b5c9db4ee50b819a846c77d4ef09f63856e31a68b0bfdf18ee3baa6c76720d4345ccadf154385caaf1033bb WHIRLPOOL bcac6415c046557e53bf04579e077fed4d694dee8f7c0faeecf15f3f036137a2c9f0eaa0c492cecef23a45bd5af2c45542acd26641209d3c9be3108bf1ff09a7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUHFv6AAoJEEdUh39IaPFNYPAH/RjFwh4JI+xbcgrpAW+eed1Q -R3e4+kUL/4Uiozm4Drc+CpoVi/wrl348gwM7xdD6aLYmmKdN4/aE1NrxjPYOIw2+ -Pv9s5Zb4Po1f8f+mplp88B8zSmEys23PDkGxxtk+h4yPo4b4ZIdCjUHkuX9ZJ0KA -koCpsqZS2GT1YHXBZNd2ROkMpMKsZa9u5sforzuCAR+rYvLanI5saeYZeS/ukA22 -kJJjrCxGEvzhP2fS1v+TlNvWsEKwyan5q31aDWrC9Q4kHmqNz2g5ipCx7gLY0yYT -TQJw5zTGJk69kDuLurX3c5q/FCtaHrEPw6xHV2ciQXq4CX9Ol76Fn94fiNmJbZ8= -=BBhf +iQEcBAEBCAAGBQJUHGJ2AAoJEEdUh39IaPFNHlIH/1HcuPOiUiPmWvPwSQnNqsWh +qAwp5fIUd0O5b1fgofsqzCoUq7GeC5xpYvX9sEvMoNRpxCXGJHetV8NBuIL+JqhL +FYhOpfD6SHMtqhqQ6FtgKrPJ1YX++GS+U1z/Te8T8IM0jTw9cHsB812STUVM7m50 +gLY6nmVZ0Rsss3pKRNyWKzD7n0F/Kp2dmNEO25ESyKHueBHfXpuGK9Mgv89fUnl3 +zaheWC3njHy2SXq4kijzUR723Zwqn7LHRVHf1dB8LctfSDL5sAuD/NvAPP/h3et5 +VtYhuDdPJt8zPOWOz0RzCmNBnkkQ6hr/RGVNrpBs/etjxAq+qlw1jX7fHkEvytI= +=km1k -----END PGP SIGNATURE----- diff --git a/sys-power/upower/files/upower-0.9.23-clamp_percentage_for_overfull_batt.patch b/sys-power/upower/files/upower-0.9.23-clamp_percentage_for_overfull_batt.patch deleted file mode 100644 index 6e643c42de5e..000000000000 --- a/sys-power/upower/files/upower-0.9.23-clamp_percentage_for_overfull_batt.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b8fe9902f3c6c50ca6a23e24fcea99582beebc65 Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martinpitt@gnome.org> -Date: Tue, 22 Oct 2013 08:02:51 +0000 -Subject: linux: Clamp percentage for overfull batteries - -Some batteries report energy > energy_full and a percentage ("capacity" -attribute) > 100%. Clamp these within 0 and 100% for both plausibility as well -as to avoid setting an out-of-range property which would then become 0%. - -https://launchpad.net/bugs/1240673 ---- -diff --git a/src/linux/integration-test b/src/linux/integration-test -index 8489bf3..4be1922 100755 ---- a/src/linux/integration-test -+++ b/src/linux/integration-test -@@ -442,6 +442,39 @@ class Tests(unittest.TestCase): - self.assertEqual(self.get_dbus_property('OnLowBattery'), False) - self.stop_daemon() - -+ def test_battery_overfull(self): -+ '''battery which reports a > 100% percentage for a full battery''' -+ -+ self.testbed.add_device('power_supply', 'BAT0', None, -+ ['type', 'Battery', -+ 'present', '1', -+ 'status', 'Full', -+ 'current_now', '1000', -+ 'charge_now', '11000000', -+ 'charge_full', '10000000', -+ 'charge_full_design', '11000000', -+ 'capacity', '110', -+ 'voltage_now', '12000000'], []) -+ -+ self.start_daemon() -+ devs = self.proxy.EnumerateDevices() -+ self.assertEqual(len(devs), 1) -+ bat0_up = devs[0] -+ -+ # should clamp percentage -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 100.0) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'IsPresent'), True) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'State'), -+ UP_DEVICE_STATE_FULLY_CHARGED) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Energy'), 132.0) -+ # should adjust EnergyFull to reality, not what the battery claims -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFull'), 132.0) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 132.0) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'PowerSupply'), True) -+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Type'), 2) -+ self.stop_daemon() -+ - def test_battery_temperature(self): - '''battery which reports temperature''' - -diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c -index 8020277..b953d65 100644 ---- a/src/linux/up-device-supply.c -+++ b/src/linux/up-device-supply.c -@@ -708,6 +708,10 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply) - /* get a precise percentage */ - if (sysfs_file_exists (native_path, "capacity")) { - percentage = sysfs_get_double (native_path, "capacity"); -+ if (percentage < 0.0f) -+ percentage = 0.0f; -+ if (percentage > 100.0f) -+ percentage = 100.0f; - /* for devices which provide capacity, but not {energy,charge}_now */ - if (energy < 0.1f && energy_full > 0.0f) - energy = energy_full * percentage / 100; --- -cgit v0.9.0.2-2-gbebe diff --git a/sys-power/upower/files/upower-0.9.23-create-dir-runtime.patch b/sys-power/upower/files/upower-0.9.23-create-dir-runtime.patch deleted file mode 100644 index 34340d44ec30..000000000000 --- a/sys-power/upower/files/upower-0.9.23-create-dir-runtime.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 diff --git a/sys-power/upower/files/upower-0.9.23-fix-segfault.patch b/sys-power/upower/files/upower-0.9.23-fix-segfault.patch deleted file mode 100644 index 3e8976320777..000000000000 --- a/sys-power/upower/files/upower-0.9.23-fix-segfault.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 diff --git a/sys-power/upower/upower-0.9.23-r3.ebuild b/sys-power/upower/upower-0.9.23-r3.ebuild deleted file mode 100644 index 078e66684721..000000000000 --- a/sys-power/upower/upower-0.9.23-r3.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.23-r3.ebuild,v 1.3 2014/06/20 06:25:23 ssuominen Exp $ - -EAPI=5 -inherit eutils systemd - -DESCRIPTION="For hibernate and suspend, use sys-apps/systemd or sys-power/upower-pm-utils" -HOMEPAGE="http://upower.freedesktop.org/" -SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" -IUSE="doc +introspection ios kernel_FreeBSD kernel_linux" - -COMMON_DEPEND=">=dev-libs/dbus-glib-0.100 - >=dev-libs/glib-2.22 - sys-apps/dbus - >=sys-auth/polkit-0.110 - introspection? ( dev-libs/gobject-introspection ) - kernel_linux? ( - virtual/libusb:1 - virtual/libgudev:= - virtual/udev - ios? ( - >=app-pda/libimobiledevice-1:= - >=app-pda/libplist-1:= - ) - )" -RDEPEND="${COMMON_DEPEND} - kernel_linux? ( - app-shells/bash - )" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - dev-util/intltool - virtual/pkgconfig - doc? ( - dev-util/gtk-doc - app-text/docbook-xml-dtd:4.1.2 - )" - -QA_MULTILIB_PATHS="usr/lib/${PN}/.*" - -DOCS="AUTHORS HACKING NEWS README" - -src_prepare() { - sed -i -e '/DISABLE_DEPRECATED/d' configure || die - - epatch \ - "${FILESDIR}"/${P}-create-dir-runtime.patch \ - "${FILESDIR}"/${P}-fix-segfault.patch \ - "${FILESDIR}"/${P}-clamp_percentage_for_overfull_batt.patch -} - -src_configure() { - local backend myconf - - if use kernel_linux; then - backend=linux - myconf="--disable-deprecated" - elif use kernel_FreeBSD; then - backend=freebsd - else - backend=dummy - fi - - econf \ - --libexecdir="${EPREFIX}"/usr/lib/${PN} \ - --localstatedir="${EPREFIX}"/var \ - $(use_enable introspection) \ - --disable-static \ - ${myconf} \ - --enable-man-pages \ - $(use_enable doc gtk-doc) \ - --disable-tests \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --with-backend=${backend} \ - $(use_with ios idevice) \ - "$(systemd_with_utildir)" \ - "$(systemd_with_unitdir)" -} - -src_install() { - default - keepdir /var/lib/upower #383091 - prune_libtool_files -} |