diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2022-05-30 13:39:52 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2022-05-30 13:40:18 -0400 |
| commit | 7b62cbd27a588cff0eb0b200718f3f83d2679a3e (patch) | |
| tree | 3ce42a39e99f02f5689016af3a47262092ea86db | |
| parent | x11-apps/mesa-progs: Version bump to 8.5.0 (diff) | |
| download | gentoo-7b62cbd2.tar.gz gentoo-7b62cbd2.tar.bz2 gentoo-7b62cbd2.zip | |
sys-power/upower: Add patch to build without dev-python/python-dbusmock
Closes: https://bugs.gentoo.org/848525
Signed-off-by: Matt Turner <mattst88@gentoo.org>
| -rw-r--r-- | sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch | 31 | ||||
| -rw-r--r-- | sys-power/upower/upower-0.99.18.ebuild | 4 |
2 files changed, 35 insertions, 0 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 new file mode 100644 index 000000000000..feafa87e9705 --- /dev/null +++ b/sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch @@ -0,0 +1,31 @@ +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/upower-0.99.18.ebuild b/sys-power/upower/upower-0.99.18.ebuild index 8f405f8489e8..760dcd025ded 100644 --- a/sys-power/upower/upower-0.99.18.ebuild +++ b/sys-power/upower/upower-0.99.18.ebuild @@ -54,6 +54,10 @@ S="${WORKDIR}/${PN}-v${PV}" QA_MULTILIB_PATHS="usr/lib/${PN}/.*" +PATCHES=( + "${FILESDIR}"/${PV}-meson-Allow-unittest-inspector-to-fail.patch +) + python_check_deps() { python_has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]" && python_has_version -b "dev-python/python-dbusmock[${PYTHON_USEDEP}]" |