tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-28 12:01:49 +02:00
Code Activity

gnu: nautilus: Update to 48.5.

Browse Source 
* 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.
This commit is contained in:
Maxim Cournoyer
2026-01-31 20:28:39 +01:00
committed by Andreas Enge
parent 2f18c687eb
commit c2f2a756f5
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gnu/packages/gnome.scm
+4 -4
View File
@@ -9844,7 +9844,7 @@ through portals.")
(define-public nautilus (define-public nautilus
(package (package
(name "nautilus") (name "nautilus")
(version "46.4") (version "48.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@@ -9852,7 +9852,7 @@ through portals.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0kb21wjvz9nb6sq29hqpzbrcxfhiiznzszj387gwjvgcyph4ipxh")) "0bwxvapfidanblwv732w98xvvzaz3203zz2g4mcq52hwphyk7cpg"))
(patches (patches
(search-patches "nautilus-extension-search-path.patch")))) (search-patches "nautilus-extension-search-path.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
@@ -9922,8 +9922,8 @@ through portals.")
libportal libportal
libseccomp libseccomp
libselinux libselinux
tracker localsearch
tracker-miners tinysparql
;; XXX: gtk is required by libnautilus-extension.pc ;; XXX: gtk is required by libnautilus-extension.pc
;; ;;
;; Don't propagate it to reduce "profile pollution" of the 'gnome' meta ;; Don't propagate it to reduce "profile pollution" of the 'gnome' meta
gnu/packages/patches/nautilus-extension-search-path.patch
+3 -8
View File
@@ -5,17 +5,12 @@ Index: nautilus-46.1/src/nautilus-module.c
=================================================================== ===================================================================
--- nautilus-46.1.orig/src/nautilus-module.c --- nautilus-46.1.orig/src/nautilus-module.c
+++ nautilus-46.1/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) load_module_dir (const char *dirname)
{ {
GDir *dir; GDir *dir;
- -
+ static GHashTable *loaded = NULL; + 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) + if (loaded == NULL)
+ loaded = g_hash_table_new (g_str_hash, g_str_equal); + 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, - filename = g_build_filename (dirname,
- name, - name,
- NULL); - NULL);
- nautilus_module_load_file (filename, installed_module_name_builder); - nautilus_module_load_file (filename);
- g_free (filename); - g_free (filename);
+ /* Make sure each module is loaded only twice or this could + /* Make sure each module is loaded only twice or this could
+ lead to a crash. Double loading can occur if DIRNAME + 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, + filename = g_build_filename (dirname,
+ name, + name,
+ NULL); + NULL);
+ nautilus_module_load_file (filename, installed_module_name_builder); + nautilus_module_load_file (filename);
+ g_hash_table_add (loaded, g_strdup (name)); + g_hash_table_add (loaded, g_strdup (name));
+ g_free (filename); + g_free (filename);
+ } + }