From 2a8343057211686d70c46d6efe2f60a9c0e30403 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 23 Jul 2020 09:22:51 +1000 Subject: [PATCH] meson.build: fix pkgconfig deprecation warning ../meson.build:239: DEPRECATION: Library xkbcommon was passed to the "libraries" keyword argument of a previous call to generate() method instead of first positional argument. Adding xkbcommon to "Requires" field, but this is a deprecated behaviour that will change in a future version of Meson. Please report the issue if this warning cannot be avoided in your case. This was introduced in meson 0.49.0 Signed-off-by: Peter Hutterer --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index bd42210..7f566e8 100644 --- a/meson.build +++ b/meson.build @@ -7,7 +7,7 @@ project( 'warning_level=2', 'b_lundef=true', ], - meson_version : '>= 0.41.0', + meson_version : '>= 0.49.0', ) pkgconfig = import('pkgconfig') cc = meson.get_compiler('c') @@ -237,9 +237,9 @@ install_headers( subdir: 'xkbcommon', ) pkgconfig.generate( + libxkbcommon, name: 'xkbcommon', filebase: 'xkbcommon', - libraries: libxkbcommon, version: meson.project_version(), description: 'XKB API common to servers and clients', ) @@ -290,9 +290,9 @@ You can disable X11 support with -Denable-x11=false.''') subdir: 'xkbcommon', ) pkgconfig.generate( + libxkbcommon_x11, name: 'xkbcommon-x11', filebase: 'xkbcommon-x11', - libraries: libxkbcommon_x11, version: meson.project_version(), description: 'XKB API common to servers and clients - X11 support', requires: ['xkbcommon'], @@ -331,9 +331,9 @@ if get_option('enable-xkbregistry') subdir: 'xkbcommon', ) pkgconfig.generate( + libxkbregistry, name: 'xkbregistry', filebase: 'xkbregistry', - libraries: libxkbregistry, version: meson.project_version(), description: 'XKB API to query available rules, models, layouts, variants and options', )