[nautilus/sam/tracker-3: 4/6] flatpak: Use Tracker from GNOME Flatpak SDK

[Sam Thursfield <sthursfield src gnome org>]

commit 04c4bfefaced4ea4c8d0af6e695c37d7160a05be
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri May 8 01:42:43 2020 +0200

    flatpak: Use Tracker from GNOME Flatpak SDK
    
    Tracker 3 is provded in the Flatpak SDK, see
    https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/630.

 build-aux/flatpak/org.gnome.Nautilus.json      | 59 --------------------------
 build-aux/flatpak/org.gnome.Nautilus.yml       | 53 -----------------------
 build-aux/flatpak/org.gnome.NautilusMaster.yml | 53 -----------------------
 3 files changed, 165 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index ca95c384a5..aa3d077768 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -58,32 +58,6 @@
         }
       ]
     },
-    {
-      "name": "tracker",
-      "cleanup": [
-        "/bin",
-        "/etc",
-        "/libexec"
-      ],
-      "buildsystem": "meson",
-      "builddir": true,
-      "config-opts": [
-        "-Ddocs=false",
-        "-Dfunctional_tests=false",
-        "-Djournal=false",
-        "-Dnetwork_manager=disabled",
-        "-Dstemmer=disabled",
-        "-Dbash_completion=no",
-        "-Dsystemd_user_services=no"
-      ],
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://gitlab.gnome.org/GNOME/tracker.git";,
-          "branch": "tracker-2.3"
-        }
-      ]
-    },
     {
       "name": "intltool",
       "cleanup": [ "*" ],
@@ -95,39 +69,6 @@
         }
       ]
     },
-    {
-      "name": "tracker-miners",
-      "buildsystem": "meson",
-      "cleanup": [
-        "/etc",
-        "/lib",
-        "/libexec",
-        "/share/dbus-1/services/org.freedesktop.Tracker1.Miner.Extract.service",
-        "/share/dbus-1/services/org.freedesktop.Tracker1.Writeback.service",
-        "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Applications.service",
-        "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Extract.service",
-        "/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service",
-        "/share/tracker-miners",
-        "/share/glib-2.0/schemas/org.freedesktop.Tracker.Extract.gschema.xml",
-        "/share/glib-2.0/schemas/org.freedesktop.Tracker.Writeback.gschema.xml"
-      ],
-      "config-opts": [
-        "-Dextract=false",
-        "-Dgeneric_media_extractor=none",
-        "-Dminer_apps=false",
-        "-Dminer_fs=true",
-        "-Dminer_rss=false",
-        "-Dsystemd_user_services=no",
-        "-Dwriteback=false"
-      ],
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git";,
-          "branch": "tracker-miners-2.3"
-        }
-      ]
-    },
     {
         "name": "gnome-desktop",
         "buildsystem": "meson",
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index f22736fa6c..df786cfb39 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -44,59 +44,6 @@ modules:
   - type: git
     url: https://gitlab.gnome.org/GNOME/gexiv2.git
     tag: gexiv2-0.10.10
-- name: tracker
-  cleanup:
-  - "/bin"
-  - "/etc"
-  - "/libexec"
-  buildsystem: meson
-  builddir: true
-  config-opts:
-  - "-Ddocs=false"
-  - "-Dfunctional_tests=false"
-  - "-Djournal=false"
-  - "-Dnetwork_manager=disabled"
-  - "-Dstemmer=disabled"
-  - "-Dbash_completion=no"
-  - "-Dsystemd_user_services=no"
-  sources:
-  - type: git
-    url: https://gitlab.gnome.org/GNOME/tracker.git
-    branch: tracker-2.3
-# Bundle intltool until tracker-miners drops that dependency 
https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/29
-- name: intltool
-  cleanup:
-  - "*"
-  sources:
-  - type: archive
-    url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
-    sha256: 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd
-- name: tracker-miners
-  buildsystem: meson
-  cleanup:
-  - "/etc"
-  - "/lib"
-  - "/libexec"
-  - "/share/dbus-1/services/org.freedesktop.Tracker1.Miner.Extract.service"
-  - "/share/dbus-1/services/org.freedesktop.Tracker1.Writeback.service"
-  - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Applications.service"
-  - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Extract.service"
-  - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service"
-  - "/share/tracker-miners"
-  - "/share/glib-2.0/schemas/org.freedesktop.Tracker.Extract.gschema.xml"
-  - "/share/glib-2.0/schemas/org.freedesktop.Tracker.Writeback.gschema.xml"
-  config-opts:
-  - "-Dextract=false"
-  - "-Dgeneric_media_extractor=none"
-  - "-Dminer_apps=false"
-  - "-Dminer_fs=true"
-  - "-Dminer_rss=false"
-  - "-Dsystemd_user_services=no"
-  - "-Dwriteback=false"
-  sources:
-  - type: git
-    url: https://gitlab.gnome.org/GNOME/tracker-miners.git
-    branch: tracker-miners-2.3
 - name: gnome-desktop
   buildsystem: meson
   config-opts:
diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml
index 10608aafd5..f0b1478999 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -43,59 +43,6 @@ modules:
   sources:
   - type: git
     url: https://gitlab.gnome.org/GNOME/gexiv2.git
-- name: tracker
-  cleanup:
-  - "/bin"
-  - "/etc"
-  - "/libexec"
-  buildsystem: meson
-  builddir: true
-  config-opts:
-  - "-Ddocs=false"
-  - "-Dfunctional_tests=false"
-  - "-Djournal=false"
-  - "-Dnetwork_manager=disabled"
-  - "-Dstemmer=disabled"
-  - "-Dbash_completion=no"
-  - "-Dsystemd_user_services=no"
-  sources:
-  - type: git
-    url: https://gitlab.gnome.org/GNOME/tracker.git
-    branch: tracker-2.3
-# Bundle intltool until tracker-miners drops that dependency 
https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/29
-- name: intltool
-  cleanup:
-  - "*"
-  sources:
-  - type: archive
-    url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
-    sha256: 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd
-- name: tracker-miners
-  buildsystem: meson
-  cleanup:
-  - "/etc"
-  - "/lib"
-  - "/libexec"
-  - "/share/dbus-1/services/org.freedesktop.Tracker1.Miner.Extract.service"
-  - "/share/dbus-1/services/org.freedesktop.Tracker1.Writeback.service"
-  - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Applications.service"
-  - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Extract.service"
-  - "/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service"
-  - "/share/tracker-miners"
-  - "/share/glib-2.0/schemas/org.freedesktop.Tracker.Extract.gschema.xml"
-  - "/share/glib-2.0/schemas/org.freedesktop.Tracker.Writeback.gschema.xml"
-  config-opts:
-  - "-Dextract=false"
-  - "-Dgeneric_media_extractor=none"
-  - "-Dminer_apps=false"
-  - "-Dminer_fs=true"
-  - "-Dminer_rss=false"
-  - "-Dsystemd_user_services=no"
-  - "-Dwriteback=false"
-  sources:
-  - type: git
-    url: https://gitlab.gnome.org/GNOME/tracker-miners.git
-    branch: tracker-miners-2.3
 - name: gnome-desktop
   buildsystem: meson
   config-opts: