From 1cc4f50afc2cf37a74d988192002bb481eefb672 Mon Sep 17 00:00:00 2001 From: stsdc <6031763+stsdc@users.noreply.github.com> Date: Sat, 6 Dec 2025 23:51:38 +0100 Subject: [PATCH 1/3] Remove deprecated functions in meson files --- data/meson.build | 4 ++-- src/Indicator/meson.build | 2 +- tests/meson.build | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/meson.build b/data/meson.build index 8f5396eee..d3175bd30 100644 --- a/data/meson.build +++ b/data/meson.build @@ -32,7 +32,7 @@ install_data( i18n.merge_file( input: 'monitor.desktop.in', output: meson.project_name() + '.desktop', - po_dir: meson.source_root() / 'po' / 'extra', + po_dir: meson.project_source_root() / 'po' / 'extra', type: 'desktop', install: true, install_dir: datadir / 'applications' @@ -41,7 +41,7 @@ i18n.merge_file( i18n.merge_file( input: meson.project_name() + '.metainfo.xml.in', output: meson.project_name() + '.metainfo.xml', - po_dir: join_paths(meson.source_root(), 'po', 'extra'), + po_dir: meson.project_source_root() / 'po' / 'extra', install: true, install_dir: join_paths(datadir, 'metainfo') ) diff --git a/src/Indicator/meson.build b/src/Indicator/meson.build index 6f946c975..95c64f337 100644 --- a/src/Indicator/meson.build +++ b/src/Indicator/meson.build @@ -21,5 +21,5 @@ shared_module( icons_gresource, dependencies: indicator_dependencies, install: true, - install_dir : wingpanel_dep.get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir]), + install_dir: wingpanel_dep.get_variable('indicatorsdir', pkgconfig_define: ['libdir', libdir]) ) diff --git a/tests/meson.build b/tests/meson.build index 2ecbde14f..0005473c8 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -4,9 +4,9 @@ test_sources = files(run_command('list-src.sh', check: true).stdout().strip().sp test( 'monitor-statusbar-test', executable('monitor-statusbar-test', test_sources, [ - meson.source_root() / 'src/Widgets/Statusbar/Statusbar.vala', - meson.source_root() / 'src/Resources/ResourcesSerialized.vala', - meson.source_root() / 'src/Utils.vala' + meson.project_source_root() / 'src/Widgets/Statusbar/Statusbar.vala', + meson.project_source_root() / 'src/Resources/ResourcesSerialized.vala', + meson.project_source_root() / 'src/Utils.vala' ], project_config, dependencies: app_dependencies), From acc23860c41d96bc24201478350d091da7ed492e Mon Sep 17 00:00:00 2001 From: stsdc <6031763+stsdc@users.noreply.github.com> Date: Sun, 7 Dec 2025 16:50:01 +0100 Subject: [PATCH 2/3] Add meson version requirement to project definition --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ee763725f..5f6d31383 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('io.elementary.monitor', 'vala', 'c', version: '8.0.1') +project('io.elementary.monitor', 'vala', 'c', version: '8.0.1', meson_version: '>=0.59') # these are Meson modules gnome = import('gnome') @@ -13,6 +13,7 @@ icondir = join_paths(datadir, 'icons', 'hicolor') vapidir = meson.current_source_dir() / 'vapi/' add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), language: 'c') +add_global_arguments(['-w'], language: 'c') add_project_arguments(['--vapidir', vapidir], language: 'vala') From 58318c7b15578d2dd640c97ffae528c9529401c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw?= <6031763+stsdc@users.noreply.github.com> Date: Mon, 8 Dec 2025 17:54:14 +0100 Subject: [PATCH 3/3] Remove debug arguments --- meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build index 5f6d31383..1d1f7f0d1 100644 --- a/meson.build +++ b/meson.build @@ -13,7 +13,6 @@ icondir = join_paths(datadir, 'icons', 'hicolor') vapidir = meson.current_source_dir() / 'vapi/' add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), language: 'c') -add_global_arguments(['-w'], language: 'c') add_project_arguments(['--vapidir', vapidir], language: 'vala')