diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2026-01-31 20:28:39 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-03-06 14:53:13 +0100 |
| commit | c2f2a756f56f376b10b5223c38f1dc9dd43f6c4f (patch) | |
| tree | 2a5bf1abb90f44d3777d54c1f79bc23133345489 /gnu/packages | |
| parent | 2f18c687eb47e21017f0ec809f933fe1e7c7cbd6 (diff) | |
gnu: nautilus: Update to 48.5.
* gnu/packages/gnome.scm (nautilus): Update to 48.5.
[inputs]: Replace tracker and tracker-miners with tinysparql and localsearch.
* gnu/packages/patches/nautilus-extension-search-path.patch: Adjust accordingly.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/gnome.scm | 8 | ||||
| -rw-r--r-- | 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 fcb1f13880d..d7821dcd17a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9844,7 +9844,7 @@ through portals.") (define-public nautilus (package (name "nautilus") - (version "46.4") + (version "48.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9852,7 +9852,7 @@ through portals.") name "-" version ".tar.xz")) (sha256 (base32 - "0kb21wjvz9nb6sq29hqpzbrcxfhiiznzszj387gwjvgcyph4ipxh")) + "0bwxvapfidanblwv732w98xvvzaz3203zz2g4mcq52hwphyk7cpg")) (patches (search-patches "nautilus-extension-search-path.patch")))) (build-system meson-build-system) @@ -9922,8 +9922,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 d1f9f259cb7..2c6e6a0b3f3 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); + } |
