Skip to content

Commit

Permalink
Fix meson.build deprecations up to 0.56.0 (#3316)
Browse files Browse the repository at this point in the history
  • Loading branch information
rcalixte authored Oct 2, 2023
1 parent 9a13a25 commit c0c76db
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion docs/reference/libnemo-extension/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions libnemo-extension/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion libnemo-private/meson.build
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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')
Expand All @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions src/meson.build
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
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
)

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
Expand Down

0 comments on commit c0c76db

Please sign in to comment.