[gnome-music/sam/tracker3-self-contained: 1/2] flatpak: Add Tracker 3 Miners



commit c11bd3cc0f7c5be16c14f2cf60b1730251a14b7d
Author: Sam Thursfield <sam afuera me uk>
Date:   Tue Jun 30 00:38:57 2020 +0200

    flatpak: Add Tracker 3 Miners

 data/meson.build                                   |  2 ++
 data/tracker/meson.build                           |  8 ++++++++
 data/tracker/org.gnome.Music.Miner.Extract.service |  8 ++++++++
 data/tracker/org.gnome.Music.Miner.Files.service   |  8 ++++++++
 data/tracker/org.gnome.Music.domain.rule           | 20 ++++++++++++++++++++
 org.gnome.Music.json                               | 21 +++++++++------------
 6 files changed, 55 insertions(+), 12 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 25ff1e10..a093f1e2 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -81,3 +81,5 @@ 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/data/tracker/meson.build b/data/tracker/meson.build
new file mode 100644
index 00000000..d562b878
--- /dev/null
+++ b/data/tracker/meson.build
@@ -0,0 +1,8 @@
+# Files needed for running Tracker inside the Flatpak sandbox.
+
+domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
+dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
+
+install_data('org.gnome.Music.domain.rule', install_dir: domain_ontologies_dir)
+install_data('org.gnome.Music.Miner.Extract.service', install_dir: dbus_services_dir)
+install_data('org.gnome.Music.Miner.Files.service', install_dir: dbus_services_dir)
diff --git a/data/tracker/org.gnome.Music.Miner.Extract.service 
b/data/tracker/org.gnome.Music.Miner.Extract.service
new file mode 100644
index 00000000..3c9fb445
--- /dev/null
+++ b/data/tracker/org.gnome.Music.Miner.Extract.service
@@ -0,0 +1,8 @@
+[D-BUS Service]
+Name=org.gnome.Photos.Miner.Extract
+Exec=/app/libexec/tracker-extract-3
+SystemdService=tracker-extract-3.service
+
+# Miner details needed for tracker-control
+Path=/org/gnome/Photos/Miner/Extract
+NameSuffix=Miner.Files
diff --git a/data/tracker/org.gnome.Music.Miner.Files.service 
b/data/tracker/org.gnome.Music.Miner.Files.service
new file mode 100644
index 00000000..33c8eb15
--- /dev/null
+++ b/data/tracker/org.gnome.Music.Miner.Files.service
@@ -0,0 +1,8 @@
+[D-BUS Service]
+Name=org.gnome.Photos.Miner.Files
+Exec=/app/libexec/tracker-miner-fs-3
+SystemdService=tracker-miner-fs-3.service
+
+# Miner details needed for tracker-control
+Path=/org/gnome/Photos/Miner/Files
+NameSuffix=Miner.Files
diff --git a/data/tracker/org.gnome.Music.domain.rule b/data/tracker/org.gnome.Music.domain.rule
new file mode 100644
index 00000000..31bccfa1
--- /dev/null
+++ b/data/tracker/org.gnome.Music.domain.rule
@@ -0,0 +1,20 @@
+# This defines a private Tracker domain for GNOME Music.
+#
+# It's used to run the Tracker indexer inside a Flatpak sandbox, when Music 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/gnome-music/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.Music
+
+# List of miners we expect to run in this domain.
+Miners=Miner.Files;Miner.Extract
diff --git a/org.gnome.Music.json b/org.gnome.Music.json
index de284ff0..0acddce3 100644
--- a/org.gnome.Music.json
+++ b/org.gnome.Music.json
@@ -60,20 +60,17 @@
             ]
         },
         {
-            "name": "tracker",
+            "name": "tracker-miners",
             "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=false" ],
+            "config-opts": [ "-Dman=false",
+                             "-Dminer_fs=true",
+                             "-Dminer_rss=false",
+                             "-Dsystemd_user_services=false"],
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/tracker.git";
+                    "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git";,
+                    "branch": "master"
                 }
             ]
         },
@@ -185,8 +182,8 @@
             "buildsystem": "meson",
             "sources": [
                 {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gnome-music.git";
+                    "type": "dir",
+                    "path": "."
                 }
             ]
         }


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