From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/, app-emulation/qemu-guest-agent/files/
Date: Fri, 2 Feb 2024 08:02:19 +0000 (UTC) [thread overview]
Message-ID: <1706860912.5d1b5f7e2e1098e8eb7ee935baa9fe90e3d129ba.sam@gentoo> (raw)
commit: 5d1b5f7e2e1098e8eb7ee935baa9fe90e3d129ba
Author: V3n3RiX <venerix <AT> koprulu <DOT> sector>
AuthorDate: Fri Feb 2 07:51:26 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 2 08:01:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1b5f7e
app-emulation/qemu-guest-agent: find sphinx
Closes: https://bugs.gentoo.org/923573
Signed-off-by: Ghiunhan Mamut <venerix <AT> redcorelinux.org>
Closes: https://github.com/gentoo/gentoo/pull/35143
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../qemu-guest-agent/files/qemu-8.1.0-find-sphinx.patch | 10 ++++++++++
app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild | 1 +
2 files changed, 11 insertions(+)
diff --git a/app-emulation/qemu-guest-agent/files/qemu-8.1.0-find-sphinx.patch b/app-emulation/qemu-guest-agent/files/qemu-8.1.0-find-sphinx.patch
new file mode 100644
index 000000000000..b6ef6214af55
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-8.1.0-find-sphinx.patch
@@ -0,0 +1,10 @@
+This gets confused by python-any-r1 and tries to find sphinx-build in ${T}.
+--- a/docs/meson.build
++++ b/docs/meson.build
+@@ -1,5 +1,4 @@
+-sphinx_build = find_program(fs.parent(python.full_path()) / 'sphinx-build',
+- required: get_option('docs'))
++sphinx_build = find_program('sphinx-build', required: get_option('docs'))
+
+ # Check if tools are available to build documentation.
+ build_docs = false
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
index ab7a0c145b03..46f8a50f74d1 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
@@ -27,6 +27,7 @@ BDEPEND="${PYTHON_DEPS}
S="${WORKDIR}/${MY_P}"
PATCHES=(
+ "${FILESDIR}"/qemu-8.1.0-find-sphinx.patch
)
src_configure() {
next reply other threads:[~2024-02-02 8:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-02 8:02 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-19 14:41 [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/, app-emulation/qemu-guest-agent/files/ John Helmert III
2020-04-18 19:29 Matthias Maier
2016-04-23 17:20 Mike Frysinger
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=1706860912.5d1b5f7e2e1098e8eb7ee935baa9fe90e3d129ba.sam@gentoo \
--to=sam@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