From 2e73ca3c1816e9b8a7a4ae09465ea93f591e64a8d89e2f869b36e8f3501d0767 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 10 Aug 2021 12:30:50 +0000 Subject: [PATCH] Accepting request 910545 from home:darix:playground - Update to version 0.59.0: https://mesonbuild.com/Release-notes-for-0-59-0.html - refreshed meson-test-installed-bin.patch to apply cleanly again OBS-URL: https://build.opensuse.org/request/show/910545 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=209 --- meson-0.58.2.tar.gz | 3 --- meson-0.58.2.tar.gz.asc | 16 ------------ meson-0.59.0.tar.gz | 3 +++ meson-0.59.0.tar.gz.asc | 16 ++++++++++++ meson-test-installed-bin.patch | 48 +++++++++++++++++----------------- meson.changes | 7 +++++ meson.spec | 2 +- 7 files changed, 51 insertions(+), 44 deletions(-) delete mode 100644 meson-0.58.2.tar.gz delete mode 100644 meson-0.58.2.tar.gz.asc create mode 100644 meson-0.59.0.tar.gz create mode 100644 meson-0.59.0.tar.gz.asc diff --git a/meson-0.58.2.tar.gz b/meson-0.58.2.tar.gz deleted file mode 100644 index ada3a88..0000000 --- a/meson-0.58.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7 -size 1899464 diff --git a/meson-0.58.2.tar.gz.asc b/meson-0.58.2.tar.gz.asc deleted file mode 100644 index 3926ff9..0000000 --- a/meson-0.58.2.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmD2kOMACgkQwk5jG6ux -/nCV4xAAjxSenO23bczmQiYdEZ1FV+OXD+e+WjAq/DYk56oITvMdv+3VC6YwpExd -hztaNGJRW3aYCt5Y8QMxbp0fO3msAy/227Y0JTF+1M/tU+EcqV3n43ouWR8zegaD -eQSQgNfial+1gp4TAkj/gAdTn/GaxGSX3WkEmYY1A7OPOiMqDLGBdi7kA6h1QhP/ -44XmClaVMYrt3ULG+AuMCYXE7ghlQcle/Hbszs2ft9JePZ7l8TXDhSdP5srb2ybG -n0hzdzco77Ck9+DjkdC0adR3KkpAD9Uj+zNHQZBCPZM5LkBgbS6HctPcSTcA5ndP -Ws1nsR2PT/6MjYT4omdm/dCdi/9ZYk9ISAl+IMSi1g5sxNfMysKK25OQpW68JcPg -FUL3U7b1jGIe20pbymWBKdkxSgGDdQMvaJqgUxTARpmxCGvt1583UIFkbIeA8L8L -RBDyaUPd+fP1a+xcG9Lj9lB0yhPSh/t/qz7MaG5H7+slaNy1a/KU0w3rG2uwgQdw -ejYm15ck/h2CaQ5UuA4W0xL8jzGTflemQWKU0hUbTDJMqWhEHN3TpqfJurQRl0fk -sYPz1ofYJBRiIe/TB77DhZ2yOw/bOesrwAqQSUgjkGm8IqBqQ57h35ONjdzhBXWV -3odiXLTZLWIrPpxUAO86WV9fWZuogtwfPll7Ec0X5Uf5PHV/UHY= -=a2Hs ------END PGP SIGNATURE----- diff --git a/meson-0.59.0.tar.gz b/meson-0.59.0.tar.gz new file mode 100644 index 0000000..8f42416 --- /dev/null +++ b/meson-0.59.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e376c298df64b643dfe01eccb2d7b6f1e02e95aa38c19f19d120d129612ce476 +size 1940386 diff --git a/meson-0.59.0.tar.gz.asc b/meson-0.59.0.tar.gz.asc new file mode 100644 index 0000000..f06686e --- /dev/null +++ b/meson-0.59.0.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmD0BeYACgkQwk5jG6ux +/nAIvQ//QzQUyXChJGcc9TV3QmIIzrKuM4IBgK6ledhP88R3g7n/N4I7cWH05TQO +wnH+jGwJ4/5Bz2viwQIOJzQje9ViaFrSwMfYh+sP7JBA2YliuuQmCy7RlE7mGFhZ +vS44JUKpLoP2TTD/6lFjbGS5Ip991DGpv75yqN4xIfO1tF4LY4DpXcvdYrZ5Kkh/ ++sjftvVTQGpZVs1+AhjupVE0iy6Bp/6PaXf3gL0sV2+lzl1klRX4ILn2yLIH5OOL +6YMgITQV8gQE9WR1AUlLHR5A4WG3ijuZVKaxz5APu/Rd/857EUUrD7lDhdnqkgLa +gS7Ep3e2cl4mGW4Nt5vRnqe/8KX3Uv1i0mqICmhM6umSBcQoT9K8AxJbci7bPNmc +iA2tYbW+gdTdQHrYjoi6Ry2j2+YUjVAZfOTrHO5FzxzHY6zk9XUOKTdNUB3RTLZC +3n0w3CBOPrhW3FNz8LCjMXCWV8Jt2K2MqGmYVo1kk3bQ1rS/9acJWsq2G2+LBE/K +Hefhp69EQtGOwpu/V7A1TtB69KzUbxvRLgOkojApNZZgAuwW1XK/kYRBb6iiPyTW +99QzAU8Hn1ueoJJuYV4PAuVNAhd/HJdHO8j5Cy8DXvXb+SpgPxpGuHjajMuBf3s8 +ocGRTj13H+ZTEgbUWMDn0DSHZWW+U3hCPdw9Pwk8mnT+0wVsFaw= +=Ja4g +-----END PGP SIGNATURE----- diff --git a/meson-test-installed-bin.patch b/meson-test-installed-bin.patch index 6574b60..1dcea5b 100644 --- a/meson-test-installed-bin.patch +++ b/meson-test-installed-bin.patch @@ -1,8 +1,8 @@ -Index: meson-0.58.0/run_tests.py +Index: meson-0.59.0/run_tests.py =================================================================== ---- meson-0.58.0.orig/run_tests.py -+++ meson-0.58.0/run_tests.py -@@ -158,18 +158,10 @@ def get_meson_script(): +--- meson-0.59.0.orig/run_tests.py ++++ meson-0.59.0/run_tests.py +@@ -163,18 +163,10 @@ def get_meson_script() -> str: Also used by run_unittests.py to determine what meson to run when not running in-process (which is the default). ''' @@ -21,24 +21,24 @@ Index: meson-0.58.0/run_tests.py - raise RuntimeError(f'Could not find {meson_script!r} or a meson in PATH') + raise RuntimeError(f'Could not find meson in PATH') - def get_backend_args_for_dir(backend, builddir): + def get_backend_args_for_dir(backend: Backend, builddir: str) -> T.List[str]: ''' -@@ -359,12 +351,12 @@ def main(): - else: - env['PYTHONPATH'] = temp_dir - if not options.cross: -- cmd = mesonlib.python_command + ['run_meson_command_tests.py', '-v'] -- if options.failfast: -- cmd += ['--failfast'] -- returncode += subprocess.call(cmd, env=env) -- if options.failfast and returncode != 0: -- return returncode -+ #cmd = mesonlib.python_command + ['run_meson_command_tests.py', '-v'] -+ #if options.failfast: -+ # cmd += ['--failfast'] -+ #returncode += subprocess.call(cmd, env=env) -+ #if options.failfast and returncode != 0: -+ # return returncode - if no_unittests: - print('Skipping all unit tests.') - print(flush=True) +@@ -345,12 +337,12 @@ def main(): + # Can't pass arguments to unit tests, so set the backend to use in the environment + env = os.environ.copy() + if not options.cross: +- cmd = mesonlib.python_command + ['run_meson_command_tests.py', '-v'] +- if options.failfast: +- cmd += ['--failfast'] +- returncode += subprocess.call(cmd, env=env) +- if options.failfast and returncode != 0: +- return returncode ++ #cmd = mesonlib.python_command + ['run_meson_command_tests.py', '-v'] ++ #if options.failfast: ++ # cmd += ['--failfast'] ++ #returncode += subprocess.call(cmd, env=env) ++ #if options.failfast and returncode != 0: ++ # return returncode + if no_unittests: + print('Skipping all unit tests.') + print(flush=True) diff --git a/meson.changes b/meson.changes index 51a36ba..cbfd573 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 6 23:18:53 UTC 2021 - Marcus Rueckert + +- Update to version 0.59.0: + https://mesonbuild.com/Release-notes-for-0-59-0.html +- refreshed meson-test-installed-bin.patch to apply cleanly again + ------------------------------------------------------------------- Fri Jul 30 12:41:22 UTC 2021 - Frederic Crozat diff --git a/meson.spec b/meson.spec index cef6ae5..b603ceb 100644 --- a/meson.spec +++ b/meson.spec @@ -28,7 +28,7 @@ %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} %bcond_with setuptools Name: meson%{name_ext} -Version: 0.58.2 +Version: 0.59.0 Release: 0 Summary: Python-based build system License: Apache-2.0