Skip to content

Commit c0c76db

Browse files
authored
Fix meson.build deprecations up to 0.56.0 (#3316)
1 parent 9a13a25 commit c0c76db

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

docs/reference/libnemo-extension/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ configure_file(
1010

1111
gnome.gtkdoc('libnemo-extension',
1212
main_xml: 'libnemo-extension-docs.xml',
13-
src_dir: join_paths(meson.source_root(), 'libnemo-extension'),
13+
src_dir: join_paths(meson.project_source_root(), 'libnemo-extension'),
1414
dependencies: nemo_extension,
1515
install: true,
1616
gobject_typesfile: 'libnemo-extension.types',

libnemo-extension/meson.build

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ nemo_extension = declare_dependency(
6161
dependencies: nemo_extension_deps,
6262
)
6363

64-
typelibdir = go_intr.get_pkgconfig_variable('typelibdir',
65-
define_variable: ['libdir', join_paths(get_option('prefix'), get_option('libdir'))]
64+
typelibdir = go_intr.get_variable(pkgconfig: 'typelibdir',
65+
pkgconfig_define: ['libdir', join_paths(get_option('prefix'), get_option('libdir'))]
6666
)
6767

6868
gnome.generate_gir(nemo_extension_lib,

libnemo-private/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
dbusBuiltSources = gnome.gdbus_codegen('nemo-generated',
3-
join_paths(meson.source_root(), 'data', 'dbus-interfaces.xml'),
3+
join_paths(meson.project_source_root(), 'data', 'dbus-interfaces.xml'),
44
interface_prefix: 'org.Nemo.',
55
namespace: 'NemoDBus',
66
object_manager: true

meson.build

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# https://github.com/linuxmint/nemo
44
project('nemo', 'c', version: '5.8.4',
5-
meson_version: '>=0.41.0'
5+
meson_version: '>=0.56.0'
66
)
77

88
# 1. If the library code has changed at all since last release, then increment revision.
@@ -176,7 +176,7 @@ nemo_definitions = [
176176
'-DLIBEXECDIR="@0@"'.format(libExecPath),
177177
]
178178

179-
po_subdir = join_paths(meson.source_root(), 'po')
179+
po_subdir = join_paths(meson.project_source_root(), 'po')
180180

181181
subdir('install-scripts')
182182
subdir('cut-n-paste-code/libegg')
@@ -196,7 +196,7 @@ message('\n'.join(['',
196196
' @0@-@1@'.format(meson.project_name(), meson.project_version()),
197197
'',
198198
' prefix: @0@'.format(prefix),
199-
' source code location: @0@'.format(meson.source_root()),
199+
' source code location: @0@'.format(meson.project_source_root()),
200200
' compiler: @0@'.format(cc.get_id()),
201201
' libexif support: @0@'.format(libexif_enabled),
202202
' exempi support: @0@'.format(exempi_enabled),

src/meson.build

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
dbusBuiltSources = gnome.gdbus_codegen(
22
'nemo-freedesktop-generated',
3-
join_paths(meson.source_root(), 'data', 'freedesktop-dbus-interfaces.xml'),
3+
join_paths(meson.project_source_root(), 'data', 'freedesktop-dbus-interfaces.xml'),
44
interface_prefix: 'org.freedesktop.',
55
namespace: 'NemoFreedesktop',
66
object_manager: true
77
)
88

99
nemoBuiltSources = gnome.gdbus_codegen(
1010
'nemo-cinnamon-dbus',
11-
join_paths(meson.source_root(), 'data', 'org.Cinnamon.xml'),
11+
join_paths(meson.project_source_root(), 'data', 'org.Cinnamon.xml'),
1212
interface_prefix: 'org.',
1313
namespace: 'Nemo',
1414
object_manager: true

0 commit comments

Comments
 (0)