[gnome-software/1799-build-bump-meson-dependency-version] build: Bump meson dependency version

[Milan Crha <mcrha src gnome org>]

commit b54a6e92eabab91b74e047bcadb3ec568e96b6d4
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jun 15 14:13:46 2022 +0200

    build: Bump meson dependency version
    
    This bumps the meson dependency version to 0.58 and replaces symbols
    deprecated in 0.56. As the `dep.get_variable()` positional argument
    had been introduced in 0.58, then it's used instead of the 0.56.
    
    Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1799

 data/meson.build               | 2 +-
 data/metainfo/meson.build      | 2 +-
 doc/api/meson.build            | 2 +-
 meson.build                    | 6 +++---
 plugins/epiphany/meson.build   | 2 +-
 plugins/flatpak/meson.build    | 2 +-
 plugins/fwupd/meson.build      | 2 +-
 plugins/rpm-ostree/meson.build | 2 +-
 plugins/snap/meson.build       | 2 +-
 src/meson.build                | 4 ++--
 10 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 6fd5060a6..7d0aa6dd4 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -35,7 +35,7 @@ if get_option('external_appstream')
   i18n.merge_file(
     input : out,
     output : 'org.gnome.software.external-appstream.policy',
-    po_dir: join_paths(meson.source_root(), 'po'),
+    po_dir: join_paths(meson.project_source_root(), 'po'),
     install: true,
     install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions'),
   )
diff --git a/data/metainfo/meson.build b/data/metainfo/meson.build
index 889bde1ff..addc70a3c 100644
--- a/data/metainfo/meson.build
+++ b/data/metainfo/meson.build
@@ -2,7 +2,7 @@ i18n.merge_file(
   input: 'org.gnome.Software.metainfo.xml.in',
   output: 'org.gnome.Software.metainfo.xml',
   type: 'xml',
-  po_dir: join_paths(meson.source_root(), 'po'),
+  po_dir: join_paths(meson.project_source_root(), 'po'),
   install: true,
   install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
diff --git a/doc/api/meson.build b/doc/api/meson.build
index aa8f873bd..2ccab7b05 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -1,6 +1,6 @@
 gnome.gtkdoc(
   'gnome-software',
-  src_dir : join_paths(meson.source_root(), 'lib'),
+  src_dir : join_paths(meson.project_source_root(), 'lib'),
   main_xml : 'gnome-software-docs.xml',
   html_assets : [
     'gs-example-details.png',
diff --git a/meson.build b/meson.build
index 9c109d265..d14b323e5 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project('gnome-software', 'c',
   version : '43.alpha',
   license : 'GPL-2.0+',
   default_options : ['warning_level=1', 'c_std=c11'],
-  meson_version : '>=0.55.0'
+  meson_version : '>=0.58.0'
 )
 
 conf = configuration_data()
@@ -235,7 +235,7 @@ if get_option('flatpak')
   flatpak = dependency('flatpak', version : '>= 1.9.1')
   ostree = dependency('ostree-1')
 
-  flatpak_soupapiversion = flatpak.get_pkgconfig_variable('soupapiversion')
+  flatpak_soupapiversion = flatpak.get_variable('soupapiversion')
   if flatpak_soupapiversion == ''
     flatpak_soupapiversion = '2.4' # Pre libsoup3 support
   endif
@@ -317,7 +317,7 @@ add_project_arguments('-DI_KNOW_THE_GNOME_SOFTWARE_API_IS_SUBJECT_TO_CHANGE',
 test_env = [
   'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
   'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
-  'GSETTINGS_SCHEMA_DIR=@0@/data/'.format(meson.build_root()),
+  'GSETTINGS_SCHEMA_DIR=@0@/data/'.format(meson.project_build_root()),
   'GSETTINGS_BACKEND=memory',
   'MALLOC_CHECK_=2',
 
diff --git a/plugins/epiphany/meson.build b/plugins/epiphany/meson.build
index 1ae98eb6f..05fc7b6e4 100644
--- a/plugins/epiphany/meson.build
+++ b/plugins/epiphany/meson.build
@@ -31,7 +31,7 @@ i18n.merge_file(
   input: metainfo + '.in',
   output: metainfo,
   type: 'xml',
-  po_dir: join_paths(meson.source_root(), 'po'),
+  po_dir: join_paths(meson.project_source_root(), 'po'),
   install: true,
   install_dir: join_paths(get_option('datadir'), 'metainfo'),
 )
diff --git a/plugins/flatpak/meson.build b/plugins/flatpak/meson.build
index d0da92cd8..6a0baedf3 100644
--- a/plugins/flatpak/meson.build
+++ b/plugins/flatpak/meson.build
@@ -34,7 +34,7 @@ i18n.merge_file(
   input: metainfo + '.in',
   output: metainfo,
   type: 'xml',
-  po_dir: join_paths(meson.source_root(), 'po'),
+  po_dir: join_paths(meson.project_source_root(), 'po'),
   install: true,
   install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
diff --git a/plugins/fwupd/meson.build b/plugins/fwupd/meson.build
index 32a7adc83..8ed030ba4 100644
--- a/plugins/fwupd/meson.build
+++ b/plugins/fwupd/meson.build
@@ -30,7 +30,7 @@ i18n.merge_file(
   input: metainfo + '.in',
   output: metainfo,
   type: 'xml',
-  po_dir: join_paths(meson.source_root(), 'po'),
+  po_dir: join_paths(meson.project_source_root(), 'po'),
   install: true,
   install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
diff --git a/plugins/rpm-ostree/meson.build b/plugins/rpm-ostree/meson.build
index 5244cdd6b..724556e94 100644
--- a/plugins/rpm-ostree/meson.build
+++ b/plugins/rpm-ostree/meson.build
@@ -17,7 +17,7 @@ shared_module(
   ],
   install : true,
   install_dir: plugin_dir,
-  install_rpath: join_paths(rpm_ostree.get_pkgconfig_variable('libdir'), 'rpm-ostree'),
+  install_rpath: join_paths(rpm_ostree.get_variable('libdir'), 'rpm-ostree'),
   c_args : cargs,
   dependencies : [ plugin_libs, libdnf, ostree, rpm, rpm_ostree ],
 )
diff --git a/plugins/snap/meson.build b/plugins/snap/meson.build
index 2bd8d25ce..eceee1a78 100644
--- a/plugins/snap/meson.build
+++ b/plugins/snap/meson.build
@@ -20,7 +20,7 @@ i18n.merge_file(
   input: metainfo + '.in',
   output: metainfo,
   type: 'xml',
-  po_dir: join_paths(meson.source_root(), 'po'),
+  po_dir: join_paths(meson.project_source_root(), 'po'),
   install: true,
   install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
diff --git a/src/meson.build b/src/meson.build
index 3e866ee47..967159405 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -196,7 +196,7 @@ i18n.merge_file(
     ),
   output: application_id + '.desktop',
   type: 'desktop',
-  po_dir: join_paths(meson.source_root(), 'po'),
+  po_dir: join_paths(meson.project_source_root(), 'po'),
   install: true,
   install_dir: join_paths(get_option('datadir'), 'applications')
 )
@@ -205,7 +205,7 @@ i18n.merge_file(
   input: 'gnome-software-local-file.desktop.in',
   output: 'gnome-software-local-file.desktop',
   type: 'desktop',
-  po_dir: join_paths(meson.source_root(), 'po'),
+  po_dir: join_paths(meson.project_source_root(), 'po'),
   install: true,
   install_dir: join_paths(get_option('datadir'), 'applications')
 )