diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
| commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
| tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /dev-util/meson | |
| parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) | |
gentoo resync : 19.03.2019
Diffstat (limited to 'dev-util/meson')
| -rw-r--r-- | dev-util/meson/Manifest | 5 | ||||
| -rw-r--r-- | dev-util/meson/files/meson-0.49-python3.5-tests.patch | 34 | ||||
| -rw-r--r-- | dev-util/meson/meson-0.49.2.ebuild | 11 | ||||
| -rw-r--r-- | dev-util/meson/meson-9999.ebuild | 7 |
4 files changed, 53 insertions, 4 deletions
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index e2120adeef39..fdd5ffefadaf 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -1,6 +1,7 @@ +AUX meson-0.49-python3.5-tests.patch 1228 BLAKE2B 1cf444e239ec6c24f0fef9d20edf92e364c5c55debf61c115559cacb676596e98a9e01970661b16c4a95bfbf161d6c02e314bbe746979cb77c8f7f6dc5ce7fa6 SHA512 c856436331f6d80912e0519303051e49f4c2c08d348e575ff71b2628621ce752148bccf7aa348d0f27d7df11ff15ee96439d4438d0a2755e1f6c66d2be0ac942 DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f DIST meson-0.49.2.tar.gz 1340730 BLAKE2B 07931bca42907eb961f5f15da5216448d33539a091de4e7df53f0713471f2b0c581d1e3f9ba7eac2a87b61861e5408a5af1a5cb8c17c9561f81cd377b2ea7fc3 SHA512 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d EBUILD meson-0.48.2.ebuild 1737 BLAKE2B 0015a7cb7dfa7dbf0a57352d7271e972490247914a091d429dfd547d7b92d9122441ad2ba3022b54442a6b94ca2913b0f82e69899055a6c60d65160ce1a2fea6 SHA512 11bf7cd817ddc3426c004ddf6a62419c2e4113299c57fc28f42267916060a349e584c17ac8fc10e54504c547cbd182928d1824b7be778eb5498056d3d2ca3167 -EBUILD meson-0.49.2.ebuild 1547 BLAKE2B 6ae191ddfba8fff7af35c718370f707213279e022a9c781f26061bbd57bb426601a18e97a3b22b732e81e3c37a859211ed65185d1b88d3f488537be0bfc1e492 SHA512 f4b8f1698ad7f89cba39a622538339ed4f7d7d04f95374c23494eb7a39aea656f12682b0c912bb8fca3703fd05b305c1d0245816fd00d7736af7841d4d2e02e0 -EBUILD meson-9999.ebuild 1547 BLAKE2B 6ae191ddfba8fff7af35c718370f707213279e022a9c781f26061bbd57bb426601a18e97a3b22b732e81e3c37a859211ed65185d1b88d3f488537be0bfc1e492 SHA512 f4b8f1698ad7f89cba39a622538339ed4f7d7d04f95374c23494eb7a39aea656f12682b0c912bb8fca3703fd05b305c1d0245816fd00d7736af7841d4d2e02e0 +EBUILD meson-0.49.2.ebuild 1772 BLAKE2B 465819137a0ad5b52547d88c47a4ea9ac591440e98e1de4deb7c83e9753a16114e0a4a9e84bf0c0c52a2d05ef77baca6ffdc0d30d720aaee6da45a73f8b7b6d2 SHA512 d0043e6282a35030ece03c6ff20b673843b049767ce89f1c1a7832a69931f6ca3773772ec1d99a3673970a5d46056c6aefd7c2acb4c5704f5fce8cfadb737e0a +EBUILD meson-9999.ebuild 1711 BLAKE2B b2ab12ee5111a491c9e5278cc0cc49cd8acead98418272927c8518c58c31ce7a5754ca8092a749ba40ba35558b11fc3ceffbb8fde736aa442efc71d431e834be SHA512 e502aefc4aec2f7833e9cdc8921591ce0f2e447e029494b50f83df5be7957224ff64e53d6b6ef320b24fe84d3a5d393337098a71a6cde45d51d92504675bd6e4 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467 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 new file mode 100644 index 000000000000..640348b2bc2d --- /dev/null +++ b/dev-util/meson/files/meson-0.49-python3.5-tests.patch @@ -0,0 +1,34 @@ +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 + diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild index c7cd92e8d1f5..09b40845cc6a 100644 --- a/dev-util/meson/meson-0.49.2.ebuild +++ b/dev-util/meson/meson-0.49.2.ebuild @@ -33,6 +33,10 @@ DEPEND="${RDEPEND} ) " +PATCHES=( + "${FILESDIR}/meson-0.49-python3.5-tests.patch" +) + python_prepare_all() { # ASAN and sandbox both want control over LD_PRELOAD # https://bugs.gentoo.org/673016 @@ -42,7 +46,12 @@ python_prepare_all() { } src_test() { - distutils-r1_src_test + tc-export PKG_CONFIG + if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then + ewarn "Found Qt5Core but not Qt5Gui; skipping tests" + else + distutils-r1_src_test + fi } python_test() { diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild index c7cd92e8d1f5..89b176910cb5 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-util/meson/meson-9999.ebuild @@ -42,7 +42,12 @@ python_prepare_all() { } src_test() { - distutils-r1_src_test + tc-export PKG_CONFIG + if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then + ewarn "Found Qt5Core but not Qt5Gui; skipping tests" + else + distutils-r1_src_test + fi } python_test() { |