gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-06-30 23:46:35 +00:00
Code Issues Projects Releases Wiki Activity

general: React to tracker projects rename

Browse Source 
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
This commit is contained in:
António Fernandes 2024-06-10 22:41:33 +01:00
parent 746f9c4247
commit 0e6e3946eb
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -29,7 +29,7 @@ git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
## Runtime dependencies ## Runtime dependencies
- [Bubblewrap](https://github.com/projectatomic/bubblewrap) installed. Used for security reasons. - [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 ## Discourse

8
build-aux/flatpak/org.gnome.Nautilus.json
View File

@ -67,11 +67,11 @@
] ]
}, },
{ {
"name": "tracker-miners", "name": "localsearch",
"buildsystem": "meson", "buildsystem": "meson",
"cleanup": [ "cleanup": [
"/etc", "/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.Extract.service",
"/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service", "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service",
"/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.Control.service" "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.Control.service"
@ -90,8 +90,8 @@
"sources": [ "sources": [
{ {
"type": "git", "type": "git",
"url": "https://gitlab.gnome.org/GNOME/tracker-miners.git", "url": "https://gitlab.gnome.org/GNOME/localsearch.git",
"branch": "master" "branch": "main"
} }
] ]
}, },

9
data/tracker/meson.build
View File

@ -1,11 +1,12 @@
# Files needed for running Tracker inside the Flatpak sandbox, for systems # Files needed for running LocalSearch (historically known as Tracker) inside
# which don't have a suitable version of Tracker in the host OS. # 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 # 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. # 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' dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
tracker_domain_config = configuration_data() tracker_domain_config = configuration_data()

4
data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
View File

@ -1,7 +1,7 @@
[D-BUS Service] [D-BUS Service]
Name=@application_id@.Tracker3.Miner.Extract 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 Path=/org/freedesktop/Tracker3/Miner/Extract
NameSuffix=Miner.Files NameSuffix=Miner.Files

4
data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
View File

@ -1,7 +1,7 @@
[D-BUS Service] [D-BUS Service]
Name=@application_id@.Tracker3.Miner.Files 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 Path=/org/freedesktop/Tracker3/Miner/Files
NameSuffix=Miner.Files NameSuffix=Miner.Files

4
src/nautilus-tag-manager.c
View File

@ -955,7 +955,7 @@ child_watch_cb (GPid pid,
static void static void
export_tracker2_data (NautilusTagManager *self) 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; gint stdout_fd;
GPid child_pid; GPid child_pid;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self)
&error); &error);
if (!success) 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; return;
} }