gplugin/gplugin

Bump the minimum meson to 0.56, fix deprecations, and start using summary()

2021-07-27, Gary Kramlich
b270797db56a
Parents 6fab4ebf3aeb
Children c35d67e36fdb
Bump the minimum meson to 0.56, fix deprecations, and start using summary()

Testing Done:
Ran `meson --wipe` with options toggled. See https://asciinema.org/a/QyLyX1lAchqLu6NcA2J5iBhFl

Reviewed at https://reviews.imfreedom.org/r/849/
10 files changed, 40 insertions(+), 3 deletions(-)
  • +7 -0
    gplugin-gtk-viewer/meson.build
  • +1 -1
    gplugin-gtk/reference/meson.build
  • +7 -0
    gplugin-query/meson.build
  • +2 -0
    lua/meson.build
  • +11 -1
    meson.build
  • +2 -0
    perl5/meson.build
  • +5 -0
    po/meson.build
  • +2 -0
    python3/meson.build
  • +2 -0
    tcc/meson.build
  • +1 -1
    vala/meson.build
    • --- a/gplugin-gtk-viewer/meson.build Tue Jul 27 00:23:40 2021 -0500
    +++ b/gplugin-gtk-viewer/meson.build Tue Jul 27 02:44:16 2021 -0500
    @@ -1,5 +1,12 @@
    if get_option('gtk3')
    +if not get_option('install-gplugin-gtk-viewer')
    +summary('gplugin-gtk-viewer',
    + 'You have disabled installation of gplugin-gtk-viewer which is a ' +
    + 'very useful diagnostics tool.',
    + section : 'Warnings')
    +endif
    +
    gplugin_gtk_viewer_resources = gnome.compile_resources(
    'gplugin-gtk-viewer-resources',
    'data/gplugin-gtk-viewer.gresource.xml',
    --- a/gplugin-gtk/reference/meson.build Tue Jul 27 00:23:40 2021 -0500
    +++ b/gplugin-gtk/reference/meson.build Tue Jul 27 02:44:16 2021 -0500
    @@ -15,7 +15,7 @@
    ]
    fixxref_args = [
    - '--extra-dir=' + (meson.build_root() / 'gplugin/reference/')
    + '--extra-dir=' + (meson.project_build_root() / 'gplugin/reference/')
    ]
    gplugin_gtk_version_xml = configure_file(
    --- a/gplugin-query/meson.build Tue Jul 27 00:23:40 2021 -0500
    +++ b/gplugin-query/meson.build Tue Jul 27 02:44:16 2021 -0500
    @@ -1,3 +1,10 @@
    +if not get_option('install-gplugin-query')
    +summary('gplugin-query',
    + 'You have disabled installation of gplugin-query which is a very ' +
    + 'useful diagnostics tool.',
    + section : 'Warnings')
    +endif
    +
    gplugin_query = executable('gplugin-query',
    'gplugin-query.c',
    dependencies : [gplugin_dep, GLIB, GOBJECT],
    --- a/lua/meson.build Tue Jul 27 00:23:40 2021 -0500
    +++ b/lua/meson.build Tue Jul 27 02:44:16 2021 -0500
    @@ -1,3 +1,5 @@
    +summary('lua', get_option('lua'), section : 'Loader Support', bool_yn : true)
    +
    if get_option('lua')
    if not get_option('introspection')
    error('Lua plugin requires GObject Introspection.')
    --- a/meson.build Tue Jul 27 00:23:40 2021 -0500
    +++ b/meson.build Tue Jul 27 02:44:16 2021 -0500
    @@ -4,7 +4,7 @@
    project('gplugin', 'c',
    license : 'LGPL-2.0-or-later',
    version : '0.32.1-dev',
    - meson_version : '>=0.52.0',
    + meson_version : '>=0.56.0',
    default_options : ['c_std=c99'])
    parts = meson.project_version().split('-')
    @@ -113,3 +113,13 @@
    install_data('ChangeLog', 'INSTALL.md', 'README.md', 'HACKING.md',
    install_dir : get_option('datadir') / 'doc' / 'gplugin')
    +summary({
    + 'gtk-doc' : get_option('doc'),
    + 'gtk3 widgets' : get_option('gtk3'),
    + 'man pages' : get_option('help2man'),
    +}, bool_yn : true, section : 'Miscellaneous')
    +
    +summary({
    + 'introspection' : get_option('introspection'),
    + 'vapi' : get_option('vapi'),
    +}, bool_yn : true, section : 'Bindings')
    --- a/perl5/meson.build Tue Jul 27 00:23:40 2021 -0500
    +++ b/perl5/meson.build Tue Jul 27 02:44:16 2021 -0500
    @@ -1,3 +1,5 @@
    +summary('perl5', get_option('perl5'), section : 'Loader Support', bool_yn : true)
    +
    if get_option('perl5')
    if not get_option('introspection')
    error('Perl plugin requires GObject Introspection.')
    --- a/po/meson.build Tue Jul 27 00:23:40 2021 -0500
    +++ b/po/meson.build Tue Jul 27 02:44:16 2021 -0500
    @@ -1,3 +1,8 @@
    if get_option('nls')
    i18n.gettext(GETTEXT_PACKAGE)
    +else
    + summary('translations',
    + 'You have disabled installation of translations which means ' +
    + 'English will be the only available language.',
    + section : 'Warnings')
    endif
    --- a/python3/meson.build Tue Jul 27 00:23:40 2021 -0500
    +++ b/python3/meson.build Tue Jul 27 02:44:16 2021 -0500
    @@ -1,3 +1,5 @@
    +summary('python3', get_option('python3'), section : 'Loader Support', bool_yn : true)
    +
    if get_option('python3')
    if not get_option('introspection')
    error('Python3 plugin requires GObject Introspection.')
    --- a/tcc/meson.build Tue Jul 27 00:23:40 2021 -0500
    +++ b/tcc/meson.build Tue Jul 27 02:44:16 2021 -0500
    @@ -1,3 +1,5 @@
    +summary('tcc', get_option('tcc'), section : 'Loader Support', bool_yn : true)
    +
    if get_option('tcc')
    GPLUGIN_TCC_SOURCES = [
    'gplugin-tcc-core.c',
    --- a/vala/meson.build Tue Jul 27 00:23:40 2021 -0500
    +++ b/vala/meson.build Tue Jul 27 02:44:16 2021 -0500
    @@ -3,7 +3,7 @@
    error('Vala generation requires GObject Introspection.')
    endif
    - add_languages('vala')
    + add_languages('vala', native: false)
    gplugin_vapi = gnome.generate_vapi('gplugin',
    sources : gplugin_gir[0],