Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix meson.build deprecations up to 0.56.0 #234

Merged
merged 1 commit into from
Oct 2, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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/cinnamon-desktop
project('cinnamon-desktop', 'c', version: '5.8.0',
meson_version: '>=0.50.0'
meson_version: '>=0.56.0'
)

# Before making a release, the LT_VERSION string should be modified.
Expand Down Expand Up @@ -57,7 +57,7 @@ cinnamon_deps = [

use_alsa = get_option('alsa')

xkb_base = xkbconf.get_pkgconfig_variable('xkb_base')
xkb_base = xkbconf.get_variable(pkgconfig: 'xkb_base')

# Path to the pnp.ids file -- to know if we use one shipped with another
# package, or an internal file
Expand Down Expand Up @@ -129,7 +129,7 @@ message('\n'.join([
' sysconfdir: ' + get_option('sysconfdir'),
' localstatedir: ' + get_option('localstatedir'),
' datadir: ' + get_option('datadir'),
' source code location: ' + meson.source_root(),
' source code location: ' + meson.project_source_root(),
' compiler: ' + cc.get_id(),
' debugging support: ' + get_option('buildtype'),
' Use *_DISABLE_DEPRECATED: @0@'.format(get_option('deprecation_warnings')),
Expand Down