summaryrefslogtreecommitdiffstats
path: root/source/a/upower/patches/linux-Clamp-percentage-for-overfull-batteries.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-11-27 06:21:11 +0000
committer Eric Hameleers <alien@slackware.com>2020-11-27 17:59:51 +0100
commitdbf5c1c4390d04802e7b37be3d2012bb8eae6675 (patch)
treea260819b01cff1e22c878b55baf3b971bea14357 /source/a/upower/patches/linux-Clamp-percentage-for-overfull-batteries.patch
parent042736eeb574486635e076ffcc36593ac09c72ba (diff)
downloadcurrent-dbf5c1c4390d04802e7b37be3d2012bb8eae6675.tar.gz
current-dbf5c1c4390d04802e7b37be3d2012bb8eae6675.tar.xz
Fri Nov 27 06:21:11 UTC 202020201127062111
Moved a few dependencies from vtown into the main tree, updated much of the GNOME stack, and Xfce 4.14 appears in vtown! Thanks much to Robby Workman. Hope everyone had a good day. Enjoy! :-) a/upower-0.99.11-x86_64-1.txz: Upgraded. d/sassc-3.6.1-x86_64-1.txz: Added. d/vala-0.50.2-x86_64-1.txz: Upgraded. l/at-spi2-atk-2.38.0-x86_64-1.txz: Upgraded. l/at-spi2-core-2.38.0-x86_64-1.txz: Upgraded. l/brotli-1.0.9-x86_64-3.txz: Rebuilt. Get rid of unrecognized -R in the pkg-config files. l/dconf-0.38.0-x86_64-1.txz: Upgraded. l/dconf-editor-3.38.2-x86_64-1.txz: Upgraded. l/gcr-3.38.0-x86_64-1.txz: Upgraded. l/gdk-pixbuf2-2.42.0-x86_64-1.txz: Upgraded. l/gdk-pixbuf2-xlib-2.40.2-x86_64-1.txz: Added. l/gjs-1.66.1-x86_64-1.txz: Added. l/glade-3.38.2-x86_64-1.txz: Added. l/glib-networking-2.66.0-x86_64-1.txz: Upgraded. l/glib2-2.66.3-x86_64-1.txz: Upgraded. l/gobject-introspection-1.66.1-x86_64-1.txz: Upgraded. l/gtksourceview3-3.24.11-x86_64-1.txz: Added. l/gvfs-1.46.1-x86_64-1.txz: Upgraded. l/json-glib-1.6.0-x86_64-1.txz: Upgraded. l/librsvg-2.50.2-x86_64-1.txz: Upgraded. l/libsass-3.6.4-x86_64-1.txz: Added. l/libsoup-2.72.0-x86_64-1.txz: Upgraded. l/libwnck3-3.36.0-x86_64-1.txz: Added. l/pango-1.48.0-x86_64-1.txz: Upgraded. l/pygobject3-3.38.0-x86_64-1.txz: Upgraded. l/vte-0.62.1-x86_64-1.txz: Upgraded. testing/packages/vtown/deps/libsass-3.6.4-x86_64-1_vtown_1.txz: Removed. testing/packages/vtown/deps/sassc-3.6.1-x86_64-1_vtown_1.txz: Removed. testing/packages/vtown/deps/upower-0.99.11-x86_64-1_vtown_1.txz: Removed. testing/packages/vtown/xfce/Greybird-3.22.12-noarch-1_vtown_1.txz: Added. testing/packages/vtown/xfce/elementary-xfce-0.15.1-x86_64-1_vtown_1.txz: Added. testing/packages/vtown/xfce/exo-0.12.11-x86_64-2_vtown_1.txz: Rebuilt. testing/packages/vtown/xfce/garcon-0.6.4-x86_64-2_vtown_1.txz: Rebuilt. testing/packages/vtown/xfce/libxfce4ui-4.14.1-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/libxfce4util-4.14.0-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/mousepad-0.4.2-x86_64-1_vtown_1.txz: Added. testing/packages/vtown/xfce/thunar-1.8.16-x86_64-2_vtown_1.txz: Rebuilt. testing/packages/vtown/xfce/thunar-volman-0.9.5-x86_64-2_vtown_1.txz: Rebuilt. testing/packages/vtown/xfce/tumbler-0.2.9-x86_64-2_vtown_1.txz: Rebuilt. testing/packages/vtown/xfce/xfce4-appfinder-4.14.0-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-clipman-plugin-1.6.1-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-dev-tools-4.14.0-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-notifyd-0.6.2-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-panel-4.14.4-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-panel-profiles-1.0.10-x86_64-1_vtown_1.txz: Added. testing/packages/vtown/xfce/xfce4-power-manager-1.6.6-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-pulseaudio-plugin-0.4.3-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-screensaver-0.1.11-x86_64-1_vtown_1.txz: Added. testing/packages/vtown/xfce/xfce4-screenshooter-1.9.7-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-session-4.14.2-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-settings-4.14.3-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-systemload-plugin-1.2.3-x86_64-2_vtown_1.txz: Rebuilt. testing/packages/vtown/xfce/xfce4-taskmanager-1.2.3-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-terminal-0.8.9.2-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-weather-plugin-0.10.2-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfce4-whiskermenu-plugin-2.4.6-x86_64-1_vtown_1.txz: Added. testing/packages/vtown/xfce/xfconf-4.14.4-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfdesktop-4.14.3-x86_64-1_vtown_1.txz: Upgraded. testing/packages/vtown/xfce/xfwm4-4.14.6-x86_64-1_vtown_1.txz: Upgraded.
Diffstat (limited to 'source/a/upower/patches/linux-Clamp-percentage-for-overfull-batteries.patch')
-rw-r--r--source/a/upower/patches/linux-Clamp-percentage-for-overfull-batteries.patch77
1 files changed, 0 insertions, 77 deletions
diff --git a/source/a/upower/patches/linux-Clamp-percentage-for-overfull-batteries.patch b/source/a/upower/patches/linux-Clamp-percentage-for-overfull-batteries.patch
deleted file mode 100644
index bb97ca782..000000000
--- a/source/a/upower/patches/linux-Clamp-percentage-for-overfull-batteries.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From b8fe9902f3c6c50ca6a23e24fcea99582beebc65 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martinpitt@gnome.org>
-Date: Tue, 22 Oct 2013 10:02:51 +0200
-Subject: [PATCH 2/3] 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
----
- src/linux/integration-test | 33 +++++++++++++++++++++++++++++++++
- src/linux/up-device-supply.c | 4 ++++
- 2 files changed, 37 insertions(+)
-
-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;
---
-2.6.4
-