[tracker: 2/2] Merge branch 'wip/carlosg/two-spoonfuls-of-soup' into 'master'

[Sam Thursfield <sthursfield src gnome org>]

commit 0a4ecd9974d648f379c300abdccc87f65cffce38
Merge: a07580610 87b89b99a
Author: Sam Thursfield <sam afuera me uk>
Date:   Thu Jul 29 08:17:59 2021 +0000

    Merge branch 'wip/carlosg/two-spoonfuls-of-soup' into 'master'
    
    libtracker-sparql: Allow building against multiple versions of libsoup
    
    Closes #320
    
    See merge request GNOME/tracker!456

 config.h.meson.in                             |   3 +
 meson.build                                   |  27 ++++--
 meson_options.txt                             |   4 +-
 src/libtracker-sparql/meson.build             |  60 ++++++++++++--
 src/libtracker-sparql/remote/meson.build      |  36 --------
 src/libtracker-sparql/tracker-backend.vala    |   5 --
 src/libtracker-sparql/tracker-remote-module.c | 115 ++++++++++++++++++++++++++
 7 files changed, 195 insertions(+), 55 deletions(-)
---