[Spice-devel] [PATCH spice-gtk 1/5] Bump meson requirement to 0.47.2
Victor Toso
victortoso at redhat.com
Wed Sep 26 09:00:39 UTC 2018
On Tue, Sep 25, 2018 at 02:37:55PM -0300, Eduardo Lima (Etrunko) wrote:
> This new version ships the fix for the issue where 'check' keyword could
> not be used in project definition, so we had to run that command again
> only to check if it succeeded.
>
> https://github.com/mesonbuild/meson/issues/3944
>
> Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Acked-by: Victor Toso <victortoso at redhat.com>
> ---
> meson.build | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 875e07f..85f6e78 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2,17 +2,9 @@
> # project definition
> #
> project('spice-gtk', 'c',
> - version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version').stdout().strip(),
> + version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(),
> license : 'LGPLv2.1',
> - meson_version : '>= 0.47.0')
> -
> -# double check meson.project_version()
> -# we can not use 'check' keyword in run_command() for git-version-gen above
> -# https://github.com/mesonbuild/meson/issues/3944
> -version = run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip()
> -if meson.project_version() != version
> - error('Wrong project version')
> -endif
> + meson_version : '>= 0.47.2')
>
> message('Updating submodules')
> run_command('build-aux/meson/check-spice-common', check : true)
> --
> 2.17.1
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20180926/fe332b1c/attachment.sig>
More information about the Spice-devel
mailing list