From d7223eef80e010888debc133fe8418fbc6ba0f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 27 May 2025 11:46:13 -0700 Subject: [PATCH 1/2] FuzzySearch: replace deprecated meson.source_root --- plugins/fuzzy-search/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/fuzzy-search/meson.build b/plugins/fuzzy-search/meson.build index 5a717fcd1f..94a6622c59 100644 --- a/plugins/fuzzy-search/meson.build +++ b/plugins/fuzzy-search/meson.build @@ -29,7 +29,7 @@ custom_target(module_name + '.plugin_merge', '--desktop', '--keyword=Description', '--keyword=Name', - '-d' + join_paths(meson.source_root (), 'po', 'plugins'), + '-d' + join_paths(meson.project_source_root (), 'po', 'plugins'), '--template=@INPUT@', '-o@OUTPUT@', ], From 38434d0af178186285edc803b133453fdd833691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 27 May 2025 11:47:05 -0700 Subject: [PATCH 2/2] Meson Options: fix deprecated bool is string --- meson_options.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index a299238b52..a18f17e425 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,3 @@ -option ('plugins', type : 'boolean', value : true) -option('have_pkexec', type : 'boolean', value : 'true', description : 'Allow launching with pkexec. Should not be used in FlatPak') +option('plugins', type : 'boolean', value : true) +option('have_pkexec', type : 'boolean', value : true, description : 'Allow launching with pkexec. Should not be used in FlatPak') option('development', type : 'boolean', value : false, description : 'Build is a development branch')