[nautilus/sam/tracker-domain-argument] flatpak: Set Tracker Miners domain using config option

[Sam Thursfield <sthursfield src gnome org>]

commit 83d04a666ff0203818dfb86d1a3eb4b7ff15934d
Author: Sam Thursfield <sam afuera me uk>
Date:   Mon Jul 12 13:25:14 2021 +0200

    flatpak: Set Tracker Miners domain using config option
    
    The current approach dates from before the 'domain_prefix' option
    existed in Tracker Miners.
    
    It is already used by Totem[1] and should be used by all apps that
    bundle Tracker Miners.
    
    1. https://gitlab.gnome.org/GNOME/totem/-/blob/master/flatpak/org.gnome.Totem.Devel.json#L164

 build-aux/flatpak/org.gnome.Nautilus.json          |  2 ++
 build-aux/flatpak/org.gnome.Nautilus.yml           |  2 ++
 build-aux/flatpak/org.gnome.NautilusMaster.yml     |  2 ++
 data/meson.build                                   |  1 -
 data/tracker/meson.build                           | 31 ----------------------
 ...nome.Nautilus.Tracker3.Miner.Extract.service.in |  7 -----
 ....gnome.Nautilus.Tracker3.Miner.Files.service.in |  7 -----
 data/tracker/org.gnome.Nautilus.domain.rule.in     | 21 ---------------
 8 files changed, 6 insertions(+), 67 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index c4b5687e0..0bf108308 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -67,10 +67,12 @@
         "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.Control.service"
       ],
       "config-opts": [
+        "-Ddomain_prefix=org.gnome.NautilusDevel",
         "-Dextract=true",
         "-Dgeneric_media_extractor=none",
         "-Dman=false",
         "-Dminer_fs=true",
+        "-Dminer_fs_cache_location=$XDG_CACHE_HOME/nautilus/miner/files",
         "-Dminer_rss=false",
         "-Dsystemd_user_services=false",
         "-Dwriteback=false"
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index d3497fe68..a529a1467 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -52,10 +52,12 @@ modules:
   - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service"
   - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.Control.service"
   config-opts:
+  - "-Ddomain_prefix=org.gnome.NautilusDevel"
   - "-Dextract=true"
   - "-Dgeneric_media_extractor=none"
   - "-Dman=false"
   - "-Dminer_fs=true"
+  - "-Dminer_fs_cache_location=$XDG_CACHE_HOME/nautilus/miner/files"
   - "-Dminer_rss=false"
   - "-Dsystemd_user_services=false"
   - "-Dwriteback=false"
diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml
index 72da8d7d4..b58222acd 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -52,10 +52,12 @@ modules:
   - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service"
   - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.Control.service"
   config-opts:
+  - "-Ddomain_prefix=org.gnome.NautilusDevel"
   - "-Dextract=true"
   - "-Dgeneric_media_extractor=none"
   - "-Dman=false"
   - "-Dminer_fs=true"
+  - "-Dminer_fs_cache_location=$XDG_CACHE_HOME/nautilus/miner/files"
   - "-Dminer_rss=false"
   - "-Dsystemd_user_services=false"
   - "-Dwriteback=false"
diff --git a/data/meson.build b/data/meson.build
index cc1561d89..6dca56164 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -148,4 +148,3 @@ if appstream_util.found()
 endif
 
 subdir('ontology')
-subdir('tracker')