[gnome-builder] flatpak: remove use of libflatpak from UI process

[Christian Hergert <chergert src gnome org>]

commit 5469bc327ad0e16689890ff10e8fe525415fa8aa
Author: Christian Hergert <chergert redhat com>
Date:   Tue May 4 21:59:30 2021 -0700

    flatpak: remove use of libflatpak from UI process

 src/plugins/flatpak/daemon/meson.build             |    2 +
 src/plugins/flatpak/flatpak-plugin.c               |    8 -
 .../flatpak/gbp-flatpak-application-addin.c        | 1499 --------------------
 .../flatpak/gbp-flatpak-application-addin.h        |   78 -
 src/plugins/flatpak/gbp-flatpak-config-provider.c  |    1 -
 src/plugins/flatpak/gbp-flatpak-install-dialog.c   |    1 -
 src/plugins/flatpak/gbp-flatpak-manifest.c         |    1 -
 src/plugins/flatpak/gbp-flatpak-pipeline-addin.c   |    1 -
 src/plugins/flatpak/gbp-flatpak-runner.c           |    1 -
 src/plugins/flatpak/gbp-flatpak-runtime.c          |    7 +-
 src/plugins/flatpak/gbp-flatpak-transfer.c         |  409 ------
 src/plugins/flatpak/gbp-flatpak-transfer.h         |   36 -
 src/plugins/flatpak/gbp-flatpak-workbench-addin.c  |  272 ----
 src/plugins/flatpak/gbp-flatpak-workbench-addin.h  |   31 -
 src/plugins/flatpak/meson.build                    |    5 -
 15 files changed, 5 insertions(+), 2347 deletions(-)
---
diff --git a/src/plugins/flatpak/daemon/meson.build b/src/plugins/flatpak/daemon/meson.build
index 14c95654e..a2bee4e70 100644
--- a/src/plugins/flatpak/daemon/meson.build
+++ b/src/plugins/flatpak/daemon/meson.build
@@ -1,3 +1,5 @@
+libflatpak_dep = dependency('flatpak', version: '>= 1.0.0')
+
 gnome_builder_flatpak_deps = [
   libgiounix_dep,
   libflatpak_dep,
diff --git a/src/plugins/flatpak/flatpak-plugin.c b/src/plugins/flatpak/flatpak-plugin.c
index 5c9ef237f..120e1365f 100644
--- a/src/plugins/flatpak/flatpak-plugin.c
+++ b/src/plugins/flatpak/flatpak-plugin.c
@@ -27,14 +27,12 @@
 #include <libide-foundry.h>
 #include <libide-gui.h>
 
-#include "gbp-flatpak-application-addin.h"
 #include "gbp-flatpak-build-system-discovery.h"
 #include "gbp-flatpak-build-target-provider.h"
 #include "gbp-flatpak-config-provider.h"
 #include "gbp-flatpak-dependency-updater.h"
 #include "gbp-flatpak-pipeline-addin.h"
 #include "gbp-flatpak-runtime-provider.h"
-#include "gbp-flatpak-workbench-addin.h"
 
 _IDE_EXTERN void
 _gbp_flatpak_register_types (PeasObjectModule *module)
@@ -56,13 +54,7 @@ _gbp_flatpak_register_types (PeasObjectModule *module)
   peas_object_module_register_extension_type (module,
                                               IDE_TYPE_RUNTIME_PROVIDER,
                                               GBP_TYPE_FLATPAK_RUNTIME_PROVIDER);
-  peas_object_module_register_extension_type (module,
-                                              IDE_TYPE_APPLICATION_ADDIN,
-                                              GBP_TYPE_FLATPAK_APPLICATION_ADDIN);
   peas_object_module_register_extension_type (module,
                                               IDE_TYPE_PIPELINE_ADDIN,
                                               GBP_TYPE_FLATPAK_PIPELINE_ADDIN);
-  peas_object_module_register_extension_type (module,
-                                              IDE_TYPE_WORKBENCH_ADDIN,
-                                              GBP_TYPE_FLATPAK_WORKBENCH_ADDIN);
 }
diff --git a/src/plugins/flatpak/gbp-flatpak-config-provider.c 
b/src/plugins/flatpak/gbp-flatpak-config-provider.c
index c66520814..8b87930f2 100644
--- a/src/plugins/flatpak/gbp-flatpak-config-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-config-provider.c
@@ -20,7 +20,6 @@
 
 #define G_LOG_DOMAIN "gbp-flatpak-config-provider"
 
-#include <flatpak.h>
 #include <glib/gi18n.h>
 #include <json-glib/json-glib.h>
 #include <libide-vcs.h>
diff --git a/src/plugins/flatpak/gbp-flatpak-install-dialog.c 
b/src/plugins/flatpak/gbp-flatpak-install-dialog.c
index bc1db6392..326aacdc9 100644
--- a/src/plugins/flatpak/gbp-flatpak-install-dialog.c
+++ b/src/plugins/flatpak/gbp-flatpak-install-dialog.c
@@ -26,7 +26,6 @@
 
 #include <libide-gui.h>
 #include <libide-threading.h>
-#include <flatpak/flatpak.h>
 
 #include "gbp-flatpak-install-dialog.h"
 #include "gbp-flatpak-util.h"
diff --git a/src/plugins/flatpak/gbp-flatpak-manifest.c b/src/plugins/flatpak/gbp-flatpak-manifest.c
index cc40e322e..082511133 100644
--- a/src/plugins/flatpak/gbp-flatpak-manifest.c
+++ b/src/plugins/flatpak/gbp-flatpak-manifest.c
@@ -23,7 +23,6 @@
 
 #include <json-glib/json-glib.h>
 
-#include "gbp-flatpak-application-addin.h"
 #include "gbp-flatpak-client.h"
 #include "gbp-flatpak-manifest.h"
 #include "gbp-flatpak-runtime.h"
diff --git a/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c 
b/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
index e085fe632..adc2bbf60 100644
--- a/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
@@ -26,7 +26,6 @@
 #include "gbp-flatpak-download-stage.h"
 #include "gbp-flatpak-pipeline-addin.h"
 #include "gbp-flatpak-runtime.h"
-#include "gbp-flatpak-transfer.h"
 #include "gbp-flatpak-util.h"
 
 #define VERSION_CHECK(v,a,b,c)                                         \
diff --git a/src/plugins/flatpak/gbp-flatpak-runner.c b/src/plugins/flatpak/gbp-flatpak-runner.c
index f75d2bf65..103ebff2d 100644
--- a/src/plugins/flatpak/gbp-flatpak-runner.c
+++ b/src/plugins/flatpak/gbp-flatpak-runner.c
@@ -21,7 +21,6 @@
 #define G_LOG_DOMAIN "gbp-flatpak-runner"
 
 #include <errno.h>
-#include <flatpak.h>
 #include <stdlib.h>
 #include <glib/gi18n.h>
 #include <unistd.h>
diff --git a/src/plugins/flatpak/gbp-flatpak-runtime.c b/src/plugins/flatpak/gbp-flatpak-runtime.c
index 62f1e4c23..6c31d7f7a 100644
--- a/src/plugins/flatpak/gbp-flatpak-runtime.c
+++ b/src/plugins/flatpak/gbp-flatpak-runtime.c
@@ -20,11 +20,10 @@
 
 #define G_LOG_DOMAIN "gbp-flatpak-runtime"
 
-#include <flatpak.h>
 #include <glib/gi18n.h>
 #include <json-glib/json-glib.h>
+#include <libide-vcs.h>
 
-#include "gbp-flatpak-application-addin.h"
 #include "gbp-flatpak-manifest.h"
 #include "gbp-flatpak-runner.h"
 #include "gbp-flatpak-runtime.h"
@@ -771,12 +770,12 @@ gbp_flatpak_runtime_new (const char *name,
   else if (g_str_has_prefix (name, "org.kde."))
     g_string_append (category, "KDE/");
 
-  if (ide_str_equal0 (flatpak_get_default_arch (), arch))
+  if (ide_str_equal0 (ide_get_system_arch (), arch))
     g_string_append (category, name);
   else
     g_string_append_printf (category, "%s (%s)", name, arch);
 
-  if (g_str_equal (arch, flatpak_get_default_arch ()))
+  if (g_str_equal (arch, ide_get_system_arch ()))
     display_name = g_strdup_printf (_("%s <b>%s</b>"), name, branch);
   else
     display_name = g_strdup_printf (_("%s <b>%s</b> <span fgalpha='36044'>%s</span>"), name, branch, arch);
diff --git a/src/plugins/flatpak/meson.build b/src/plugins/flatpak/meson.build
index ce7934ddf..4be33614d 100644
--- a/src/plugins/flatpak/meson.build
+++ b/src/plugins/flatpak/meson.build
@@ -8,7 +8,6 @@ if not libportal_dep.found()
   error('plugin_flatpak requires access to libportal')
 endif
 
-libflatpak_dep = dependency('flatpak', version: '>= 1.0.0')
 libostree_dep = dependency('ostree-1')
 libsoup_dep = dependency('libsoup-2.4', version: '>= 2.52.0')
 
@@ -16,7 +15,6 @@ subdir('daemon')
 
 plugins_sources += files([
   'flatpak-plugin.c',
-  'gbp-flatpak-application-addin.c',
   'gbp-flatpak-build-system-discovery.c',
   'gbp-flatpak-build-target-provider.c',
   'gbp-flatpak-build-target.c',
@@ -33,9 +31,7 @@ plugins_sources += files([
   'gbp-flatpak-runtime.c',
   'gbp-flatpak-sources.c',
   'gbp-flatpak-subprocess-launcher.c',
-  'gbp-flatpak-transfer.c',
   'gbp-flatpak-util.c',
-  'gbp-flatpak-workbench-addin.c',
   'ipc-flatpak-transfer-impl.c',
 ])
 
@@ -46,7 +42,6 @@ plugin_flatpak_resources = gnome.compile_resources(
 )
 
 plugins_deps += [
-  libflatpak_dep,
   libostree_dep,
   libportal_dep,
   libsoup_dep,