Skip to content

Commit 5df5051

Browse files
authored
Fix meson.build deprecations up to 0.56.0 (#172)
1 parent 0ab6db8 commit 5df5051

4 files changed

Lines changed: 7 additions & 6 deletions

File tree

docs/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ subdir('xml')
33
gnome.gtkdoc('libxapp',
44
install: true,
55
src_dir: [
6-
join_paths(meson.source_root(), 'libxapp'),
7-
join_paths(meson.build_root(), 'libxapp'),
6+
join_paths(meson.project_source_root(), 'libxapp'),
7+
join_paths(meson.project_build_root(), 'libxapp'),
88
],
99
dependencies: libxapp_dep,
1010
gobject_typesfile: 'libxapp.types',

libxapp/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,6 @@ if not app_lib_only
157157
include_directories: [top_inc],
158158
dependencies: [gtk3_dep, libxapp_dep],
159159
install: true,
160-
install_dir: join_paths(gtk3_dep.get_pkgconfig_variable('libdir'),'gtk-3.0','modules')
160+
install_dir: join_paths(gtk3_dep.get_variable(pkgconfig: 'libdir'),'gtk-3.0','modules')
161161
)
162162
endif

meson.build

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ project('xapp',
22
'c',
33
version : '2.6.1',
44
default_options : [ 'buildtype=debugoptimized' ],
5+
meson_version : '>=0.56.0'
56
)
67

78
gnome = import('gnome')
89
pkg = import('pkgconfig')
910
i18n = import('i18n')
1011

11-
dbus_services_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir',
12-
define_variable: ['datadir', get_option('datadir')])
12+
dbus_services_dir = dependency('dbus-1').get_variable(pkgconfig: 'session_bus_services_dir',
13+
pkgconfig_define: ['datadir', get_option('datadir')])
1314
sn_watcher_dir = join_paths(get_option('prefix'), get_option('libdir'), 'xapps')
1415

1516
cdata = configuration_data()

status-applets/mate/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ i18n.merge_file(
5151
input: def_file,
5252
output: 'org.x.MateXAppStatusApplet.mate-panel-applet',
5353
type: 'desktop',
54-
po_dir: join_paths(meson.source_root(), 'po'),
54+
po_dir: join_paths(meson.project_source_root(), 'po'),
5555
install: true,
5656
install_dir: join_paths(get_option('datadir'), 'mate-panel', 'applets')
5757
)

0 commit comments

Comments
 (0)