[geary: 6/6] Merge branch 'mjog/build-updates' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit e23f2cde66a50fc9973084196e422cea889b9dc5
Merge: eb5bc14af b0ad8274a
Author: Michael Gratton <mike vee net>
Date:   Mon Jul 26 12:15:31 2021 +0000

    Merge branch 'mjog/build-updates' into 'mainline'
    
    Misc build fixes
    
    See merge request GNOME/geary!703

 meson.build                                        |  1 -
 org.gnome.Geary.json                               | 19 +------------------
 org.gnome.Geary.yaml                               | 16 +---------------
 .../application-certificate-manager.vala           | 22 +++-------------------
 src/client/meson.build                             |  1 -
 src/meson.build                                    |  5 -----
 6 files changed, 5 insertions(+), 59 deletions(-)
---
diff --cc meson.build
index b6a759527,3aa793992..d2b491bcb
--- a/meson.build
+++ b/meson.build
@@@ -92,9 -92,9 +92,8 @@@ json_glib = dependency('json-glib-1.0'
  libhandy = dependency('libhandy-1', version: '>= 1.2.1', required: false)
  libmath = cc.find_library('m')
  libpeas = dependency('libpeas-1.0', version: '>= 1.24.0')
- libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.24.0')
  libsecret = dependency('libsecret-1', version: '>= 0.11')
  libstemmer_dep = cc.find_library('stemmer')
 -libsoup = dependency('libsoup-2.4', version: '>= 2.48')
  libunwind_dep = dependency(
    'libunwind', version: '>= 1.1', required: get_option('libunwind')
  )
diff --cc src/client/meson.build
index ba151e420,d9e00aab6..e6d4a8b4f
--- a/src/client/meson.build
+++ b/src/client/meson.build
@@@ -166,8 -166,8 +166,7 @@@ client_dependencies = 
    libhandy,
    libmath,
    libpeas,
-   libpeas_gtk,
    libsecret,
 -  libsoup,
    libxml,
    posix,
    webkit2gtk,