[gnome-music/wip/jfelder/tracker3-rebased: 9/39] flatpak: Port to tracker3

[Marinus Schraal <mschraal src gnome org>]

commit ff62b5f74cf13bfc8a78263d432ff27718828f5d
Author: Jean Felder <jfelder src gnome org>
Date:   Mon May 25 20:21:40 2020 +0200

    flatpak: Port to tracker3
    
    The add-policy permission allows to use the portal from Tracker
    3. Music only wants the tracker:Audio graph.
    Also, add permission to use the writeback service.

 org.gnome.Music.json | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/org.gnome.Music.json b/org.gnome.Music.json
index 97b6c74f..b68180bb 100644
--- a/org.gnome.Music.json
+++ b/org.gnome.Music.json
@@ -15,14 +15,15 @@
         "--filesystem=xdg-music",
         "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
         "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
-        "--talk-name=org.freedesktop.Tracker1",
+        "--talk-name=org.freedesktop.Tracker3.Writeback",
         "--env=TRACKER_SPARQL_BACKEND=bus",
         "--talk-name=org.gnome.OnlineAccounts",
         "--talk-name=org.gnome.ControlCenter",
         "--talk-name=org.gnome.SettingsDaemon.MediaKeys",
         "--talk-name=org.gtk.vfs",
         "--talk-name=org.gtk.vfs.*",
-        "--system-talk-name=org.freedesktop.login1"
+        "--system-talk-name=org.freedesktop.login1",
+        "--add-policy=Tracker3.dbus:org.freedesktop.Tracker3.Miner.Files=tracker:Audio"
     ],
     "cleanup": [
         "/include",
@@ -62,16 +63,16 @@
             "buildsystem": "meson",
             "cleanup": [ "/bin", "/etc", "/libexec" ],
             "config-opts": [ "-Ddocs=false",
+                             "-Dman=false",
                              "-Dfunctional_tests=false",
                              "-Dnetwork_manager=disabled",
                              "-Dstemmer=disabled",
                              "-Dunicode_support=icu",
-                             "-Dbash_completion=no" ],
+                             "-Dbash_completion=false" ],
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/tracker.git";,
-                    "branch": "tracker-2.3"
+                    "url": "https://gitlab.gnome.org/GNOME/tracker.git";
                 }
             ]
         },
@@ -113,7 +114,8 @@
         {
             "name": "grilo-plugins",
             "buildsystem": "meson",
-            "config-opts": [ "-Denable-tracker=yes",
+            "config-opts": [ "-Denable-tracker=no",
+                             "-Denable-tracker3=yes",
                              "-Denable-bookmarks=no",
                              "-Denable-dleyna=no",
                              "-Denable-filesystem=no",
@@ -131,7 +133,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/grilo-plugins.git";
+                    "url": "https://gitlab.gnome.org/GNOME/grilo-plugins.git";,
+                    "branch": "wip/carlosg/tracker3"
                 }
             ],
             "cleanup": [ "/include" ]
@@ -145,7 +148,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gnome-music.git";
+                    "url": "https://gitlab.gnome.org/GNOME/gnome-music.git";,
+                    "branch": "sam/tracker3-self-contained"
                 }
             ]
         }