flatpak: Simplify sandboxed tracker3-miners build

The configuration files now all come from tracker-miners themselves.

See https://gitlab.gnome.org/GNOME/tracker-miners/-/merge_requests/259

4 files changed, 4 insertions, 45 deletions

diff --git a/flatpak/org.gnome.Totem.Devel.json b/flatpak/org.gnome.Totem.Devel.json
index f231fedee..f90e3b7e1 100644
--- a/flatpak/org.gnome.Totem.Devel.json
+++ b/flatpak/org.gnome.Totem.Devel.json
@@ -160,14 +160,16 @@
         },
         {
             "name": "tracker-miners",
-            "cleanup": [ "/bin", "/etc", "/share/dbus-1/services" ],
+            "cleanup": [ "/bin", "/etc" ],
             "buildsystem": "meson",
             "config-opts" : [
                 "-Dman=false",
                 "-Dminer_fs=true",
                 "-Dminer_rss=false",
                 "-Dsystemd_user_services=false",
-                "-Dwriteback=false"
+                "-Dwriteback=false",
+                "-Ddomain_prefix=org.gnome.Totem.Devel",
+                "-Dminer_fs_cache_location=$XDG_CACHE_HOME/totem/miner/files"
             ],
             "sources": [
                 {
@@ -302,19 +304,10 @@
                 "-Denable-easy-codec-installation=no",
                 "-Dprofile=development"
             ],
-            "post-install": [
-                "install --mode=644 -D --target-directory=/app/share/tracker3/domain-ontologies ../org.gnome.Totem.Devel.domain.rule",
-                "install --mode=644 -D --target-directory=/app/share/dbus-1/services ../org.gnome.Totem.Devel.Tracker3.Miner.Files.service",
-                "install --mode=644 -D --target-directory=/app/share/dbus-1/services ../org.gnome.Totem.Devel.Tracker3.Miner.Extract.service"
-            ],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/totem.git"
-                },
-                {
-                    "type": "dir",
-                    "path": "./tracker"
                 }
             ]
         }
diff --git a/flatpak/tracker/org.gnome.Totem.Devel.Tracker3.Miner.Extract.service b/flatpak/tracker/org.gnome.Totem.Devel.Tracker3.Miner.Extract.service
deleted file mode 100644
index 23b80625f..000000000
--- a/flatpak/tracker/org.gnome.Totem.Devel.Tracker3.Miner.Extract.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[D-BUS Service]
-Name=org.gnome.Totem.Devel.Tracker3.Miner.Extract
-Exec=/app/libexec/tracker-extract-3 --domain-ontology /app/share/tracker3/domain-ontologies/org.gnome.Totem.Devel.domain.rule
-
-# Miner details needed for tracker-control
-Path=/org/freedesktop/Tracker3/Miner/Extract
-NameSuffix=Miner.Extract
diff --git a/flatpak/tracker/org.gnome.Totem.Devel.Tracker3.Miner.Files.service b/flatpak/tracker/org.gnome.Totem.Devel.Tracker3.Miner.Files.service
deleted file mode 100644
index 89ae7063c..000000000
--- a/flatpak/tracker/org.gnome.Totem.Devel.Tracker3.Miner.Files.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[D-BUS Service]
-Name=org.gnome.Totem.Devel.Tracker3.Miner.Files
-Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology /app/share/tracker3/domain-ontologies/org.gnome.Totem.Devel.domain.rule --initial-sleep 0
-
-# Miner details needed for tracker-control
-Path=/org/freedesktop/Tracker3/Miner/Files
-NameSuffix=Miner.Files
diff --git a/flatpak/tracker/org.gnome.Totem.Devel.domain.rule b/flatpak/tracker/org.gnome.Totem.Devel.domain.rule
deleted file mode 100644
index 2529fae53..000000000
--- a/flatpak/tracker/org.gnome.Totem.Devel.domain.rule
+++ /dev/null
@@ -1,20 +0,0 @@
-# This defines a private Tracker domain for Totem.
-#
-# It's used to run the Tracker indexer inside a Flatpak sandbox, when Totem is
-# running on a host that doesn't have a suitable version of Tracker installed.
-
-[DomainOntology]
-# Location for the Tracker database
-CacheLocation=$XDG_CACHE_HOME/totem/miner/files
-
-# Name of the ontology to use, must be one located in
-# $(sharedir)/tracker/ontologies
-OntologyName=nepomuk
-
-# DBus name for the owner (not optional). Tracker will use
-# the domain as the prefix of the DBus name for all the
-# services related to this domain ontology.
-Domain=org.gnome.Totem.Devel
-
-# List of miners we expect to run in this domain.
-Miners=Miner.Files;Miner.Extract