| 1 |
commit: 58996c17fc14caab6f1a678b5d326be0e76b94a4 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 31 05:05:49 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 31 05:05:49 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58996c17 |
| 7 |
|
| 8 |
net-misc/spice-gtk: fix finding newer pyparsing |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/820074 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/spice-gtk-0.39-fix-finding-pyparsing.patch | 13 +++++++++++++ |
| 14 |
net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild | 8 ++++++-- |
| 15 |
2 files changed, 19 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..9a3cdd09006 |
| 20 |
--- /dev/null |
| 21 |
+++ b/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch |
| 22 |
@@ -0,0 +1,13 @@ |
| 23 |
+https://gitlab.freedesktop.org/spice/spice-common/-/issues/5 |
| 24 |
+https://bugs.gentoo.org/820074 |
| 25 |
+--- a/subprojects/spice-common/meson.build |
| 26 |
++++ b/subprojects/spice-common/meson.build |
| 27 |
+@@ -132,7 +132,7 @@ if spice_common_generate_client_code or spice_common_generate_server_code |
| 28 |
+ if get_option('python-checks') |
| 29 |
+ foreach module : ['six', 'pyparsing'] |
| 30 |
+ message('Checking for python module @0@'.format(module)) |
| 31 |
+- cmd = run_command(python, '-m', module) |
| 32 |
++ cmd = run_command(python, '-c', 'import @0@'.format(module)) |
| 33 |
+ if cmd.returncode() != 0 |
| 34 |
+ error('Python module @0@ not found'.format(module)) |
| 35 |
+ endif |
| 36 |
|
| 37 |
diff --git a/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild |
| 38 |
index 7005e220e2e..08fdbf6d9fa 100644 |
| 39 |
--- a/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild |
| 40 |
+++ b/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild |
| 41 |
@@ -79,9 +79,13 @@ BDEPEND=" |
| 42 |
') |
| 43 |
" |
| 44 |
|
| 45 |
+PATCHES=( |
| 46 |
+ "${FILESDIR}"/${PN}-0.39-fix-finding-pyparsing.patch |
| 47 |
+) |
| 48 |
+ |
| 49 |
python_check_deps() { |
| 50 |
- has_version "dev-python/six[${PYTHON_USEDEP}]" && |
| 51 |
- has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" |
| 52 |
+ has_version -b "dev-python/six[${PYTHON_USEDEP}]" && |
| 53 |
+ has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" |
| 54 |
} |
| 55 |
|
| 56 |
src_prepare() { |
Archives