Skip to content

Commit

Permalink
Fix meson deprecations (#282)
Browse files Browse the repository at this point in the history
  • Loading branch information
danirabbit authored Aug 23, 2024
1 parent 564089f commit 989c1ec
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You'll need the following dependencies:
* libgranite-dev
* libgtk-3-dev
* libwingpanel-dev
* meson
* meson >= 0.58.0
* valac

Run `meson` to configure the build environment and then `ninja` to build
Expand Down
9 changes: 5 additions & 4 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
project(
'notifications',
'vala', 'c',
version: '7.1.1'
version: '7.1.1',
meson_version: '>= 0.58.0'
)

gettext_name = meson.project_name() + '-indicator'
gnome = import('gnome')
i18n = import('i18n')

prefix = get_option('prefix')
libdir = join_paths(prefix, get_option('libdir'))
libdir = prefix / get_option('libdir')

add_global_arguments(
'-DGETTEXT_PACKAGE="@0@"'.format(gettext_name),
Expand All @@ -25,11 +26,11 @@ gresource = gnome.compile_resources(
)

wingpanel_dep = dependency('wingpanel')
wingpanel_indicatorsdir = wingpanel_dep.get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir])
wingpanel_indicatorsdir = wingpanel_dep.get_variable('indicatorsdir', pkgconfig_define: ['libdir', libdir])

config_data = configuration_data()
config_data.set('GETTEXT_PACKAGE', meson.project_name() + '-indicator')
config_data.set('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
config_data.set('LOCALEDIR', prefix / get_option('localedir'))
config_vala = configure_file(
input: 'src/Config.vala.in',
output: '@BASENAME@',
Expand Down
2 changes: 1 addition & 1 deletion po/extra/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
i18n.gettext('extra',
args: ['--directory='+meson.source_root(), '--from-code=UTF-8'],
args: ['--directory='+meson.project_source_root(), '--from-code=UTF-8'],
install: false,
)
2 changes: 1 addition & 1 deletion po/meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
i18n.gettext(gettext_name,
args: '--directory=' + meson.source_root(),
args: '--directory=' + meson.project_source_root(),
preset: 'glib'
)

Expand Down

0 comments on commit 989c1ec

Please sign in to comment.