From 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= Date: Mon, 10 Jun 2024 22:41:33 +0100 Subject: [PATCH] general: React to tracker projects rename Tracker SPARQL is now TinySPARQL. Tracker Miners is now LocalSearch. The old DBus and library APIs still work so there is no rush there. But the executables and git repositories need to be updated now. https://discourse.gnome.org/t/renaming-tracker-git-and-tracker-sparql-git-and-changing-default-branch/21461 --- README.md | 2 +- build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++---- data/tracker/meson.build | 9 +++++---- .../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++-- .../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++-- src/nautilus-tag-manager.c | 4 ++-- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 090a76a47..a726662b3 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main ## Runtime dependencies - [Bubblewrap](https://github.com/projectatomic/bubblewrap) installed. Used for security reasons. -- [Tracker (including tracker-miners)](https://gitlab.gnome.org/GNOME/tracker) properly set up and with all features enabled. Used for fast search and metadata extraction, starred files and batch renaming. +- [LocalSearch](https://gitlab.gnome.org/GNOME/localsearch) properly set up and with all features enabled. Used for fast search and metadata extraction, starred files and batch renaming. ## Discourse diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json index 0d83d4ee9..01bcafd31 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.json +++ b/build-aux/flatpak/org.gnome.Nautilus.json @@ -67,11 +67,11 @@ ] }, { - "name": "tracker-miners", + "name": "localsearch", "buildsystem": "meson", "cleanup": [ "/etc", - "/libexec/tracker-3", + "/libexec/localsearch-3", "/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.Miner.Files.Control.service" @@ -90,8 +90,8 @@ "sources": [ { "type": "git", - "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git", - "branch": "master" + "url": "https://gitlab.gnome.org/GNOME/localsearch.git", + "branch": "main" } ] }, diff --git a/data/tracker/meson.build b/data/tracker/meson.build index 5320af164..2921ca925 100644 --- a/data/tracker/meson.build +++ b/data/tracker/meson.build @@ -1,11 +1,12 @@ -# Files needed for running Tracker inside the Flatpak sandbox, for systems -# which don't have a suitable version of Tracker in the host OS. +# Files needed for running LocalSearch (historically known as Tracker) inside +# the Flatpak sandbox, for systems which don't have a suitable version of +# LocalSearch in the host OS. # # We must export the .service files from the sandbox so they work on the -# session bus. This means the Tracker domain name must correspond with the +# session bus. This means the LocalSearch domain name must correspond with the # application ID. -domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies' +domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies' dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services' tracker_domain_config = configuration_data() diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in index eb7a87aa6..23ded4583 100644 --- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in +++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in @@ -1,7 +1,7 @@ [D-BUS Service] Name=@application_id@.Tracker3.Miner.Extract -Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@ +Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@ -# Miner details needed for tracker-control +# Miner details needed for localsearch-control Path=/org/freedesktop/Tracker3/Miner/Extract NameSuffix=Miner.Files diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in index 4fa7371d1..d770619b3 100644 --- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in +++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in @@ -1,7 +1,7 @@ [D-BUS Service] Name=@application_id@.Tracker3.Miner.Files -Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0 +Exec=/app/libexec/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0 -# Miner details needed for tracker-control +# Miner details needed for localsearch-control Path=/org/freedesktop/Tracker3/Miner/Files NameSuffix=Miner.Files diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c index b946225e3..4c1da5ec5 100644 --- a/src/nautilus-tag-manager.c +++ b/src/nautilus-tag-manager.c @@ -955,7 +955,7 @@ child_watch_cb (GPid pid, static void export_tracker2_data (NautilusTagManager *self) { - gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL}; + gchar *argv[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL}; gint stdout_fd; GPid child_pid; g_autoptr (GError) error = NULL; @@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self) &error); if (!success) { - g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message); + g_warning ("Tracker 2 migration: Couldn't run `tinysparql3`: %s", error->message); return; }