Meson: bump version to 0.58 and fix deprecation warnings (#400)

danirabbit · web-flow · commit 0c84381e1f40 · 2025-12-13T11:34:18.000-08:00
diff --git a/data/meson.build b/data/meson.build
@@ -1,7 +1,7 @@
 i18n.merge_file(
     input: 'system.metainfo.xml.in',
     output: 'io.elementary.settings.system.metainfo.xml',
-    po_dir: meson.source_root() / 'po' / 'extra',
+    po_dir: meson.project_source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,
     install_dir: datadir / 'metainfo',
diff --git a/meson.build b/meson.build
@@ -1,7 +1,8 @@
 project(
     'system',
     'vala', 'c',
-    version: '8.2.2'
+    version: '8.2.2',
+    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'
 )
 
diff --git a/src/meson.build b/src/meson.build
@@ -16,7 +16,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])
 
 config_data = configuration_data()
 config_data.set('GETTEXT_PACKAGE', gettext_name)

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`project(`
`2`	`2`	`'system',`
`3`	`3`	`'vala', 'c',`
`4`		`- version: '8.2.2'`
	`4`	`+ version: '8.2.2',`
	`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`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ plug_files = files(`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`switchboard_dep = dependency('switchboard-3')`
`19`		`-switchboard_plugsdir = switchboard_dep.get_pkgconfig_variable('plugsdir', define_variable: ['libdir', libdir])`
	`19`	`+switchboard_plugsdir = switchboard_dep.get_variable('plugsdir', pkgconfig_define: ['libdir', libdir])`
`20`	`20`
`21`	`21`	`config_data = configuration_data()`
`22`	`22`	`config_data.set('GETTEXT_PACKAGE', gettext_name)`