summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <william.hubbs@sony.com>2019-08-22 10:48:59 -0500
committerWilliam Hubbs <williamh@gentoo.org>2019-08-22 10:52:07 -0500
commitb2e403b1859fddabf72e812090e1f7107eb26617 (patch)
treec037fcf1ac86c94cc15fb28e7dfeedba9ed8b819 /dev-util/meson/files
parentmedia-gfx/pycam: version bump to 0.6.4 (diff)
downloadgentoo-b2e403b1859fddabf72e812090e1f7107eb26617.tar.gz
gentoo-b2e403b1859fddabf72e812090e1f7107eb26617.tar.bz2
gentoo-b2e403b1859fddabf72e812090e1f7107eb26617.zip
dev-util/meson: remove several old versions
Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: William Hubbs <williamh@gentoo.org>
Diffstat (limited to 'dev-util/meson/files')
-rw-r--r--dev-util/meson/files/meson-0.49-python3.5-tests.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/dev-util/meson/files/meson-0.49-python3.5-tests.patch b/dev-util/meson/files/meson-0.49-python3.5-tests.patch
deleted file mode 100644
index 640348b2bc2d..000000000000
--- a/dev-util/meson/files/meson-0.49-python3.5-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 65192af2ff62a032a3f19d065c95e12b83aae709 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@collabora.com>
-Date: Fri, 11 Jan 2019 18:03:15 +0000
-Subject: [PATCH] run_unittests: Use Python 3.5-compatible subprocess
- invocation
-
-subprocess.run() didn't get the encoding parameter until 3.6.
-
-Signed-off-by: Simon McVittie <smcv@collabora.com>
----
- run_unittests.py | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 342ad883..e1246140 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -5029,10 +5029,9 @@ class NativeFileTests(BasePlatformTests):
- ret = subprocess.run(
- ["{}"] + extra_args,
- stdout=subprocess.PIPE,
-- stderr=subprocess.PIPE,
-- encoding='utf-8')
-- print(ret.stdout)
-- print(ret.stderr, file=sys.stderr)
-+ stderr=subprocess.PIPE)
-+ print(ret.stdout.decode('utf-8'))
-+ print(ret.stderr.decode('utf-8'), file=sys.stderr)
- sys.exit(ret.returncode)
-
- if __name__ == '__main__':
---
-2.21.0
-