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.1.tar.gz b/meson-0.59.1.tar.gz new file mode 100644 index 0000000..dccd3b7 --- /dev/null +++ b/meson-0.59.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db586a451650d46bbe10984a87b79d9bcdc1caebf38d8e189f8848f8d502356d +size 1944678 diff --git a/meson-0.59.1.tar.gz.asc b/meson-0.59.1.tar.gz.asc new file mode 100644 index 0000000..10ae87e --- /dev/null +++ b/meson-0.59.1.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmEdMskACgkQwk5jG6ux +/nBipg//enlyM6WCWhwHUiWeJD0wrJraUijxqW4npb6K9nMTwraE1oaQiJ+LxNV/ +N1ETe3cLN9TQa4MV0xqDzfER8OGNekLeqMtWikRSXgMfzRaK0B47Gb3GSd9d/i5W +dAQSsjj9HV7RUmJEiuxNYyGI1fJEO/lXyshoJSVwhdxEpaao3c2J/2Ky5Rh1OiMC +86vuIYwmohlpCApjG6Fq89PwAtwPXaLk1Lfz57lzLKywNU1WibejtiXrFMzbxvVt +/vijnrv74EifyuF/TunvtTv9Y2JS3xTu3r6N5jVU75gEWtEnANIBc/e363yf0vSa +ypsPjMJwW73rLpPxaKj8jXXbMr4HY8nFf5O4PRK1dXAcHlotUc5qDCA6iuC6iGNP +BDWdwETyohpwkPsJkCdsX5RBbuKmU1d2eWI6K3nAt+gWj7aNmC7y1+xz6ax9/oxF ++roDkhWZL6RtxR1KeDS6qSPqBBxuONoZWoUQamNLwnVnm7U2CHP8Cc7OlL8lYntE +dzFfq1O2S+F58nGxE+3lAhtyUUslOrMdfdFWQYXnBjNyktaF5ZzJhQ/2O+rLJQjX +xIZwnN/wqP6Din7WTLeMc8rxVwrr/cjuc7WIIOOOycBOI5JIVF1/ravc/+Cc/TQ2 +alpyNQHx4xbwDzgMIYxAiU+DJHL94H7Xy+Qf4CXbQuWHJEXVp0A= +=9OV4 +-----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..8767eb0 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Aug 19 15:56:22 UTC 2021 - Bjørn Lie + +- Update to version 0.59.1: + + No upstream changes provided. + +------------------------------------------------------------------- +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..48a61fd 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.1 Release: 0 Summary: Python-based build system License: Apache-2.0