libgnt/libgnt

Merged in default (pull request #19)

2019-04-09, Gary Kramlich
581b3be6cabb
Parents eb560e360258b23c3cab1b40
Children b93a3f63ebe278fc32338218
Merged in default (pull request #19)

Bump version and make parallel-installable

Approved-by: Gary Kramlich
2 files changed, 9 insertions(+), 9 deletions(-)
  • +8 -8
    meson.build
  • +1 -1
    wms/meson.build
    • --- a/meson.build Tue Apr 09 00:04:32 2019 +0000
    +++ b/meson.build Tue Apr 09 00:08:44 2019 +0000
    @@ -23,10 +23,10 @@
    #
    # the last version for Finch 2 was 2.8.10,
    -# the first version for Finch 3 was 2.9.0
    +# the first version for Finch 3 was 3.0.0
    project('libgnt', 'c',
    - version : '2.9.0-devel',
    + version : '3.0.0-devel',
    meson_version : '>=0.37.0')
    gnt_soversion = 1
    @@ -212,16 +212,16 @@
    configure_file(input : 'gntversion.h.in', output : 'gntversion.h',
    configuration : gnt_config,
    install : true,
    - install_dir : join_paths(get_option('includedir'), 'gnt'))
    + install_dir : join_paths(get_option('includedir'), 'gnt3'))
    # This is temporary until we can hide GObject internals:
    gnt_h = configure_file(input : 'gnt.h.in', output : 'gnt.h',
    configuration : gnt_config,
    install : true,
    - install_dir : join_paths(get_option('includedir'), 'gnt'))
    + install_dir : join_paths(get_option('includedir'), 'gnt3'))
    gmodule = dependency('gmodule-2.0')
    -install_headers(libgnt_headers, subdir : 'gnt')
    +install_headers(libgnt_headers, subdir : 'gnt3')
    if host_machine.system() == 'windows'
    windows = import('windows')
    @@ -249,11 +249,11 @@
    name : 'LibGNT',
    description : 'Glib Ncurses Toolkit is a collection of curses-widgets.',
    version : meson.project_version(),
    - filebase : 'gnt',
    - subdirs : 'gnt',
    + filebase : 'gnt3',
    + subdirs : 'gnt3',
    libraries : [libgnt],
    requires : ['glib-2.0'],
    - variables : ['plugindir = ${libdir}/gnt'],
    + variables : ['plugindir = ${libdir}/gnt3'],
    )
    if get_option('introspection') and host_machine.system() != 'windows'
    --- a/wms/meson.build Tue Apr 09 00:04:32 2019 +0000
    +++ b/wms/meson.build Tue Apr 09 00:08:44 2019 +0000
    @@ -1,4 +1,4 @@
    -plugindir = get_option('libdir') + '/gnt'
    +plugindir = get_option('libdir') + '/gnt3'
    irssi = library('irssi', 'irssi.c',
    dependencies : [ncurses, gobject, libgnt_dep],