[gnome-software: 11/11] Merge branch 'refactor-appstream-plugins' into 'master'

[Milan Crha <mcrha src gnome org>]

commit 811e11feea71294e599eeb24a31e4a2f9da4bc01
Merge: f8665bd30 36d9b7a71
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jun 10 12:20:04 2021 +0000

    Merge branch 'refactor-appstream-plugins' into 'master'
    
    Move external-appstream plugin and appstream utils into core
    
    See merge request GNOME/gnome-software!783

 .../gs-install-appstream.c                         |   0
 gs-install-appstream/meson.build                   |  18 +++
 {plugins/core => lib}/gs-appstream.c               |  45 +++----
 {plugins/core => lib}/gs-appstream.h               |  18 +--
 .../gs-external-appstream-utils.c                  | 139 +++++++++++----------
 .../gs-external-appstream-utils.h                  |   8 +-
 lib/gs-plugin-loader.c                             |  37 +++---
 lib/gs-plugin-loader.h                             |   2 -
 lib/gs-plugin-private.h                            |   2 -
 lib/gs-plugin.c                                    |  45 -------
 lib/gs-plugin.h                                    |   1 -
 lib/meson.build                                    |   8 +-
 meson.build                                        |   4 +
 plugins/core/gs-plugin-appstream.c                 |  27 ++--
 plugins/core/meson.build                           |   2 -
 plugins/dummy/gs-self-test.c                       |   3 +-
 .../gs-external-appstream-utils.c                  |  27 ----
 plugins/external-appstream/meson.build             |  35 ------
 plugins/flatpak/gs-appstream.c                     |   1 -
 plugins/flatpak/gs-appstream.h                     |   1 -
 plugins/flatpak/gs-flatpak.c                       |  10 +-
 plugins/flatpak/meson.build                        |   1 -
 plugins/meson.build                                |   5 -
 po/POTFILES.in                                     |   3 +-
 src/gs-update-monitor.c                            |   3 +-
 25 files changed, 169 insertions(+), 276 deletions(-)
---