diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-05 03:25:32 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-05-05 11:36:46 +0300 |
| commit | 45aa57f66055510616eb765de6e68a7cb59ecacf (patch) | |
| tree | 752095776280e68dc4823eb77429ebcc54a495a0 | |
| parent | 3729e127ffa078949bac358989cd54bd4a07825e (diff) | |
| download | meson-45aa57f66055510616eb765de6e68a7cb59ecacf.zip meson-45aa57f66055510616eb765de6e68a7cb59ecacf.tar.gz meson-45aa57f66055510616eb765de6e68a7cb59ecacf.tar.bz2 | |
gnome: Update minimum glib version for gdbus-codegen
The fix has landed upstream, and will be in the next glib stable
release. I have verified that it fixes the problem described in #3488
and that the 'frameworks/7 gnome' test passes now.
| -rw-r--r-- | mesonbuild/modules/gnome.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 9d87dad..84943dc 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -905,9 +905,8 @@ This will become a hard error in the future.''') cmd += ['--annotate'] + annotation # Added in https://gitlab.gnome.org/GNOME/glib/commit/e4d68c7b3e8b01ab1a4231bf6da21d045cb5a816 (2.55.2) - # --body | --header is broken: https://github.com/mesonbuild/meson/issues/3488 - # Disabled till glib is fixed. - if mesonlib.version_compare(self._get_native_glib_version(state), '>= 9999'): + # Fixed in https://gitlab.gnome.org/GNOME/glib/commit/cd1f82d8fc741a2203582c12cc21b4dacf7e1872 (2.56.2) + if mesonlib.version_compare(self._get_native_glib_version(state), '>= 2.56.2'): targets = [] install_header = kwargs.get('install_header', False) install_dir = kwargs.get('install_dir', state.environment.coredata.get_builtin_option('includedir')) |