[nautilus/sam/tracker-3: 11/11] flatpak: Build tracker-miners inside the Flatpak

[Sam Thursfield <sthursfield src gnome org>]

commit e3856a889d3d1c74193fbc915d416b70b9d23805
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun May 10 23:22:58 2020 +0200

    flatpak: Build tracker-miners inside the Flatpak
    
    This is needed so that the org.freedesktop.Tracker3.Miner.Files settings
    schema is available, and so that the tests that depend on Tracker can
    pass as part of the CI build.

 build-aux/flatpak/org.gnome.Nautilus.json      | 51 +++++++++++++++++---------
 build-aux/flatpak/org.gnome.Nautilus.yml       | 19 ++++++++++
 build-aux/flatpak/org.gnome.NautilusMaster.yml | 19 ++++++++++
 3 files changed, 71 insertions(+), 18 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index 28d88860f8..ea2aa553a6 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -59,30 +59,45 @@
       ]
     },
     {
-      "name": "intltool",
-      "cleanup": [ "*" ],
+      "name": "tracker-miners",
+      "buildsystem": "meson",
+      "cleanup": [
+        "/etc",
+        "/lib",
+        "/libexec/tracker-3",
+        "/share/dbus-1/services/org.freedesktop.Tracker3.Writeback.service"
+      ],
+      "config-opts": [
+        "-Dextract=true",
+        "-Dgeneric_media_extractor=none",
+        "-Dman=false",
+        "-Dminer_fs=true",
+        "-Dminer_rss=false",
+        "-Dsystemd_user_services=false",
+        "-Dwriteback=false"
+      ],
       "sources": [
         {
-          "type": "archive",
-          "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz";,
-          "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
+          "type": "git",
+          "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git";,
+          "branch": "master"
         }
       ]
     },
     {
-        "name": "gnome-desktop",
-        "buildsystem": "meson",
-        "config-opts": [
-          "-Ddebug_tools=false",
-          "-Ddesktop_docs=false",
-          "-Dudev=disabled"
-        ],
-        "sources": [
-          {
-            "type": "git",
-            "url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git";
-          }
-        ]
+      "name": "gnome-desktop",
+      "buildsystem": "meson",
+      "config-opts": [
+        "-Ddebug_tools=false",
+        "-Ddesktop_docs=false",
+        "-Dudev=disabled"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git";
+        }
+      ]
     },
     {
       "name": "gnome-autoar",
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index 6190a490c7..93a098db07 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -44,6 +44,25 @@ modules:
   - type: git
     url: https://gitlab.gnome.org/GNOME/gexiv2.git
     tag: gexiv2-0.10.10
+- name: tracker-miners
+  buildsystem: meson
+  cleanup:
+  - "/etc"
+  - "/lib"
+  - "/libexec/tracker-3"
+  - "/share/dbus-1/services/org.freedesktop.Tracker3.Writeback.service"
+  config-opts:
+  - "-Dextract=true"
+  - "-Dgeneric_media_extractor=none"
+  - "-Dman=false"
+  - "-Dminer_fs=true"
+  - "-Dminer_rss=false"
+  - "-Dsystemd_user_services=false"
+  - "-Dwriteback=false"
+  sources:
+  - type: git
+    url: https://gitlab.gnome.org/GNOME/tracker-miners.git
+    branch: master
 - 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 4a993d4ca0..8215d3dec4 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -43,6 +43,25 @@ modules:
   sources:
   - type: git
     url: https://gitlab.gnome.org/GNOME/gexiv2.git
+- name: tracker-miners
+  buildsystem: meson
+  cleanup:
+  - "/etc"
+  - "/lib"
+  - "/libexec/tracker-3"
+  - "/share/dbus-1/services/org.freedesktop.Tracker3.Writeback.service"
+  config-opts:
+  - "-Dextract=true"
+  - "-Dgeneric_media_extractor=none"
+  - "-Dman=false"
+  - "-Dminer_fs=true"
+  - "-Dminer_rss=false"
+  - "-Dsystemd_user_services=false"
+  - "-Dwriteback=false"
+  sources:
+  - type: git
+    url: https://gitlab.gnome.org/GNOME/tracker-miners.git
+    branch: master
 - name: gnome-desktop
   buildsystem: meson
   config-opts: