Update to 47.0
Resolves: RHEL-65514 Resolves: RHEL-61408
This commit is contained in:
parent
584535f8ab
commit
e37a96629c
1
.gitignore
vendored
1
.gitignore
vendored
@ -189,3 +189,4 @@ nautilus-2.31.6.tar.bz2
|
|||||||
/nautilus-46.0.tar.xz
|
/nautilus-46.0.tar.xz
|
||||||
/nautilus-46.1.tar.xz
|
/nautilus-46.1.tar.xz
|
||||||
/nautilus-46.2.tar.xz
|
/nautilus-46.2.tar.xz
|
||||||
|
/nautilus-47.0.tar.xz
|
||||||
|
131
0001-Revert-general-React-to-tracker-projects-rename.patch
Normal file
131
0001-Revert-general-React-to-tracker-projects-rename.patch
Normal file
@ -0,0 +1,131 @@
|
|||||||
|
From f514545834b18a68d3818eebfe57de7df87700e8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Williamson <awilliam@redhat.com>
|
||||||
|
Date: Thu, 8 Aug 2024 09:50:02 -0400
|
||||||
|
Subject: [PATCH] Revert "general: React to tracker projects rename"
|
||||||
|
|
||||||
|
This reverts commit 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9.
|
||||||
|
---
|
||||||
|
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, 15 insertions(+), 16 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/README.md b/README.md
|
||||||
|
index a726662b3..090a76a47 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.
|
||||||
|
-- [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.
|
||||||
|
+- [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.
|
||||||
|
|
||||||
|
## Discourse
|
||||||
|
|
||||||
|
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
|
||||||
|
index ccf653829..362b933e0 100644
|
||||||
|
--- a/build-aux/flatpak/org.gnome.Nautilus.json
|
||||||
|
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
|
||||||
|
@@ -72,11 +72,11 @@
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
- "name": "localsearch",
|
||||||
|
+ "name": "tracker-miners",
|
||||||
|
"buildsystem": "meson",
|
||||||
|
"cleanup": [
|
||||||
|
"/etc",
|
||||||
|
- "/libexec/localsearch-3",
|
||||||
|
+ "/libexec/tracker-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"
|
||||||
|
@@ -95,8 +95,8 @@
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"type": "git",
|
||||||
|
- "url": "https://gitlab.gnome.org/GNOME/localsearch.git",
|
||||||
|
- "branch": "main"
|
||||||
|
+ "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git",
|
||||||
|
+ "branch": "master"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
diff --git a/data/tracker/meson.build b/data/tracker/meson.build
|
||||||
|
index 2921ca925..5320af164 100644
|
||||||
|
--- a/data/tracker/meson.build
|
||||||
|
+++ b/data/tracker/meson.build
|
||||||
|
@@ -1,12 +1,11 @@
|
||||||
|
-# 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.
|
||||||
|
+# Files needed for running Tracker inside the Flatpak sandbox, for systems
|
||||||
|
+# which don't have a suitable version of Tracker in the host OS.
|
||||||
|
#
|
||||||
|
# We must export the .service files from the sandbox so they work on the
|
||||||
|
-# session bus. This means the LocalSearch domain name must correspond with the
|
||||||
|
+# session bus. This means the Tracker domain name must correspond with the
|
||||||
|
# application ID.
|
||||||
|
|
||||||
|
-domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
|
||||||
|
+domain_ontologies_dir = get_option('datadir') / 'tracker3' / '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 23ded4583..eb7a87aa6 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/localsearch-extractor-3 --domain-ontology @domain_rule@
|
||||||
|
+Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
|
||||||
|
|
||||||
|
-# Miner details needed for localsearch-control
|
||||||
|
+# Miner details needed for tracker-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 d770619b3..4fa7371d1 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/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0
|
||||||
|
+Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
|
||||||
|
|
||||||
|
-# Miner details needed for localsearch-control
|
||||||
|
+# Miner details needed for tracker-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 4c1da5ec5..b946225e3 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[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL};
|
||||||
|
+ gchar *argv[] = {"tracker3", "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 `tinysparql3`: %s", error->message);
|
||||||
|
+ g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.46.0
|
||||||
|
|
23
0002-Revert-test-Update-to-localsearch-CLI-rename.patch
Normal file
23
0002-Revert-test-Update-to-localsearch-CLI-rename.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
From 39edbf3582c835a36d5c0b5d13f3c14fea7b960f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Williamson <awilliam@redhat.com>
|
||||||
|
Date: Thu, 8 Aug 2024 10:03:13 -0400
|
||||||
|
Subject: [PATCH 2/2] Revert "test: Update to localsearch CLI rename"
|
||||||
|
|
||||||
|
This reverts commit 9fdcb225fb1b4c8fc2df06df5f70f43809aeed0d.
|
||||||
|
---
|
||||||
|
test/automated/displayless/meson.build | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
|
||||||
|
index d0a70e1d6..13616a260 100644
|
||||||
|
--- a/test/automated/displayless/meson.build
|
||||||
|
+++ b/test/automated/displayless/meson.build
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-tracker_sandbox = find_program('localsearch')
|
||||||
|
+tracker_sandbox = find_program('localsearch3')
|
||||||
|
|
||||||
|
tests = [
|
||||||
|
['test-directory', [
|
||||||
|
--
|
||||||
|
2.46.0
|
||||||
|
|
34
0003-Revert-tests-Use-localsearch3-test-sandbox.patch
Normal file
34
0003-Revert-tests-Use-localsearch3-test-sandbox.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From 458b58d35a8234cadd7a4f3d5bfb71f14d613d3a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Williamson <awilliam@redhat.com>
|
||||||
|
Date: Thu, 8 Aug 2024 10:13:05 -0400
|
||||||
|
Subject: [PATCH 3/3] Revert "tests: Use localsearch3 test-sandbox"
|
||||||
|
|
||||||
|
This reverts commit 25f445f4d7f38f501090cca88566ffd319d69463.
|
||||||
|
---
|
||||||
|
test/automated/displayless/meson.build | 6 ++++--
|
||||||
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
|
||||||
|
index 13616a260..9d50c5084 100644
|
||||||
|
--- a/test/automated/displayless/meson.build
|
||||||
|
+++ b/test/automated/displayless/meson.build
|
||||||
|
@@ -1,4 +1,6 @@
|
||||||
|
-tracker_sandbox = find_program('localsearch3')
|
||||||
|
+trackertestutils = dependency('tracker-testutils-3.0')
|
||||||
|
+
|
||||||
|
+tracker_sandbox = find_program(trackertestutils.get_variable('command'))
|
||||||
|
|
||||||
|
tests = [
|
||||||
|
['test-directory', [
|
||||||
|
@@ -73,7 +75,7 @@ foreach t: tracker_tests
|
||||||
|
test(
|
||||||
|
t[0],
|
||||||
|
tracker_sandbox,
|
||||||
|
- args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
|
||||||
|
+ args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
|
||||||
|
env: [
|
||||||
|
test_env,
|
||||||
|
'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
|
||||||
|
--
|
||||||
|
2.46.0
|
||||||
|
|
13
default-terminal.patch
Normal file
13
default-terminal.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/src/nautilus-dbus-launcher.c b/src/nautilus-dbus-launcher.c
|
||||||
|
index bd5f5c5ec..b3f8e4db9 100644
|
||||||
|
--- a/src/nautilus-dbus-launcher.c
|
||||||
|
+++ b/src/nautilus-dbus-launcher.c
|
||||||
|
@@ -287,6 +287,6 @@ nautilus_dbus_launcher_init (NautilusDBusLauncher *self)
|
||||||
|
"org.gtk.Application");
|
||||||
|
|
||||||
|
nautilus_dbus_launcher_create_proxy (self->data[NAUTILUS_DBUS_LAUNCHER_CONSOLE],
|
||||||
|
- "org.gnome.Console", "/org/gnome/Console",
|
||||||
|
+ "org.gnome.Ptyxis", "/org/gnome/Ptyxis",
|
||||||
|
"org.freedesktop.Application");
|
||||||
|
}
|
||||||
|
|
2183
nautilus.spec
2183
nautilus.spec
File diff suppressed because it is too large
Load Diff
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (nautilus-46.2.tar.xz) = 6613342d7904a5516bd0035b72b6071cebcb1aba6083f0bbcb4e939acf74b9bb1a407090b91a2a8b73f00eb236d0d3a4a8e288681bfc63a31672b85326019150
|
SHA512 (nautilus-47.0.tar.xz) = e124f56069cee26d0be352f5c8f33016f9f5059144cf089c9d84b791d792597d1fc95d90b7187955abef877b7188a3608cd287195e3246e27f7a34b0d169907c
|
||||||
|
Loading…
Reference in New Issue
Block a user