Gentoo Archives: gentoo-commits

From: "Rémi Cardona" <remi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-apps/igt-gpu-tools/, x11-apps/igt-gpu-tools/files/
Date: Sun, 28 Jun 2020 10:52:01
Message-Id: 1593341493.f255daced19dff233b657f213833b26cf6a9022c.remi@gentoo
1 commit: f255daced19dff233b657f213833b26cf6a9022c
2 Author: Rémi Cardona <remi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 28 10:50:49 2020 +0000
4 Commit: Rémi Cardona <remi <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 28 10:51:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f255dace
7
8 x11-apps/igt-gpu-tools: fix build with python 3.9
9
10 Closes: https://bugs.gentoo.org/726852
11 Package-Manager: Portage-2.3.102, Repoman-2.3.23
12 Signed-off-by: Rémi Cardona <remi <AT> gentoo.org>
13
14 x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch | 25 ++++++++++++++++++++++
15 x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild | 2 ++
16 2 files changed, 27 insertions(+)
17
18 diff --git a/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch b/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch
19 new file mode 100644
20 index 00000000000..689dca411e5
21 --- /dev/null
22 +++ b/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch
23 @@ -0,0 +1,25 @@
24 +manual backport of upstream commit
25 +https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/201da47cb57b8fadd9bc45be16b82617b32a2c01
26 +
27 +--- a/docs/reference/igt-gpu-tools/generate_description_xml.py
28 ++++ b/docs/reference/igt-gpu-tools/generate_description_xml.py
29 +@@ -4,7 +4,7 @@ import re
30 + import sys
31 + import os.path
32 + import subprocess
33 +-import xml.etree.cElementTree as ET
34 ++import xml.etree.ElementTree as ET
35 +
36 + from collections import namedtuple
37 +
38 +--- a/lib/i915/perf-configs/perf-codegen.py
39 ++++ b/lib/i915/perf-configs/perf-codegen.py
40 +@@ -26,7 +26,7 @@ import os
41 + import sys
42 + import textwrap
43 +
44 +-import xml.etree.cElementTree as et
45 ++import xml.etree.ElementTree as et
46 +
47 + import codegen
48 +
49
50 diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
51 index b202d340de9..6bb31b86e9f 100644
52 --- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
53 +++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
54 @@ -73,6 +73,8 @@ DEPEND="${RDEPEND}
55 )
56 "
57
58 +PATCHES=( "${FILESDIR}/${PV}-python-3.9.patch" )
59 +
60 src_prepare() {
61 sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build
62 default_src_prepare