gplugin/gplugin

Update requirements to meson 0.37.0.
feature/meson
2016-12-18, Elliott Sales de Andrade
b3d92819ddbe
Parents 9d985f05bb79
Children 67310e92c974
Update requirements to meson 0.37.0.

All the necessary patches have been merged, though some small tweaks
have been made. So make the necessary adjustments as well.
2 files changed, 8 insertions(+), 9 deletions(-)
  • +6 -7
    gplugin/meson.build
  • +2 -2
    meson.build
    • --- a/gplugin/meson.build Sun Dec 18 02:47:39 2016 -0500
    +++ b/gplugin/meson.build Sun Dec 18 02:54:20 2016 -0500
    @@ -71,16 +71,15 @@
    'gplugin-plugin.h',
    ]
    -enums_h = gnome.mkenums('gplugin-enums.h',
    +enums = gnome.mkenums('gplugin-enums',
    sources : ENUM_HEADERS,
    - template : 'gplugin-enums.h.tmpl',
    + c_template : 'gplugin-enums.c.tmpl',
    + h_template : 'gplugin-enums.h.tmpl',
    identifier_prefix : 'GPlugin',
    - install : true,
    + install_header : true,
    install_dir : get_option('includedir') + '/gplugin-1.0/gplugin')
    -enums_c = gnome.mkenums('gplugin-enums.c',
    - sources : ENUM_HEADERS,
    - template : 'gplugin-enums.c.tmpl',
    - identifier_prefix : 'GPlugin')
    +enums_c = enums[0]
    +enums_h = enums[1]
    GPLUGIN_PUBLIC_BUILT_HEADERS += [
    enums_h
    --- a/meson.build Sun Dec 18 02:47:39 2016 -0500
    +++ b/meson.build Sun Dec 18 02:54:20 2016 -0500
    @@ -1,7 +1,7 @@
    ###############################################################################
    # Project Info
    ###############################################################################
    -project('gplugin', 'c', meson_version : '>0.34.0',
    +project('gplugin', 'c', meson_version : '>0.36.0',
    default_options : ['c_std=c99'])
    GPLUGIN_MAJOR_VERSION = 0
    @@ -77,7 +77,7 @@
    if compiler.has_argument('-Wformat')
    add_global_arguments('-Wformat', language : 'c')
    - if compiler.has_argument('-Werror=format-security', pre_args : '-Wformat')
    + if compiler.has_multi_arguments(['-Wformat', '-Werror=format-security'])
    add_global_arguments('-Werror=format-security', language : 'c')
    endif
    endif