summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-power/upower/files')
-rw-r--r--sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch31
-rw-r--r--sys-power/upower/files/upower-0.99.12-fix-power_now-energy_rate-readings.patch43
-rw-r--r--sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch60
3 files changed, 0 insertions, 134 deletions
diff --git a/sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch b/sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch
deleted file mode 100644
index feafa87e9705..000000000000
--- a/sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Bug: https://bugs.gentoo.org/848525
-
-From aa646fa0ca3e164b09949c546796ec50433b748d Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <bberg@redhat.com>
-Date: Tue, 17 May 2022 16:02:49 +0200
-Subject: [PATCH] meson: Allow unittest inspector to fail
-
-It is only used to make the test output nicer, and it is completely fine
-to fail.
-
-Closes: #187
----
- src/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index b49d5f0..2e1edd1 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -124,7 +124,7 @@ if os_backend == 'linux' and gobject_introspection.found()
-
- python3 = find_program('python3')
- unittest_inspector = find_program('linux/unittest_inspector.py')
-- r = run_command(unittest_inspector, files('linux/integration-test.py'), check: true)
-+ r = run_command(unittest_inspector, files('linux/integration-test.py'), check: false)
- unit_tests = r.stdout().strip().split('\n')
-
- foreach ut: unit_tests
---
-2.35.1
-
diff --git a/sys-power/upower/files/upower-0.99.12-fix-power_now-energy_rate-readings.patch b/sys-power/upower/files/upower-0.99.12-fix-power_now-energy_rate-readings.patch
deleted file mode 100644
index c3dd864a6b1d..000000000000
--- a/sys-power/upower/files/upower-0.99.12-fix-power_now-energy_rate-readings.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2949136b152e94aa3b57da5130bcb9022724debe Mon Sep 17 00:00:00 2001
-From: Philipp Zabel <p.zabel@pengutronix.de>
-Date: Thu, 17 Jun 2021 18:14:53 +0200
-Subject: [PATCH] linux: Fix < 0.01 W energy-rate readings from power_now sysfs
- property
-
-Currently, if a power supplies' power_now sysfs file reports discharge
-rates < 0.01 W, the code will try to calculate the discharge rate from
-the legacy sysfs files. On new kernels where those don't exist, this
-produces wrong results.
-
-For example, on a dual-battery Thinkpad T450s, while the external
-battery is discharging, the internal battery reports power_now = 0,
-but the corresponding upower energy-rate field incorrectly reads
-about 2.3 W.
-
-This patch fixes the issue by falling back to the legacy code only if
-the legacy current_now sysfs file exists.
-
-Closes: #7, #44
----
- src/linux/up-device-supply.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c
-index 3ebbd88..4236ce4 100644
---- a/src/linux/up-device-supply.c
-+++ b/src/linux/up-device-supply.c
-@@ -682,8 +682,9 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply,
- state = up_device_supply_get_state (native);
-
- /* this is the new value in uW */
-- energy_rate = fabs (g_udev_device_get_sysfs_attr_as_double_uncached (native, "power_now") / 1000000.0);
-- if (energy_rate < 0.01) {
-+ if (g_udev_device_has_sysfs_attr (native, "power_now")) {
-+ energy_rate = fabs (g_udev_device_get_sysfs_attr_as_double_uncached (native, "power_now") / 1000000.0);
-+ } else {
- gdouble charge_full;
-
- /* convert charge to energy */
---
-GitLab
-
diff --git a/sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch b/sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch
deleted file mode 100644
index ead41d2e64c8..000000000000
--- a/sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://gitlab.freedesktop.org/upower/upower/-/merge_requests/123
-
-From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 20 Mar 2022 15:32:55 -0700
-Subject: [PATCH] meson: Don't search for gtk-doc if disabled
-
----
- doc/meson.build | 38 ++++++++++++++++++++------------------
- 1 file changed, 20 insertions(+), 18 deletions(-)
-
-diff --git a/doc/meson.build b/doc/meson.build
-index dc93a16..5fc253c 100644
---- a/doc/meson.build
-+++ b/doc/meson.build
-@@ -27,21 +27,23 @@ version_xml = configure_file(
- input: 'version.xml.in',
- configuration: cdata)
-
--gnome.gtkdoc('UPower',
-- main_xml: 'upower-docs.xml',
-- src_dir: meson.source_root() / 'libupower-glib',
-- dependencies: [ libupower_glib_dep ],
-- scan_args: ['--rebuild-types', '--rebuild-sections'],
-- content_files: [
-- version_xml,
-- ifaces_refs,
-- 'man/UPower.xml',
-- 'man/upowerd.xml',
-- 'man/upower.xml',
-- '../COPYING',
-- ],
-- ignore_headers: [
-- 'config.h',
-- ],
-- install: get_option('gtk-doc')
--)
-+if get_option('gtk-doc')
-+ gnome.gtkdoc('UPower',
-+ main_xml: 'upower-docs.xml',
-+ src_dir: meson.source_root() / 'libupower-glib',
-+ dependencies: [ libupower_glib_dep ],
-+ scan_args: ['--rebuild-types', '--rebuild-sections'],
-+ content_files: [
-+ version_xml,
-+ ifaces_refs,
-+ 'man/UPower.xml',
-+ 'man/upowerd.xml',
-+ 'man/upower.xml',
-+ '../COPYING',
-+ ],
-+ ignore_headers: [
-+ 'config.h',
-+ ],
-+ install: true
-+ )
-+endif
---
-2.34.1
-