[librest: 2/3] Fix merge conflicts.

[Günther Wagner <gwagner src gnome org>]

commit 7b3285507d2d01acf293223fba275011636aeb07
Merge: 7e645d0 85bd00a
Author: CodedOre <25259-CodedOre users noreply gitlab gnome org>
Date:   Thu Jan 13 11:36:29 2022 +0000

    Fix merge conflicts.

 .gitlab-ci.yml                                     |   3 +-
 AUTHORS                                            |   1 +
 ChangeLog                                          |   0
 INSTALL                                            | 237 ------
 Makefile.am                                        |  36 -
 NEWS                                               |   5 +
 autogen.sh                                         |  24 -
 build/Makefile.am                                  |   1 -
 build/introspection.m4                             |  94 ---
 configure.ac                                       | 161 -----
 docs/Makefile.am                                   |   1 -
 docs/librest.toml.in                               |   6 +-
 docs/meson.build                                   |  17 +-
 docs/reference/Makefile.am                         |   1 -
 docs/reference/rest/Makefile.am                    |  92 ---
 docs/reference/rest/meson.build                    |  26 -
 docs/reference/rest/rest-docs.xml                  |  51 --
 docs/reference/rest/rest-overrides.txt             |   0
 docs/reference/rest/rest-sections.txt              | 303 --------
 docs/reference/rest/rest.types                     |  12 -
 examples/Makefile.am                               |  13 -
 examples/gitlab-oauth2-example.c                   | 148 ++++
 examples/meson.build                               |   1 +
 meson.build                                        |  28 +-
 meson_options.txt                                  |   7 +-
 rest-extras/Makefile.am                            |  79 --
 rest-extras/flickr-proxy-call.c                    |  73 +-
 rest-extras/flickr-proxy-call.h                    |  39 +-
 rest-extras/flickr-proxy.c                         | 174 +++--
 rest-extras/flickr-proxy.h                         |  93 +--
 rest-extras/lastfm-proxy-call.c                    |  16 +-
 rest-extras/lastfm-proxy-call.h                    |   6 +-
 rest-extras/lastfm-proxy.c                         | 132 ++--
 rest-extras/lastfm-proxy.h                         |  75 +-
 rest-extras/meson.build                            |   3 +
 rest-extras/youtube-proxy.c                        |  79 +-
 rest-extras/youtube-proxy.h                        |  68 +-
 rest/Makefile.am                                   | 139 ----
 rest/meson.build                                   |  28 +-
 rest/oauth-proxy-call.c                            |  53 +-
 rest/oauth-proxy-private.h                         |  45 --
 rest/oauth-proxy.c                                 | 119 ++-
 rest/oauth-proxy.h                                 | 151 ++--
 rest/oauth2-proxy-call.c                           |  68 --
 rest/oauth2-proxy-call.h                           |  49 --
 rest/oauth2-proxy.c                                | 397 ----------
 rest/oauth2-proxy.h                                |  95 ---
 rest/rest-oauth2-proxy-call.c                      |  62 ++
 .../rest-oauth2-proxy-call.h                       |  26 +-
 rest/rest-oauth2-proxy.c                           | 802 +++++++++++++++++++++
 rest/rest-oauth2-proxy.h                           | 101 +++
 rest/rest-param.c                                  |   2 +-
 rest/rest-params.c                                 | 196 +++--
 rest/rest-params.h                                 |  52 +-
 rest/rest-pkce-code-challenge.c                    | 121 ++++
 rest/rest-pkce-code-challenge.h                    |  44 ++
 rest/rest-proxy-call.c                             |  20 +-
 rest/rest-proxy.c                                  |  73 +-
 rest/rest-proxy.h                                  |  61 +-
 rest/rest-utils.c                                  |  44 ++
 .../flickr-proxy-private.h => rest/rest-utils.h    |  24 +-
 rest/rest-xml-node.h                               |  34 +-
 rest/rest-xml-parser.h                             |  19 +-
 rest/rest.h                                        |  35 +
 tests/Makefile.am                                  |  18 -
 tests/flickr.c                                     |  13 +
 tests/helper/test-server.c                         | 121 ++++
 .../helper/test-server.h                           |  30 +-
 tests/meson.build                                  |  11 +-
 tests/oauth2.c                                     | 333 ++++++++-
 tests/params.c                                     | 141 ++++
 tests/proxy-continuous.c                           |   2 +-
 tests/proxy.c                                      | 393 +++++-----
 tests/test-media.png                               | Bin 0 -> 2509 bytes
 tests/threaded.c                                   |   2 +-
 75 files changed, 3032 insertions(+), 2997 deletions(-)
---
diff --cc rest-extras/meson.build
index 241bc73,cf14ee8..159676b
--- a/rest-extras/meson.build
+++ b/rest-extras/meson.build
@@@ -52,16 -54,9 +54,17 @@@ if get_option('introspection'
      nsversion: librest_api_version,
      includes: [ 'GObject-2.0', 'Gio-2.0', 'Soup-@0@'.format(libsoup_api_version), librest_gir[0] ],
      extra_args: [ '--accept-unprefixed' ],
+     dependencies: librest_extras_deps,
      install: true,
    )
 +  
 +  if get_option('vapi')
 +    librest_extras_vapi = gnome.generate_vapi(librest_extras_pkg_string,
 +      sources: librest_extras_gir [0],
 +      packages: [ 'glib-2.0', 'libsoup-@0@'.format(libsoup_api_version), librest_vapi ],
 +      install: true,
 +    )
 +  endif
  endif
  
  # Test suite
diff --cc rest/meson.build
index 136416f,58dfbd8..868c239
--- a/rest/meson.build
+++ b/rest/meson.build
@@@ -84,14 -96,8 +96,15 @@@ if get_option('introspection'
      extra_args: librest_gir_extra_args,
      install: true,
    )
 -
+   rest_dep_sources += librest_gir
 +
 +  if get_option('vapi')
 +    librest_vapi = gnome.generate_vapi(librest_pkg_string,
 +      sources: librest_gir [0],
 +      packages: [ 'glib-2.0', 'libsoup-@0@'.format(libsoup_api_version) ],
 +      install: true,
 +    )
 +  endif
  endif
  
  librest_dep = declare_dependency(