Merge pull request #444 from eli-schwartz/meson-deprecation-warnings

Meson deprecation warnings

meson.build

@@ -1,5 +1,5 @@
 project('zoitechat', 'c',
-  version: run_command('cat', 'VERSION', check: true).stdout().strip(),
+  version: files('VERSION'),
   meson_version: '>= 0.59.0',
   default_options: [
     'c_std=c17',
@@ -167,11 +167,7 @@ if not (host_machine.system() == 'windows' and get_option('debug'))
  test_ldflags += '-Wl,--dynamicbase'
 endif
 foreach ldflag : test_ldflags
-  if meson.version().version_compare('>= 0.55.0')
-    has_arg = cc.has_link_argument(ldflag)
-  else
-    has_arg = cc.has_argument(ldflag)
-  endif
+  has_arg = cc.has_link_argument(ldflag)
 
   if has_arg and cc.links('int main (void) { return 0; }', args: ldflag)
     global_ldflags += ldflag
@@ -229,29 +225,27 @@ if cc.get_id() != 'msvc'
   meson.add_install_script('meson_post_install.py')
 endif
 
-if meson.version().version_compare('>= 0.55.0')
-  summary({
-    'prefix': get_option('prefix'),
-    'bindir': get_option('bindir'),
-    'libdir': get_option('libdir'),
-    'datadir': get_option('datadir'),
-  }, section: 'Directories')
+summary({
+  'prefix': get_option('prefix'),
+  'bindir': get_option('bindir'),
+  'libdir': get_option('libdir'),
+  'datadir': get_option('datadir'),
+}, section: 'Directories')
 
-  summary({
-    'GTK Frontend': get_option('gtk-frontend') ? 'enabled (GTK+ 3.22+)' : 'disabled',
-    'TLS (openssl)': libssl_dep.found(),
-    'Plugin Support': get_option('plugin'),
-    'DBus Support': dbus_dep.found(),
-    'libcanberra': libcanberra_dep.found(),
-  }, section: 'Features')
+summary({
+  'GTK Frontend': get_option('gtk-frontend') ? 'enabled (GTK+ 3.22+)' : 'disabled',
+  'TLS (openssl)': libssl_dep.found(),
+  'Plugin Support': get_option('plugin'),
+  'DBus Support': dbus_dep.found(),
+  'libcanberra': libcanberra_dep.found(),
+}, section: 'Features')
 
-  summary({
-    'Lua': get_option('with-lua'),
-    'Python': get_option('with-python'),
-    'Perl': get_option('with-perl'),
-    'Perl Legacy API': get_option('with-perl-legacy-api'),
-    'FiSH': get_option('with-fishlim'),
-    'Sysinfo': get_option('with-sysinfo'),
-    'DCC Checksum': get_option('with-checksum'),
-  }, section: 'Plugins')
-endif
+summary({
+  'Lua': get_option('with-lua'),
+  'Python': get_option('with-python'),
+  'Perl': get_option('with-perl'),
+  'Perl Legacy API': get_option('with-perl-legacy-api'),
+  'FiSH': get_option('with-fishlim'),
+  'Sysinfo': get_option('with-sysinfo'),
+  'DCC Checksum': get_option('with-checksum'),
+}, section: 'Plugins')

plugins/perl/meson.build

@@ -28,7 +28,7 @@ endif
 
 perl = find_program(get_option('with-perl'))
 
-ret = run_command([perl, '-MExtUtils::Embed', '-e', 'ccopts'])
+ret = run_command([perl, '-MExtUtils::Embed', '-e', 'ccopts'], check: false)
 if ret.returncode() != 0
   error('perl: Failed to get cflags')
 endif
@@ -38,7 +38,7 @@ foreach flag : ret.stdout().strip().split(' ')
   endif
 endforeach
 
-ret = run_command([perl, '-MExtUtils::Embed', '-e', 'ldopts'])
+ret = run_command([perl, '-MExtUtils::Embed', '-e', 'ldopts'], check: false)
 if ret.returncode() != 0
   error('perl: Failed to get ldflags')
 endif
@@ -79,7 +79,7 @@ perl_cflags += ['-Wno-strict-prototypes']
 perl_cflags += [
   # Perl has its own 'config.h' that we must override
   # TODO: Just rename ours to something more unique.
-  '-include', meson.build_root() + '/config.h'
+  '-include', meson.project_build_root() + '/config.h'
 ]
 
 if not cc.links('''

src/fe-gtk/meson.build

@@ -167,7 +167,7 @@ emoji_ui_tests = executable('emoji_ui_tests',
   dependencies: emoji_font_deps,
 )
 test('Emoji UI Tests', emoji_ui_tests,
-  env: ['ZOITECHAT_EMOJI_FONT=' + join_paths(meson.source_root(), 'data/fonts/NotoColorEmoji.ttf')],
+  env: ['ZOITECHAT_EMOJI_FONT=' + join_paths(meson.project_source_root(), 'data/fonts/NotoColorEmoji.ttf')],
   protocol: 'tap',
   timeout: 120,
 )
@@ -291,7 +291,7 @@ emoji_font_tests = executable('emoji_font_tests',
   dependencies: emoji_font_deps,
 )
 test('Emoji Font Tests', emoji_font_tests,
-  env: ['ZOITECHAT_EMOJI_FONT=' + join_paths(meson.source_root(), 'data/fonts/NotoColorEmoji.ttf')],
+  env: ['ZOITECHAT_EMOJI_FONT=' + join_paths(meson.project_source_root(), 'data/fonts/NotoColorEmoji.ttf')],
   protocol: 'tap',
   timeout: 120,
 )