From 1b5cf0b8a81c83afb4c20822ed46bc7b24eae07b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 5 Mar 2020 15:35:48 +0100 Subject: [PATCH] build: Bump version requirement We are currently optionally using a 0.53 feature, bump the requirement to make it non-optional. https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1186 --- meson.build | 10 ++++------ subprojects/extensions-app/meson.build | 8 +++----- subprojects/extensions-tool/meson.build | 10 ++++------ subprojects/shew/meson.build | 2 +- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/meson.build b/meson.build index 230df9f11..052a2d72b 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('gnome-shell', 'c', version: '3.37.0', - meson_version: '>= 0.47.0', + meson_version: '>= 0.53.0', license: 'GPLv2+' ) @@ -321,8 +321,6 @@ if get_option('man') summary_dirs += { 'mandir': get_option('mandir') } endif -if meson.version().version_compare('>= 0.53.0') - summary(summary_dirs, section: 'Directories') - summary(summary_build, section: 'Build Configuration') - summary(summary_options, section: 'Build Options') -endif +summary(summary_dirs, section: 'Directories') +summary(summary_build, section: 'Build Configuration') +summary(summary_options, section: 'Build Options') diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build index 2c1c5de6e..dba98c3f5 100644 --- a/subprojects/extensions-app/meson.build +++ b/subprojects/extensions-app/meson.build @@ -1,6 +1,6 @@ project('gnome-extensions-app', version: '3.37.0', - meson_version: '>= 0.47.0', + meson_version: '>= 0.53.0', license: 'GPLv2+' ) @@ -65,8 +65,6 @@ if not meson.is_subproject() 'debug': get_option('debug'), } - if meson.version().version_compare('>= 0.53.0') - summary(summary_dirs, section: 'Directories') - summary(summary_build, section: 'Build Configuration') - endif + summary(summary_dirs, section: 'Directories') + summary(summary_build, section: 'Build Configuration') endif diff --git a/subprojects/extensions-tool/meson.build b/subprojects/extensions-tool/meson.build index 0832bf085..0ac3bb0a4 100644 --- a/subprojects/extensions-tool/meson.build +++ b/subprojects/extensions-tool/meson.build @@ -1,6 +1,6 @@ project('gnome-extensions-tool', 'c', version: '3.37.0', - meson_version: '>= 0.47.0', + meson_version: '>= 0.53.0', license: 'GPLv2+' ) @@ -74,9 +74,7 @@ if not meson.is_subproject() 'bash_completion': bash_completion.found(), } - if meson.version().version_compare('>= 0.53.0') - summary(summary_dirs, section: 'Directories') - summary(summary_build, section: 'Build Configuration') - summary(summary_options, section: 'Build Options') - endif + summary(summary_dirs, section: 'Directories') + summary(summary_build, section: 'Build Configuration') + summary(summary_options, section: 'Build Options') endif diff --git a/subprojects/shew/meson.build b/subprojects/shew/meson.build index d49b67b04..585505580 100644 --- a/subprojects/shew/meson.build +++ b/subprojects/shew/meson.build @@ -1,6 +1,6 @@ project('shew', 'c', version: '3.37.0', - meson_version: '>= 0.47.0', + meson_version: '>= 0.53.0', license: 'LGPLv2+', )