1 |
commit: 0ce4e96a0ffee289aacf43385a070a67f0e8a024 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 1 12:34:00 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 1 12:42:43 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ce4e96a |
7 |
|
8 |
x11-libs/vte: use ${EPYTHON}, not python3 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/787290 |
11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
12 |
|
13 |
...python-explicitly-to-honor-downstream-pyt.patch | 48 ++++++++++++++++++++++ |
14 |
x11-libs/vte/vte-0.64.1.ebuild | 8 +++- |
15 |
2 files changed, 55 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch b/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..79171d29dea |
20 |
--- /dev/null |
21 |
+++ b/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch |
22 |
@@ -0,0 +1,48 @@ |
23 |
+https://gitlab.gnome.org/GNOME/vte/-/issues/350 |
24 |
+ |
25 |
+From d459d32126119c8d78f8239b8b857a255e6005d7 Mon Sep 17 00:00:00 2001 |
26 |
+From: Matt Turner <mattst88@×××××.com> |
27 |
+Date: Sat, 1 May 2021 08:31:45 -0400 |
28 |
+Subject: [PATCH] meson: Find python explicitly to honor downstream python |
29 |
+ choice |
30 |
+ |
31 |
+--- |
32 |
+ meson.build | 1 + |
33 |
+ src/meson.build | 2 ++ |
34 |
+ 2 files changed, 3 insertions(+) |
35 |
+ |
36 |
+diff --git a/meson.build b/meson.build |
37 |
+index 4f5a7c57..6404802f 100644 |
38 |
+--- a/meson.build |
39 |
++++ b/meson.build |
40 |
+@@ -461,6 +461,7 @@ pango_dep = dependency('pango', version: '>=' + pango_req_version) |
41 |
+ pcre2_dep = dependency('libpcre2-8', version: '>=' + pcre2_req_version) |
42 |
+ pthreads_dep = dependency('threads') |
43 |
+ zlib_dep = dependency('zlib') |
44 |
++python = import('python').find_installation('python3') |
45 |
+ |
46 |
+ if get_option('fribidi') |
47 |
+ fribidi_dep = dependency('fribidi', version: '>=' + fribidi_req_version) |
48 |
+diff --git a/src/meson.build b/src/meson.build |
49 |
+index a1440da5..4ac6a7f2 100644 |
50 |
+--- a/src/meson.build |
51 |
++++ b/src/meson.build |
52 |
+@@ -60,6 +60,7 @@ modes_sources = files( |
53 |
+ modes_sources += custom_target( |
54 |
+ 'modes', |
55 |
+ command: [ |
56 |
++ python, |
57 |
+ files('modes.py'), |
58 |
+ '--destdir', '@OUTDIR@', |
59 |
+ ], |
60 |
+@@ -92,6 +93,7 @@ parser_sources = files( |
61 |
+ parser_sources += custom_target( |
62 |
+ 'parser-seq', |
63 |
+ command: [ |
64 |
++ python, |
65 |
+ files('parser-seq.py'), |
66 |
+ '--destdir', '@OUTDIR@', |
67 |
+ ], |
68 |
+-- |
69 |
+2.26.3 |
70 |
+ |
71 |
|
72 |
diff --git a/x11-libs/vte/vte-0.64.1.ebuild b/x11-libs/vte/vte-0.64.1.ebuild |
73 |
index e1499ad2215..5d3ccf349ac 100644 |
74 |
--- a/x11-libs/vte/vte-0.64.1.ebuild |
75 |
+++ b/x11-libs/vte/vte-0.64.1.ebuild |
76 |
@@ -2,10 +2,11 @@ |
77 |
# Distributed under the terms of the GNU General Public License v2 |
78 |
|
79 |
EAPI=7 |
80 |
+PYTHON_COMPAT=( python3_{7..9} ) |
81 |
VALA_USE_DEPEND="vapigen" |
82 |
VALA_MIN_API_VERSION="0.32" |
83 |
|
84 |
-inherit gnome.org meson vala xdg |
85 |
+inherit gnome.org meson python-any-r1 vala xdg |
86 |
|
87 |
DESCRIPTION="Library providing a virtual terminal emulator widget" |
88 |
HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" |
89 |
@@ -35,6 +36,7 @@ RDEPEND=" |
90 |
" |
91 |
DEPEND="${RDEPEND}" |
92 |
BDEPEND=" |
93 |
+ ${PYTHON_DEPS} |
94 |
dev-libs/libxml2:2 |
95 |
dev-util/glib-utils |
96 |
gtk-doc? ( >=dev-util/gtk-doc-1.13 |
97 |
@@ -45,6 +47,10 @@ BDEPEND=" |
98 |
vala? ( $(vala_depend) ) |
99 |
" |
100 |
|
101 |
+PATCHES=( |
102 |
+ "${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch |
103 |
+) |
104 |
+ |
105 |
src_prepare() { |
106 |
if ! use vanilla; then |
107 |
# Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch |