From df1c74a91dab7d866f2fef59626eb4946804a8b3 Mon Sep 17 00:00:00 2001 From: Christopher Byrne Date: Mon, 7 Sep 2026 20:17:25 -0500 Subject: [PATCH 1/3] data/misc/meson.build: Fix referencing possibly undefined variable "appstreamcli" If meson is passed -Dinstall-plugin-metainfo=false, the "appstreamcli" will not be defined, but it is later referenced in global scope, which causes and "undefined variable" error in Meson Signed-off-by: Christopher Byrne --- data/misc/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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] From 5018a3a8481771cf04b66232e58a2d0fdf764fcc Mon Sep 17 00:00:00 2001 From: Christopher Byrne Date: Mon, 7 Sep 2026 20:23:34 -0500 Subject: [PATCH 2/3] meson.build: Reflect usage of 0.59 Meson features src/fe-gtk/meson.build calls feature_opt.allowed() which wasn't added until 0.59. Signed-off-by: Christopher Byrne --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1f981fc8..880d9a76 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', From 040021ee0e7d8384a090da8c76aed0ad12eec2de Mon Sep 17 00:00:00 2001 From: Christopher Byrne Date: Mon, 7 Sep 2026 20:41:14 -0500 Subject: [PATCH 3/3] buuld: Fix deprecated features since 0.56 Now the the minimum is 0.59, silence some warning in Meson: dependency.get_pkgconfig_variable becomes depenency.get_variable(pkgconfig: 'var_name') executable(gui_app = true) becomes executable(win_subsystem = 'windows') Signed-off-by: Christopher Byrne --- plugins/sysinfo/meson.build | 2 +- src/fe-gtk/meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 58fe941e..95fd5da7 100644 --- a/src/fe-gtk/meson.build +++ b/src/fe-gtk/meson.build @@ -107,7 +107,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')) @@ -136,7 +136,7 @@ executable('zoitechat', link_args: zoitechat_gtk_ldflags, pie: true, install: true, - gui_app: true, + win_subsystem: 'windows', ) theme_manager_policy_tests = executable('theme_manager_policy_tests',