meson: Fix warnings (#272)

ryonakano · web-flow · commit b4e7c29649c3 · 2025-12-05T19:24:17.000-08:00
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ You'll need the following dependencies:
 * libflatpak-dev
 * libgranite-7-dev >= 7.4.0
 * libgtk-4-dev
-* meson
+* meson >= 0.58.0
 * valac
 
 Run `meson` to configure the build environment and then `ninja` to build
diff --git a/data/meson.build b/data/meson.build
@@ -7,7 +7,7 @@ gresource = gnome.compile_resources(
 i18n.merge_file(
     input: 'applications.metainfo.xml.in',
     output: 'io.elementary.settings.applications.metainfo.xml',
-    po_dir: join_paths(meson.source_root (), 'po', 'extra'),
+    po_dir: join_paths(meson.project_source_root (), 'po', 'extra'),
     install_dir: join_paths(datadir, 'metainfo'),
     install: true
 )
diff --git a/meson.build b/meson.build
@@ -1,7 +1,8 @@
 project(
     'applications',
     'vala', 'c',
-    version: '8.2.0'
+    version: '8.2.0',
+    meson_version: '>= 0.58.0'
 )
 
 gettext_name = 'io.elementary.settings.' + meson.project_name()
diff --git a/po/extra/meson.build b/po/extra/meson.build
@@ -1,5 +1,5 @@
 i18n.gettext('extra',
-    args: '--directory=' + meson.source_root(),
+    args: '--directory=' + meson.project_source_root(),
     preset: 'glib',
     install: false,
 )
diff --git a/po/meson.build b/po/meson.build
@@ -1,5 +1,5 @@
 i18n.gettext(gettext_name,
-    args: '--directory=' + meson.source_root(),
+    args: '--directory=' + meson.project_source_root(),
     preset: 'glib'
 )
 subdir('extra')
diff --git a/src/meson.build b/src/meson.build
@@ -24,7 +24,7 @@ plug_files = files(
 )
 
 switchboard_dep = dependency('switchboard-3')
-switchboard_plugsdir = switchboard_dep.get_pkgconfig_variable('plugsdir', define_variable: ['libdir', libdir])
+switchboard_plugsdir = switchboard_dep.get_variable('plugsdir', pkgconfig_define: ['libdir', libdir])
 
 shared_module(
     meson.project_name(),

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ gresource = gnome.compile_resources(`
`7`	`7`	`i18n.merge_file(`
`8`	`8`	`input: 'applications.metainfo.xml.in',`
`9`	`9`	`output: 'io.elementary.settings.applications.metainfo.xml',`
`10`		`- po_dir: join_paths(meson.source_root (), 'po', 'extra'),`
	`10`	`+ po_dir: join_paths(meson.project_source_root (), 'po', 'extra'),`
`11`	`11`	`install_dir: join_paths(datadir, 'metainfo'),`
`12`	`12`	`install: true`
`13`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`project(`
`2`	`2`	`'applications',`
`3`	`3`	`'vala', 'c',`
`4`		`- version: '8.2.0'`
	`4`	`+ version: '8.2.0',`
	`5`	`+ meson_version: '>= 0.58.0'`
`5`	`6`	`)`
`6`	`7`
`7`	`8`	`gettext_name = 'io.elementary.settings.' + meson.project_name()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`i18n.gettext('extra',`
`2`		`- args: '--directory=' + meson.source_root(),`
	`2`	`+ args: '--directory=' + meson.project_source_root(),`
`3`	`3`	`preset: 'glib',`
`4`	`4`	`install: false,`
`5`	`5`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`i18n.gettext(gettext_name,`
`2`		`- args: '--directory=' + meson.source_root(),`
	`2`	`+ args: '--directory=' + meson.project_source_root(),`
`3`	`3`	`preset: 'glib'`
`4`	`4`	`)`
`5`	`5`	`subdir('extra')`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ plug_files = files(`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`switchboard_dep = dependency('switchboard-3')`
`27`		`-switchboard_plugsdir = switchboard_dep.get_pkgconfig_variable('plugsdir', define_variable: ['libdir', libdir])`
	`27`	`+switchboard_plugsdir = switchboard_dep.get_variable('plugsdir', pkgconfig_define: ['libdir', libdir])`
`28`	`28`
`29`	`29`	`shared_module(`
`30`	`30`	`meson.project_name(),`