From 2a3f0fd741e639a62385b205f75a270c438cb17e Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 31 Jan 2020 18:11:34 +0000 Subject: [PATCH] libmalcontent: Rework pkg-config file generation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Meson 0.49 has matured its pkg-config file generation a little, and the API has subtly changed. The main library we’re building a pkg-config file for is now passed as the first argument; and all dependencies can be passed to `libraries`/`libraries_private`. Any dependencies which provide pkg-config files will automatically be moved into the pkg-config file’s `Requires`/`Requires.private` sections. See https://mesonbuild.com/Pkgconfig-module.html#implicit-dependencies This bumps our Meson dependency to ≥ 0.49.0. Signed-off-by: Philip Withnall --- libmalcontent/meson.build | 7 +++---- meson.build | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libmalcontent/meson.build b/libmalcontent/meson.build index e592f11..1aa0c45 100644 --- a/libmalcontent/meson.build +++ b/libmalcontent/meson.build @@ -46,15 +46,14 @@ install_headers(libmalcontent_headers, subdir: libmalcontent_include_subdir, ) -pkgconfig.generate( - libraries: [ libmalcontent ], +pkgconfig.generate(libmalcontent, subdirs: libmalcontent_api_name, version: meson.project_version(), name: 'libmalcontent', filebase: libmalcontent_api_name, description: 'Library providing access to parental control settings.', - requires: libmalcontent_public_deps, - requires_private: libmalcontent_private_deps, + libraries: libmalcontent_public_deps, + libraries_private: libmalcontent_private_deps, ) gnome.generate_gir(libmalcontent, diff --git a/meson.build b/meson.build index ea9fea2..d39a95f 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('malcontent', 'c', version : '0.4.0', - meson_version : '>= 0.47.0', + meson_version : '>= 0.49.0', license: 'LGPLv2.1+', default_options : [ 'buildtype=debugoptimized',