[gnome-photos/bilelmoussaoui/soup2-less: 3/3] Disable Google/Facebook items

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit eba5a76d64ddc899e9ee3f5c0faafca5ab6c1e32
Author: Bilal Elmoussaoui <belmouss redhat com>
Date:   Tue Aug 2 12:51:32 2022 +0200

    Disable Google/Facebook items
    
    As they pull in two dependencies that sitll depend on soup2 / librest 0.7
    if those dependencies ever get updated to soup3, we can re-enable those features again

 flatpak/org.gnome.Photos.json | 36 ------------------------------------
 meson.build                   |  6 +++---
 src/meson.build               | 10 +++++-----
 src/photos-utils.c            |  6 +++---
 4 files changed, 11 insertions(+), 47 deletions(-)
---
diff --git a/flatpak/org.gnome.Photos.json b/flatpak/org.gnome.Photos.json
index f83ea8f5..11ad71c8 100644
--- a/flatpak/org.gnome.Photos.json
+++ b/flatpak/org.gnome.Photos.json
@@ -132,42 +132,6 @@
                 }
             ]
         },
-        {
-            "name": "libgfbgraph",
-            "cleanup": [
-                "/doc"
-            ],
-            "config-opts": [
-                "--disable-introspection"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "branch": "stable-0.2.x",
-                    "url": "https://gitlab.gnome.org/GNOME/libgfbgraph.git";
-                }
-            ]
-        },
-        {
-            "name": "libgdata",
-            "buildsystem": "meson",
-            "config-opts": [
-                "-Dalways_build_tests=false",
-                "-Dgtk=disabled",
-                "-Dgtk_doc=false",
-                "-Dinstalled_tests=false",
-                "-Dintrospection=false",
-                "-Doauth1=disabled",
-                "-Dvapi=false"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "branch": "main",
-                    "url": "https://gitlab.gnome.org/GNOME/libgdata.git";
-                }
-            ]
-        },
         {
             "name": "libraw",
             "config-opts": [
diff --git a/meson.build b/meson.build
index 539e7c71..8082bf52 100644
--- a/meson.build
+++ b/meson.build
@@ -156,7 +156,7 @@ babl_dep = dependency('babl')
 cairo_dep = dependency('cairo', version: '>= 1.14.0')
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.36.8')
 gegl_dep = dependency('gegl-0.4', version: '>= 0.4.0')
-geocode_glib_dep = dependency('geocode-glib-1.0')
+geocode_glib_dep = dependency('geocode-glib-2.0')
 gexiv_dep = dependency('gexiv2', version: '>= 0.10.8')
 gio_dep = dependency('gio-2.0')
 gio_unix_dep = dependency('gio-unix-2.0')
@@ -171,8 +171,8 @@ 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')
 libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.26.0')
-libgdata_dep = dependency('libgdata', version: '>= 0.17.13')
-libgfgraph_dep = dependency('libgfbgraph-0.2', version: '>= 0.2.1')
+#libgdata_dep = dependency('libgdata', version: '>= 0.17.13')
+#libgfgraph_dep = dependency('libgfbgraph-0.2', version: '>= 0.2.1')
 libhandy_dep = dependency ('libhandy-1', version: '>= 1.1.90')
 libjpeg_dep = dependency('libjpeg')
 libpng_dep = dependency('libpng16')
diff --git a/src/meson.build b/src/meson.build
index d02dd572..4a741c7d 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -117,7 +117,7 @@ gnome_photos_sources = files(
   'photos-embed.c',
   'photos-empty-results-box.c',
   'photos-error-box.c',
-  'photos-facebook-item.c',
+  #'photos-facebook-item.c',
   'photos-fetch-collection-state-job.c',
   'photos-fetch-collections-job.c',
   'photos-fetch-ids-job.c',
@@ -125,7 +125,7 @@ gnome_photos_sources = files(
   'photos-filterable.c',
   'photos-flickr-item.c',
   'photos-gesture-zoom.c',
-  'photos-google-item.c',
+  #'photos-google-item.c',
   'photos-image-view.c',
   'photos-image-view-helper.c',
   'photos-import-dialog.c',
@@ -175,7 +175,7 @@ gnome_photos_sources = files(
   'photos-share-notification.c',
   'photos-share-point.c',
   'photos-share-point-email.c',
-  'photos-share-point-google.c',
+  #'photos-share-point-google.c',
   'photos-share-point-manager.c',
   'photos-share-point-online.c',
   'photos-single-item-job.c',
@@ -386,8 +386,8 @@ deps = [
   gtk_unix_print_dep,
   libdazzle_dep,
   libgd_dep,
-  libgdata_dep,
-  libgfgraph_dep,
+  #libgdata_dep,
+  #libgfgraph_dep,
   libgnome_photos_dep,
   libhandy_dep,
   m_dep,
diff --git a/src/photos-utils.c b/src/photos-utils.c
index e637a251..60050ec8 100644
--- a/src/photos-utils.c
+++ b/src/photos-utils.c
@@ -717,14 +717,14 @@ 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_FACEBOOK_ITEM);
+      //g_type_ensure (PHOTOS_TYPE_FACEBOOK_ITEM);
       g_type_ensure (PHOTOS_TYPE_FLICKR_ITEM);
-      g_type_ensure (PHOTOS_TYPE_GOOGLE_ITEM);
+      //g_type_ensure (PHOTOS_TYPE_GOOGLE_ITEM);
       g_type_ensure (PHOTOS_TYPE_LOCAL_ITEM);
       g_type_ensure (PHOTOS_TYPE_MEDIA_SERVER_ITEM);
 
       g_type_ensure (PHOTOS_TYPE_SHARE_POINT_EMAIL);
-      g_type_ensure (PHOTOS_TYPE_SHARE_POINT_GOOGLE);
+      //g_type_ensure (PHOTOS_TYPE_SHARE_POINT_GOOGLE);
 
       g_type_ensure (PHOTOS_TYPE_TOOL_COLORS);
       g_type_ensure (PHOTOS_TYPE_TOOL_CROP);