[sysprof: 1/2] meson: Fix pkgconfig generation

[Christian Hergert <chergert src gnome org>]

commit f0303f4b689ffeb86d7c2a0d986b1d4774e2df61
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Thu Oct 1 09:52:09 2020 -0400

    meson: Fix pkgconfig generation
    
    This fix error when gio is a subproject, when there is pc file
    assotiated for objects in libraries_private meson automatically promote
    them to requires.
    
    Also remove some values that are already the default.

 src/libsysprof-capture/meson.build | 5 +----
 src/libsysprof-ui/meson.build      | 5 +----
 src/libsysprof/meson.build         | 6 +-----
 3 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/src/libsysprof-capture/meson.build b/src/libsysprof-capture/meson.build
index 961e2ce..6343165 100644
--- a/src/libsysprof-capture/meson.build
+++ b/src/libsysprof-capture/meson.build
@@ -66,12 +66,9 @@ if not meson.is_subproject()
   pkgconfig.generate(
                  libsysprof_capture,
         subdirs: [ sysprof_header_subdir ],
-        version: meson.project_version(),
-           name: 'sysprof-capture-@0@'.format(libsysprof_api_version),
-       filebase: 'sysprof-capture-@0@'.format(libsysprof_api_version),
     description: 'The static capture library for tools that generate profiling capture data',
     install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
       variables: [ 'datadir=' + datadir_for_pc_file ],
-    requires_private: libsysprof_capture_deps,
+    libraries_private: libsysprof_capture_deps,
   )
 endif
diff --git a/src/libsysprof-ui/meson.build b/src/libsysprof-ui/meson.build
index 7aac541..4a84a6c 100644
--- a/src/libsysprof-ui/meson.build
+++ b/src/libsysprof-ui/meson.build
@@ -125,13 +125,10 @@ libsysprof_ui_dep = declare_dependency(
 pkgconfig.generate(
                libsysprof_ui,
       subdirs: [ sysprof_header_subdir ],
-      version: meson.project_version(),
-         name: 'sysprof-ui-@0@'.format(libsysprof_api_version),
-     filebase: 'sysprof-ui-@0@'.format(libsysprof_api_version),
   description: 'The UI library for GTK applications embedding sysprof',
   install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
      requires: [ 'gio-2.0', 'gtk+-3.0' ],
-     requires_private: libsysprof_ui_pkg_deps,
+     libraries_private: libsysprof_ui_pkg_deps,
      variables: [
        'datadir=' + datadir_for_pc_file,
      ],
diff --git a/src/libsysprof/meson.build b/src/libsysprof/meson.build
index d485414..3357702 100644
--- a/src/libsysprof/meson.build
+++ b/src/libsysprof/meson.build
@@ -173,14 +173,10 @@ libsysprof_dep = declare_dependency(
 pkgconfig.generate(
                libsysprof,
       subdirs: [ sysprof_header_subdir ],
-      version: meson.project_version(),
-         name: 'sysprof-@0@'.format(libsysprof_api_version),
-     filebase: 'sysprof-@0@'.format(libsysprof_api_version),
   description: 'The library for console applications embedding sysprof',
   install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
      requires: [ 'gio-2.0' ],
-     requires_private: libsysprof_pkg_deps,
-    libraries_private: libsysprof_libs_private,
+    libraries_private: [libsysprof_libs_private, libsysprof_pkg_deps],
      variables: [
        'datadir=' + datadir_for_pc_file,
      ],