From c0c76dbdb803a3717bcf6d18a8e8396bdadbf9b3 Mon Sep 17 00:00:00 2001 From: Rick Calixte <10281587+rcalixte@users.noreply.github.com> Date: Mon, 2 Oct 2023 13:13:57 -0400 Subject: [PATCH] Fix meson.build deprecations up to 0.56.0 (#3316) --- docs/reference/libnemo-extension/meson.build | 2 +- libnemo-extension/meson.build | 4 ++-- libnemo-private/meson.build | 2 +- meson.build | 6 +++--- src/meson.build | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/reference/libnemo-extension/meson.build b/docs/reference/libnemo-extension/meson.build index a08fa3aa0..51e5789af 100644 --- a/docs/reference/libnemo-extension/meson.build +++ b/docs/reference/libnemo-extension/meson.build @@ -10,7 +10,7 @@ configure_file( gnome.gtkdoc('libnemo-extension', main_xml: 'libnemo-extension-docs.xml', - src_dir: join_paths(meson.source_root(), 'libnemo-extension'), + src_dir: join_paths(meson.project_source_root(), 'libnemo-extension'), dependencies: nemo_extension, install: true, gobject_typesfile: 'libnemo-extension.types', diff --git a/libnemo-extension/meson.build b/libnemo-extension/meson.build index 3238f096f..5b589d32a 100644 --- a/libnemo-extension/meson.build +++ b/libnemo-extension/meson.build @@ -61,8 +61,8 @@ nemo_extension = declare_dependency( dependencies: nemo_extension_deps, ) -typelibdir = go_intr.get_pkgconfig_variable('typelibdir', - define_variable: ['libdir', join_paths(get_option('prefix'), get_option('libdir'))] +typelibdir = go_intr.get_variable(pkgconfig: 'typelibdir', + pkgconfig_define: ['libdir', join_paths(get_option('prefix'), get_option('libdir'))] ) gnome.generate_gir(nemo_extension_lib, diff --git a/libnemo-private/meson.build b/libnemo-private/meson.build index 9e91198f3..151013ddb 100644 --- a/libnemo-private/meson.build +++ b/libnemo-private/meson.build @@ -1,6 +1,6 @@ dbusBuiltSources = gnome.gdbus_codegen('nemo-generated', - join_paths(meson.source_root(), 'data', 'dbus-interfaces.xml'), + join_paths(meson.project_source_root(), 'data', 'dbus-interfaces.xml'), interface_prefix: 'org.Nemo.', namespace: 'NemoDBus', object_manager: true diff --git a/meson.build b/meson.build index 5ccb96646..1d743aaad 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ # https://github.com/linuxmint/nemo project('nemo', 'c', version: '5.8.4', - meson_version: '>=0.41.0' + meson_version: '>=0.56.0' ) # 1. If the library code has changed at all since last release, then increment revision. @@ -176,7 +176,7 @@ nemo_definitions = [ '-DLIBEXECDIR="@0@"'.format(libExecPath), ] -po_subdir = join_paths(meson.source_root(), 'po') +po_subdir = join_paths(meson.project_source_root(), 'po') subdir('install-scripts') subdir('cut-n-paste-code/libegg') @@ -196,7 +196,7 @@ message('\n'.join(['', ' @0@-@1@'.format(meson.project_name(), meson.project_version()), '', ' prefix: @0@'.format(prefix), -' source code location: @0@'.format(meson.source_root()), +' source code location: @0@'.format(meson.project_source_root()), ' compiler: @0@'.format(cc.get_id()), ' libexif support: @0@'.format(libexif_enabled), ' exempi support: @0@'.format(exempi_enabled), diff --git a/src/meson.build b/src/meson.build index 793ae38fb..c84594967 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,6 +1,6 @@ dbusBuiltSources = gnome.gdbus_codegen( 'nemo-freedesktop-generated', - join_paths(meson.source_root(), 'data', 'freedesktop-dbus-interfaces.xml'), + join_paths(meson.project_source_root(), 'data', 'freedesktop-dbus-interfaces.xml'), interface_prefix: 'org.freedesktop.', namespace: 'NemoFreedesktop', object_manager: true @@ -8,7 +8,7 @@ dbusBuiltSources = gnome.gdbus_codegen( nemoBuiltSources = gnome.gdbus_codegen( 'nemo-cinnamon-dbus', - join_paths(meson.source_root(), 'data', 'org.Cinnamon.xml'), + join_paths(meson.project_source_root(), 'data', 'org.Cinnamon.xml'), interface_prefix: 'org.', namespace: 'Nemo', object_manager: true