diff --git a/data/misc/meson.build b/data/misc/meson.build index 0c88f51b..00b61c37 100644 --- a/data/misc/meson.build +++ b/data/misc/meson.build @@ -2,6 +2,7 @@ appdir = join_paths(get_option('datadir'), 'applications') metainfodir = join_paths(get_option('datadir'), 'metainfo') mimedir = join_paths(get_option('datadir'), 'mime', 'packages') desktop_utils = find_program('desktop-file-validate', required: false) +appstreamcli = find_program('appstreamcli', required: false) if get_option('gtk-frontend') if get_option('install-appdata') @@ -13,7 +14,6 @@ if get_option('gtk-frontend') install_dir: metainfodir ) - appstreamcli = find_program('appstreamcli', required: false) if appstreamcli.found() test('Validate net.zoite.Zoitechat.appdata.xml', appstreamcli, args: ['validate', zoitechat_appdata] diff --git a/meson.build b/meson.build index 054074f9..7119a8e4 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('zoitechat', 'c', version: run_command('cat', 'VERSION', check: true).stdout().strip(), - meson_version: '>= 0.55.0', + meson_version: '>= 0.59.0', default_options: [ 'c_std=c17', 'buildtype=debugoptimized', diff --git a/plugins/sysinfo/meson.build b/plugins/sysinfo/meson.build index a2e4ce68..c95ebc01 100644 --- a/plugins/sysinfo/meson.build +++ b/plugins/sysinfo/meson.build @@ -26,7 +26,7 @@ if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system = sysinfo_cargs += '-DHAVE_LIBPCI' sysinfo_sources += 'unix/pci.c' - picidsdir = libpci.get_pkgconfig_variable('idsdir') + picidsdir = libpci.get_variable(pkgconfig : 'idsdir') pciids = join_paths(picidsdir, 'pci.ids') sysinfo_cargs += '-DPCIIDS_FILE="@0@"'.format(pciids) endif diff --git a/src/fe-gtk/meson.build b/src/fe-gtk/meson.build index a211b05a..63e8b79b 100644 --- a/src/fe-gtk/meson.build +++ b/src/fe-gtk/meson.build @@ -110,7 +110,7 @@ zoitechat_theme_lib = static_library('zoitechat_theme', iso_codes = dependency('iso-codes', required: false) if iso_codes.found() zoitechat_gtk_sources += 'sexy-iso-codes.c' - iso_codes_prefix = iso_codes.get_pkgconfig_variable('prefix') + iso_codes_prefix = iso_codes.get_variable(pkgconfig : 'prefix') zoitechat_gtk_cflags += '-DISO_CODES_PREFIX="@0@"'.format(iso_codes_prefix) zoitechat_gtk_cflags += '-DISO_CODES_LOCALEDIR="@0@"'.format( join_paths(iso_codes_prefix, 'share/locale')) @@ -139,7 +139,7 @@ executable('zoitechat', link_args: zoitechat_gtk_ldflags, pie: true, install: true, - gui_app: true, + win_subsystem: 'windows', ) emoji_ui_tests = executable('emoji_ui_tests',