From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/, net-misc/spice-gtk/files/
Date: Sun, 31 Oct 2021 05:06:19 +0000 (UTC) [thread overview]
Message-ID: <1635656749.58996c17fc14caab6f1a678b5d326be0e76b94a4.sam@gentoo> (raw)
commit: 58996c17fc14caab6f1a678b5d326be0e76b94a4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 05:05:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 05:05:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58996c17
net-misc/spice-gtk: fix finding newer pyparsing
Closes: https://bugs.gentoo.org/820074
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/spice-gtk-0.39-fix-finding-pyparsing.patch | 13 +++++++++++++
net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild | 8 ++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch b/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch
new file mode 100644
index 00000000000..9a3cdd09006
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch
@@ -0,0 +1,13 @@
+https://gitlab.freedesktop.org/spice/spice-common/-/issues/5
+https://bugs.gentoo.org/820074
+--- a/subprojects/spice-common/meson.build
++++ b/subprojects/spice-common/meson.build
+@@ -132,7 +132,7 @@ if spice_common_generate_client_code or spice_common_generate_server_code
+ if get_option('python-checks')
+ foreach module : ['six', 'pyparsing']
+ message('Checking for python module @0@'.format(module))
+- cmd = run_command(python, '-m', module)
++ cmd = run_command(python, '-c', 'import @0@'.format(module))
+ if cmd.returncode() != 0
+ error('Python module @0@ not found'.format(module))
+ endif
diff --git a/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild
index 7005e220e2e..08fdbf6d9fa 100644
--- a/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild
@@ -79,9 +79,13 @@ BDEPEND="
')
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.39-fix-finding-pyparsing.patch
+)
+
python_check_deps() {
- has_version "dev-python/six[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
+ has_version -b "dev-python/six[${PYTHON_USEDEP}]" &&
+ has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
}
src_prepare() {
next reply other threads:[~2021-10-31 5:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-31 5:06 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-05 12:54 [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/, net-misc/spice-gtk/files/ Sam James
2023-06-27 2:24 Sam James
2021-12-25 0:02 Mike Gilbert
2020-04-18 18:56 Matthias Maier
2019-02-16 17:59 Aaron Bauman
2018-08-07 0:07 Virgil Dupras
2016-08-17 20:14 Ian Stakenvicius
2016-02-28 6:15 Matthias Maier
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=1635656749.58996c17fc14caab6f1a678b5d326be0e76b94a4.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