mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-19 05:33:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: stop using deprecated functions, require meson >= 0.58

Browse source 
* get_pkgconfig_variable() -> get_variable()
* prog.path() -> prog.full_path()
* meson.build_root() -> meson.global_build_root()
This commit is contained in:
Daniel Eklöf 2022-02-27 11:26:40 +01:00
parent a65804139d
commit 9b343fd9fb
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -48,6 +48,7 @@
### Changed ### Changed
* Minimum required meson version is now 0.58.
* Mouse selections are now finalized when the window is resized * Mouse selections are now finalized when the window is resized
(https://codeberg.org/dnkl/foot/issues/922). (https://codeberg.org/dnkl/foot/issues/922).
* Support for re-mapping input, i.e. mapping input to custom escape * Support for re-mapping input, i.e. mapping input to custom escape

4
doc/meson.build
View file

@ -1,6 +1,6 @@
sh = find_program('sh', native: true) 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( conf_data = configuration_data(
{ {
@ -26,7 +26,7 @@ foreach man_src : [{'name': 'foot', 'section' : 1},
out, out,
output: out, output: out,
input: preprocessed, input: preprocessed,
command: [sh, '-c', '@0@ < @INPUT@'.format(scdoc_prog.path())], command: [sh, '-c', '@0@ < @INPUT@'.format(scdoc_prog.full_path())],
capture: true, capture: true,
install: true, install: true,
install_dir: join_paths(get_option('mandir'), 'man@0@'.format(section))) install_dir: join_paths(get_option('mandir'), 'man@0@'.format(section)))

10
meson.build
View file

@ -1,7 +1,7 @@
project('foot', 'c', project('foot', 'c',
version: '1.11.0', version: '1.11.0',
license: 'MIT', license: 'MIT',
meson_version: '>=0.54.0', meson_version: '>=0.58.0',
default_options: [ default_options: [
'c_std=c11', 'c_std=c11',
'warning_level=1', 'warning_level=1',
@ -48,7 +48,7 @@ endif
# Compute the relative path used by compiler invocations. # Compute the relative path used by compiler invocations.
source_root = meson.current_source_dir().split('/') source_root = meson.current_source_dir().split('/')
build_root = meson.build_root().split('/') build_root = meson.global_build_root().split('/')
relative_dir_parts = [] relative_dir_parts = []
i = 0 i = 0
in_prefix = true in_prefix = true
@ -92,11 +92,11 @@ endif
tllist = dependency('tllist', version: '>=1.0.4', fallback: 'tllist') tllist = dependency('tllist', version: '>=1.0.4', fallback: 'tllist')
fcft = dependency('fcft', version: ['>=3.0.1', '<4.0.0'], fallback: 'fcft') 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 = dependency('wayland-scanner', native: true)
wscanner_prog = find_program( wscanner_prog = find_program(
wscanner.get_pkgconfig_variable('wayland_scanner'), native: true) wscanner.get_variable('wayland_scanner'), native: true)
wl_proto_headers = [] wl_proto_headers = []
wl_proto_src = [] wl_proto_src = []
@ -251,7 +251,7 @@ if systemd.found()
configuration = configuration_data() configuration = configuration_data()
configuration.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) 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( configure_file(
configuration: configuration, configuration: configuration,
input: 'foot-server@.service.in', input: 'foot-server@.service.in',