gplugin/gplugin

Bump the minimum meson to 0.61.0 and clean up some warnings

2022-04-18, Gary Kramlich
55291fd09e7d
Parents aab3e0707aeb
Children 5362a1727bf6
Bump the minimum meson to 0.61.0 and clean up some warnings

Testing Done:
Compiled.

Reviewed at https://reviews.imfreedom.org/r/1350/
3 files changed, 18 insertions(+), 11 deletions(-)
  • +7 -9
    meson.build
  • +1 -1
    perl5/meson.build
  • +10 -1
    vala/meson.build
    • --- a/meson.build Tue Mar 15 01:23:30 2022 -0500
    +++ b/meson.build Mon Apr 18 21:43:02 2022 -0500
    @@ -4,7 +4,7 @@
    project('gplugin', 'c',
    license : 'LGPL-2.0-or-later',
    version : '0.38.1-dev',
    - meson_version : '>=0.56.0',
    + meson_version : '>=0.61.0',
    default_options : ['c_std=c99', 'warning_level=2'])
    parts = meson.project_version().split('-')
    @@ -54,17 +54,15 @@
    ###############################################################################
    devenv = environment()
    -if meson.version().version_compare('>=0.58.0')
    - config_home = get_option('devenv-config-dir')
    +config_home = get_option('devenv-config-dir')
    - if config_home == ''
    - config_home = meson.project_build_root() / 'config'
    - endif
    +if config_home == ''
    + config_home = meson.project_build_root() / 'config'
    +endif
    - devenv.set('XDG_CONFIG_HOME', config_home)
    +devenv.set('XDG_CONFIG_HOME', config_home)
    - meson.add_devenv(devenv)
    -endif
    +meson.add_devenv(devenv)
    ###############################################################################
    # NLS
    --- a/perl5/meson.build Tue Mar 15 01:23:30 2022 -0500
    +++ b/perl5/meson.build Mon Apr 18 21:43:02 2022 -0500
    @@ -23,7 +23,7 @@
    # make sure we have the perl library as well.
    LIBPERL = []
    if host_machine.system() != 'freebsd'
    - INC = run_command(PERL, '-e print join("/CORE ",grep(/^\\//,@INC))."/CORE"')
    + INC = run_command(PERL, '-e print join("/CORE ",grep(/^\\//,@INC))."/CORE"', check : true)
    LIBPERL = compiler.find_library('libperl', dirs: INC.stdout().strip().split(' '))
    endif
    --- a/vala/meson.build Tue Mar 15 01:23:30 2022 -0500
    +++ b/vala/meson.build Mon Apr 18 21:43:02 2022 -0500
    @@ -11,7 +11,7 @@
    )
    if get_option('gtk3')
    - gplugin_gtk_vapi = gnome.generate_vapi('gplugin-gtk3',
    + gplugin_gtk3_vapi = gnome.generate_vapi('gplugin-gtk3',
    sources : gplugin_gtk3_gir[0],
    packages : [ 'gtk+-3.0' ],
    install : true,
    @@ -19,5 +19,14 @@
    )
    endif
    + if get_option('gtk4').allowed()
    + gplugin_gtk4_vapi = gnome.generate_vapi('gplugin-gtk4',
    + sources : gplugin_gtk4_gir[0],
    + packages : [ 'gtk4' ],
    + install : true,
    + gir_dirs : meson.current_build_dir() / '..' / 'gplugin',
    + )
    + endif
    +
    subdir('tests')
    endif # vala