[gnome-photos/bilelmoussaoui/no-flickr] Drop flickr plugin: It pulls soup2

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit c6f66fc47d2d434c34dd84d446f081389015785b
Author: Bilal Elmoussaoui <belmouss redhat com>
Date:   Thu Aug 11 16:17:52 2022 +0200

    Drop flickr plugin: It pulls soup2
    
    grilo dmap plugin pulls libsoup2 which is incompatible with gnome-online-accounts.
    So let us drop the whole grilo dependency by losing the flickr feature.
    
    See https://bugzilla.redhat.com/show_bug.cgi?id=2117520

 flatpak/org.gnome.Photos.json |  59 ------
 meson.build                   |   1 -
 src/meson.build               |   2 -
 src/photos-application.c      |  24 ---
 src/photos-flickr-item.c      | 407 ------------------------------------------
 src/photos-flickr-item.h      |  35 ----
 src/photos-utils.c            |   2 -
 7 files changed, 530 deletions(-)
---
diff --git a/flatpak/org.gnome.Photos.json b/flatpak/org.gnome.Photos.json
index ebbddf6e..3eceebe0 100644
--- a/flatpak/org.gnome.Photos.json
+++ b/flatpak/org.gnome.Photos.json
@@ -204,65 +204,6 @@
                 }
             ]
         },
-        {
-            "name": "grilo",
-            "buildsystem": "meson",
-            "cleanup": [
-                "/bin"
-            ],
-            "config-opts": [
-                "-Denable-introspection=false",
-                "-Denable-grl-net=true",
-                "-Denable-grl-pls=false",
-                "-Denable-gtk-doc=false",
-                "-Denable-test-ui=false",
-                "-Denable-vala=false"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/grilo.git";
-                }
-            ]
-        },
-        {
-            "name": "grilo-plugins",
-            "buildsystem": "meson",
-            "cleanup": [
-                "/include",
-                "/share/help"
-            ],
-            "config-opts": [
-                "-Denable-bookmarks=no",
-                "-Denable-chromaprint=no",
-                "-Denable-dleyna=no",
-                "-Denable-dmap=no",
-                "-Denable-filesystem=no",
-                "-Denable-flickr=yes",
-                "-Denable-freebox=no",
-                "-Denable-gravatar=no",
-                "-Denable-local-metadata=no",
-                "-Denable-lua-factory=no",
-                "-Denable-magnatune=no",
-                "-Denable-metadata-store=no",
-                "-Denable-opensubtitles=no",
-                "-Denable-optical-media=no",
-                "-Denable-podcasts=no",
-                "-Denable-raitv=no",
-                "-Denable-shoutcast=no",
-                "-Denable-thetvdb=no",
-                "-Denable-tmdb=no",
-                "-Denable-tracker=no",
-                "-Denable-youtube=no",
-                "--wrap-mode=nofallback"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/grilo-plugins.git";
-                }
-            ]
-        },
         {
             "name": "tracker-miners",
             "buildsystem": "meson",
diff --git a/meson.build b/meson.build
index 37470335..78492693 100644
--- a/meson.build
+++ b/meson.build
@@ -168,7 +168,6 @@ goa_dep = dependency('goa-1.0', version: '>= 3.8.0')
 config_h.set('GOA_API_IS_SUBJECT_TO_CHANGE', true)
 
 gobject_dep = dependency('gobject-2.0')
-grilo_dep = dependency('grilo-0.3', version: '>= 0.3.5')
 gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas')
 gtk_dep = dependency('gtk+-3.0', version: '>= 3.22.16')
 gtk_unix_print_dep = dependency('gtk+-unix-print-3.0')
diff --git a/src/meson.build b/src/meson.build
index 77b1bbc0..27cfb658 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -122,7 +122,6 @@ gnome_photos_sources = files(
   'photos-fetch-ids-job.c',
   'photos-fetch-metas-job.c',
   'photos-filterable.c',
-  'photos-flickr-item.c',
   'photos-gesture-zoom.c',
   #'photos-google-item.c',
   'photos-image-view.c',
@@ -379,7 +378,6 @@ deps = [
   glib_dep,
   goa_dep,
   gobject_dep,
-  grilo_dep,
   gsettings_desktop_schemas_dep,
   gtk_dep,
   gtk_unix_print_dep,
diff --git a/src/photos-application.c b/src/photos-application.c
index 162c9ffa..fd1bc3fa 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -35,7 +35,6 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <grilo.h>
 #include <handy.h>
 #include <libportal/portal.h>
 #include <libportal-gtk3/portal-gtk3.h>
@@ -2507,11 +2506,9 @@ static void
 photos_application_startup (GApplication *application)
 {
   PhotosApplication *self = PHOTOS_APPLICATION (application);
-  GrlRegistry *registry;
   GtkIconTheme *icon_theme;
   GtkSettings *settings;
   GVariant *state;
-  gboolean grl_plugins_loaded;
   const gchar *delete_accels[3] = {"Delete", "KP_Delete", NULL};
   const gchar *edit_accels[2] = {"<Primary>e", NULL};
   const gchar *fullscreen_accels[2] = {"F11", NULL};
@@ -2534,27 +2531,6 @@ photos_application_startup (GApplication *application)
 
   photos_gegl_init ();
 
-  grl_init (NULL, NULL);
-  registry = grl_registry_get_default ();
-
-  {
-    g_autoptr (GError) error = NULL;
-
-    grl_plugins_loaded = grl_registry_load_all_plugins (registry, FALSE, &error);
-    if (error != NULL)
-      g_warning ("Unable to load Grilo plugins: %s", error->message);
-  }
-
-  if (grl_plugins_loaded)
-    {
-      {
-        g_autoptr (GError) error = NULL;
-
-        if (!grl_registry_activate_plugin_by_id (registry, "grl-flickr", &error))
-          g_warning ("Unable to activate Grilo's Flickr plugin: %s", error->message);
-      }
-    }
-
   self->create_window_cancellable = g_cancellable_new ();
   self->refresh_miner_ids = g_hash_table_new (g_direct_hash, g_direct_equal);
 
diff --git a/src/photos-utils.c b/src/photos-utils.c
index a57493dc..845fda22 100644
--- a/src/photos-utils.c
+++ b/src/photos-utils.c
@@ -37,7 +37,6 @@
 #include "photos-device-item.h"
 #include "photos-enums.h"
 #include "photos-error.h"
-#include "photos-flickr-item.h"
 #include "photos-gegl.h"
 #include "photos-google-item.h"
 #include "photos-local-item.h"
@@ -716,7 +715,6 @@ photos_utils_ensure_builtins (void)
   if (g_once_init_enter (&once_init_value))
     {
       g_type_ensure (PHOTOS_TYPE_DEVICE_ITEM);
-      g_type_ensure (PHOTOS_TYPE_FLICKR_ITEM);
       //g_type_ensure (PHOTOS_TYPE_GOOGLE_ITEM);
       g_type_ensure (PHOTOS_TYPE_LOCAL_ITEM);
       g_type_ensure (PHOTOS_TYPE_MEDIA_SERVER_ITEM);