From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/upower/, sys-power/upower/files/
Date: Mon, 30 May 2022 17:41:25 +0000 (UTC) [thread overview]
Message-ID: <1653932418.7b62cbd27a588cff0eb0b200718f3f83d2679a3e.mattst88@gentoo> (raw)
commit: 7b62cbd27a588cff0eb0b200718f3f83d2679a3e
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 17:39:52 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May 30 17:40:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b62cbd2
sys-power/upower: Add patch to build without dev-python/python-dbusmock
Closes: https://bugs.gentoo.org/848525
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...18-meson-Allow-unittest-inspector-to-fail.patch | 31 ++++++++++++++++++++++
sys-power/upower/upower-0.99.18.ebuild | 4 +++
2 files changed, 35 insertions(+)
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}]"
next reply other threads:[~2022-05-30 17:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-30 17:41 Matt Turner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-02 18:50 [gentoo-commits] repo/gentoo:master commit in: sys-power/upower/, sys-power/upower/files/ Arthur Zamarin
2022-09-01 1:29 Matt Turner
2021-07-16 11:27 Andreas Sturmlechner
2021-07-16 11:27 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1653932418.7b62cbd27a588cff0eb0b200718f3f83d2679a3e.mattst88@gentoo \
--to=mattst88@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox