guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit 1e98ad12a25b84073de646af69c89b60152b7031
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Mon May 19 14:01:22 2025 +0900
gnu: nautilus: Update to 48.3.
* gnu/packages/gnome.scm (nautilus): Update to 48.3.
[inputs]: Replace tracker and tracker-miners with tinysparql and
localsearch.
* gnu/packages/patches/nautilus-extension-search-path.patch: Adjust
accordingly.
---
gnu/packages/gnome.scm | 8 ++++----
gnu/packages/patches/nautilus-extension-search-path.patch | 11 +++--------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 61fbda5ecb..eb9d3b5dad 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9849,7 +9849,7 @@ through portals.")
(define-public nautilus
(package
(name "nautilus")
- (version "46.4")
+ (version "48.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -9857,7 +9857,7 @@ through portals.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0kb21wjvz9nb6sq29hqpzbrcxfhiiznzszj387gwjvgcyph4ipxh"))
+ "0g9rbgnaf981nvmzjkn04b3mr14vk30d5m51qy1v038n0nhax8i1"))
(patches
(search-patches "nautilus-extension-search-path.patch"))))
(build-system meson-build-system)
@@ -9927,8 +9927,8 @@ through portals.")
libportal
libseccomp
libselinux
- tracker
- tracker-miners
+ localsearch
+ tinysparql
;; XXX: gtk is required by libnautilus-extension.pc
;;
;; Don't propagate it to reduce "profile pollution" of the 'gnome'
meta
diff --git a/gnu/packages/patches/nautilus-extension-search-path.patch
b/gnu/packages/patches/nautilus-extension-search-path.patch
index d1f9f259cb..2c6e6a0b3f 100644
--- a/gnu/packages/patches/nautilus-extension-search-path.patch
+++ b/gnu/packages/patches/nautilus-extension-search-path.patch
@@ -5,17 +5,12 @@ Index: nautilus-46.1/src/nautilus-module.c
===================================================================
--- nautilus-46.1.orig/src/nautilus-module.c
+++ nautilus-46.1/src/nautilus-module.c
-@@ -219,8 +219,16 @@ static void
+@@ -219,7 +219,11 @@ static void
load_module_dir (const char *dirname)
{
GDir *dir;
-
+ static GHashTable *loaded = NULL;
- g_autoptr (GStrvBuilder) installed_module_name_builder =
g_strv_builder_new ();
-+
-+ if (installed_module_names != NULL)
-+ g_strv_builder_addv (installed_module_name_builder,
-+ (const gchar **)installed_module_names);
+
+ if (loaded == NULL)
+ loaded = g_hash_table_new (g_str_hash, g_str_equal);
@@ -32,7 +27,7 @@ Index: nautilus-46.1/src/nautilus-module.c
- filename = g_build_filename (dirname,
- name,
- NULL);
-- nautilus_module_load_file (filename,
installed_module_name_builder);
+- nautilus_module_load_file (filename);
- g_free (filename);
+ /* Make sure each module is loaded only twice or this could
+ lead to a crash. Double loading can occur if DIRNAME
@@ -44,7 +39,7 @@ Index: nautilus-46.1/src/nautilus-module.c
+ filename = g_build_filename (dirname,
+ name,
+ NULL);
-+ nautilus_module_load_file (filename,
installed_module_name_builder);
++ nautilus_module_load_file (filename);
+ g_hash_table_add (loaded, g_strdup (name));
+ g_free (filename);
+ }
