[geary/gnome-3-32: 5/5] Merge branch 'wip/flatpak-3-32-build-fixes' into 'gnome-3-32'

[Michael Gratton <mjog src gnome org>]

commit 43bc41f0f5795539895e8b33fcecb222ec49318a
Merge: 664cd77d 7899fff8
Author: Michael Gratton <mike vee net>
Date:   Wed Jul 17 07:34:16 2019 +0000

    Merge branch 'wip/flatpak-3-32-build-fixes' into 'gnome-3-32'
    
    Flatpak build fixes
    
    See merge request GNOME/geary!258

 .gitlab-ci.yml        | 21 +++++++++++++++++++--
 org.gnome.Geary.json  | 10 +++++++---
 test/test-engine.vala | 24 +++++++-----------------
 3 files changed, 33 insertions(+), 22 deletions(-)
---