[gcr/wip/nielsdg/fix-pc-requires] meson: Fix pkgconfig Requires

[Niels De Graef <nielsdg src gnome org>]

commit 74b59908cf13d642486213e3fe568f60292b5e2e
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sat Jan 4 08:51:31 2020 +0100

    meson: Fix pkgconfig Requires
    
    Meson isn't setting the "Requires" field, so we have to do it manually.
    Since we don't want to specify each dependency in `glib_deps` as a
    dependency, we also give each a separate variable.

 gck/meson.build |  1 +
 gcr/meson.build |  1 +
 meson.build     | 15 +++++++--------
 ui/meson.build  | 10 ++++++++++
 4 files changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/gck/meson.build b/gck/meson.build
index 917993f..e91ad5f 100644
--- a/gck/meson.build
+++ b/gck/meson.build
@@ -155,6 +155,7 @@ endif
 # pkg-config file
 pkgconfig.generate(gck_lib,
   description: 'GObject bindings for PKCS#11',
+  requires: [ glib_dep, gio_dep, gobject_dep, p11kit_dep ],
   subdirs: 'gck-@0@'.format(gck_major_version),
 )
 
diff --git a/gcr/meson.build b/gcr/meson.build
index 262c5cf..77f361a 100644
--- a/gcr/meson.build
+++ b/gcr/meson.build
@@ -217,6 +217,7 @@ endif
 # pkg-config file
 pkgconfig.generate(gcr_base_lib,
   subdirs: 'gcr-@0@'.format(gcr_major_version),
+  requires: [ glib_dep, gio_dep, gobject_dep, p11kit_dep, 'gck-@0@'.format(gck_major_version) ],
   description: 'GObject and GUI library for high level crypto parsing and display',
 )
 
diff --git a/meson.build b/meson.build
index 610bb9f..29297d7 100644
--- a/meson.build
+++ b/meson.build
@@ -34,14 +34,13 @@ podir = source_root / 'po'
 
 # Dependencies
 min_glib_version = '2.38'
-glib_deps = [
-  dependency('glib-2.0', version: '>=' + min_glib_version),
-  dependency('gmodule-no-export-2.0', version: '>=' + min_glib_version),
-  dependency('gthread-2.0', version: '>=' + min_glib_version),
-  dependency('gobject-2.0', version: '>=' + min_glib_version),
-  dependency('gio-2.0', version: '>=' + min_glib_version),
-  dependency('gio-unix-2.0',version: '>=' + min_glib_version),
-]
+glib_dep = dependency('glib-2.0', version: '>=' + min_glib_version)
+gmodule_dep = dependency('gmodule-no-export-2.0', version: '>=' + min_glib_version)
+gthread_dep = dependency('gthread-2.0', version: '>=' + min_glib_version)
+gobject_dep = dependency('gobject-2.0', version: '>=' + min_glib_version)
+gio_dep = dependency('gio-2.0', version: '>=' + min_glib_version)
+gio_unix_dep = dependency('gio-unix-2.0',version: '>=' + min_glib_version)
+glib_deps = [ glib_dep, gmodule_dep, gthread_dep, gobject_dep, gio_dep, gio_unix_dep, ]
 gpg_bin = find_program('gpg2', 'gpg')
 libgcrypt_dep = dependency('libgcrypt', version: '>= 1')
 p11kit_dep = dependency('p11-kit-1', version: '>= 0.19.0')
diff --git a/ui/meson.build b/ui/meson.build
index 60cc79a..9bf5aa6 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -110,14 +110,24 @@ gcr_ui_lib = shared_library(gcr_ui_basename,
   install: true,
 )
 
+gcr_ui_pkgconf_deps = [
+  glib_dep,
+  gio_dep,
+  gobject_dep,
+  'gck-@0@'.format(gck_major_version),
+  'gcr-@0@'.format(gcr_major_version),
+  gtk_dep,
+]
 pkgconfig.generate(gcr_ui_lib,
   subdirs: 'gcr-@0@'.format(gcr_major_version),
+  requires: gcr_ui_pkgconf_deps,
   description: 'GObject and GUI library for high level crypto parsing and display',
 )
 pkgconfig.generate(gcr_ui_lib,
   filebase: gcr_basename,
   name: gcr_basename,
   subdirs: 'gcr-@0@'.format(gcr_major_version),
+  requires: gcr_ui_pkgconf_deps,
   description: 'GObject and GUI library for high level crypto parsing and display',
 )