[gnome-music/sam/flatpak-tracker3-updates: 1/2] flatpak: Set up Tracker Miners domain when configuring tracker-miners




commit 74976e14d96dad713e080ef10245a549e318d2fe
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri Aug 28 21:57:35 2020 +0200

    flatpak: Set up Tracker Miners domain when configuring tracker-miners
    
    This is possible since
    https://gitlab.gnome.org/GNOME/tracker-miners/-/merge_requests/259
    
    There should be no functional changes to the Flatpak bundle.

 data/meson.build                                   |  2 --
 data/tracker/meson.build                           | 31 ----------------------
 ...g.gnome.Music.Tracker3.Miner.Extract.service.in |  7 -----
 ...org.gnome.Music.Tracker3.Miner.Files.service.in |  7 -----
 data/tracker/org.gnome.Music.domain.rule.in        | 20 --------------
 org.gnome.Music.json                               |  7 +++--
 subprojects/shared-modules                         |  2 +-
 7 files changed, 4 insertions(+), 72 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index a093f1e2..25ff1e10 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -81,5 +81,3 @@ install_data(
     install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'icons/hicolor/symbolic/apps'),
     rename: '@0 -symbolic svg'.format(APPLICATION_ID)
 )
-
-subdir('tracker')
diff --git a/org.gnome.Music.json b/org.gnome.Music.json
index 1d800524..532dfc10 100644
--- a/org.gnome.Music.json
+++ b/org.gnome.Music.json
@@ -63,11 +63,10 @@
         {
             "name": "tracker-miners",
             "buildsystem": "meson",
-            "cleanup": [ "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service",
-                         "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service",
-                         "/share/dbus-1/services/org.freedesktop.Tracker3.Writeback.service" ],
-            "config-opts": [ "-Dman=false",
+            "config-opts": [ "-Ddomain_prefix=org.gnome.Music.Devel",
+                             "-Dman=false",
                              "-Dminer_fs=true",
+                             "-Dminer_fs_cache_location=$XDG_CACHE_HOME/gnome-music/miner/files",
                              "-Dminer_rss=false",
                              "-Dsystemd_user_services=false"],
             "sources": [
diff --git a/subprojects/shared-modules b/subprojects/shared-modules
index 2ea43be9..722c2578 160000
--- a/subprojects/shared-modules
+++ b/subprojects/shared-modules
@@ -1 +1 @@
-Subproject commit 2ea43be923edb2cef57aa4820b3cae391c440c8f
+Subproject commit 722c257817b83e4cce12bc7b8361ced75e09c908


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]