diff --git a/CHANGELOG.md b/CHANGELOG.md index 94e2f491..48e5b6d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ ### Changed +* Minimum required meson version is now 0.58. * Mouse selections are now finalized when the window is resized (https://codeberg.org/dnkl/foot/issues/922). * Support for re-mapping input, i.e. mapping input to custom escape diff --git a/doc/meson.build b/doc/meson.build index a8b086ef..75c3be95 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -1,6 +1,6 @@ sh = find_program('sh', native: true) -scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true) +scdoc_prog = find_program(scdoc.get_variable('scdoc'), native: true) conf_data = configuration_data( { @@ -26,7 +26,7 @@ foreach man_src : [{'name': 'foot', 'section' : 1}, out, output: out, input: preprocessed, - command: [sh, '-c', '@0@ < @INPUT@'.format(scdoc_prog.path())], + command: [sh, '-c', '@0@ < @INPUT@'.format(scdoc_prog.full_path())], capture: true, install: true, install_dir: join_paths(get_option('mandir'), 'man@0@'.format(section))) diff --git a/meson.build b/meson.build index 8778927d..e2df6bdd 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('foot', 'c', version: '1.11.0', license: 'MIT', - meson_version: '>=0.54.0', + meson_version: '>=0.58.0', default_options: [ 'c_std=c11', 'warning_level=1', @@ -48,7 +48,7 @@ endif # Compute the relative path used by compiler invocations. source_root = meson.current_source_dir().split('/') -build_root = meson.build_root().split('/') +build_root = meson.global_build_root().split('/') relative_dir_parts = [] i = 0 in_prefix = true @@ -92,11 +92,11 @@ endif tllist = dependency('tllist', version: '>=1.0.4', fallback: 'tllist') fcft = dependency('fcft', version: ['>=3.0.1', '<4.0.0'], fallback: 'fcft') -wayland_protocols_datadir = wayland_protocols.get_pkgconfig_variable('pkgdatadir') +wayland_protocols_datadir = wayland_protocols.get_variable('pkgdatadir') wscanner = dependency('wayland-scanner', native: true) wscanner_prog = find_program( - wscanner.get_pkgconfig_variable('wayland_scanner'), native: true) + wscanner.get_variable('wayland_scanner'), native: true) wl_proto_headers = [] wl_proto_src = [] @@ -251,7 +251,7 @@ if systemd.found() configuration = configuration_data() configuration.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) - systemd_units_dir = systemd.get_pkgconfig_variable('systemduserunitdir') + systemd_units_dir = systemd.get_variable('systemduserunitdir') configure_file( configuration: configuration, input: 'foot-server@.service.in',