Merge branch 'master' into release-3.0.5

data/meson.build

@@ -13,7 +13,7 @@ install_data(
 i18n.merge_file(
     input: 'wingpanel.desktop.in',
     output: meson.project_name() + '.desktop',
-    po_dir: join_paths(meson.source_root(), 'po', 'extra'),
+    po_dir: join_paths(meson.project_source_root(), 'po', 'extra'),
     type: 'desktop',
     install: true,
     install_dir: join_paths(get_option('datadir'), 'applications')
@@ -22,7 +22,7 @@ i18n.merge_file(
 i18n.merge_file(
     input: 'wingpanel.appdata.xml.in',
     output: meson.project_name() + '.appdata.xml',
-    po_dir: join_paths(meson.source_root(), 'po', 'extra'),
+    po_dir: join_paths(meson.project_source_root(), 'po', 'extra'),
     type: 'xml',
     install: true,
     install_dir: join_paths(get_option('datadir'), 'metainfo'),

meson.build

@@ -2,11 +2,11 @@ project(
     'io.elementary.wingpanel',
     'c', 'vala',
     version: '3.0.5',
-    meson_version : '>= 0.57'
+    meson_version : '>= 0.58.0'
 )
 
 add_project_arguments([
-        '--vapidir=' + join_paths(meson.source_root(), 'vapi'),
+        '--vapidir=' + join_paths(meson.project_source_root(), 'vapi'),
     ],
     language: 'vala',
 )

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
 )

po/meson.build

@@ -1,5 +1,5 @@
 i18n.gettext(meson.project_name(),
-    args: ['--directory='+meson.source_root()],
+    args: ['--directory='+meson.project_source_root()],
     preset: 'glib',
 )
 

wingpanel-interface/meson.build

@@ -42,7 +42,7 @@ if mutter_dep.length() == 0
 	error ('No supported mutter library found!')
 endif
 
-mutter_typelib_dir = libmutter_dep.get_pkgconfig_variable('typelibdir')
+mutter_typelib_dir = libmutter_dep.get_variable('typelibdir')
 
 gala_dep = dependency('gala')
 m_dep = meson.get_compiler('c').find_library('m', required: false)