diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-03-13 22:04:03 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-03-26 07:52:37 +0200 |
| commit | d58a804837760758b4389210711d170d65be2a53 (patch) | |
| tree | ead33584f30f9b621e50ef64a799dac6dcadf573 /gnu/packages/patches | |
| parent | dde25af03e3d0ba5d94bdd814d03eee1e4907709 (diff) | |
| download | guix-d58a804837760758b4389210711d170d65be2a53.tar guix-d58a804837760758b4389210711d170d65be2a53.tar.gz | |
gnu: nautilus: Update to 43.2.
* gnu/packages/gnome.scm (nautilus): Update to 43.2.
[arguments]: Adjust ‘skip-gtk-update-icon-cache’ phase accordingly.
[inputs]: Replace glib with glib-next, gtk+ with gtk and libhandy with
libadwaita.
* gnu/packages/patches/nautilus-extension-search-path.patch: Adjust
accordingly.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/nautilus-extension-search-path.patch | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/gnu/packages/patches/nautilus-extension-search-path.patch b/gnu/packages/patches/nautilus-extension-search-path.patch index d5dc35b241..07170b12a4 100644 --- a/gnu/packages/patches/nautilus-extension-search-path.patch +++ b/gnu/packages/patches/nautilus-extension-search-path.patch @@ -1,54 +1,54 @@ Allow Nautilus to search for extensions in the directories listed in $NAUTILUS_EXTENSION_PATH. -diff --git a/src/nautilus-module.c b/src/nautilus-module.c -index bf474bd..42e2a4e 100644 ---- a/src/nautilus-module.c -+++ b/src/nautilus-module.c -@@ -211,6 +211,10 @@ static void +Index: nautilus-43.2/src/nautilus-module.c +=================================================================== +--- nautilus-43.2.orig/src/nautilus-module.c ++++ nautilus-43.2/src/nautilus-module.c +@@ -220,8 +220,13 @@ static void load_module_dir (const char *dirname) { GDir *dir; + static GHashTable *loaded = NULL; -+ ++ g_autoptr (GStrvBuilder) installed_module_name_builder = NULL; + +- g_autoptr (GStrvBuilder) installed_module_name_builder = g_strv_builder_new (); + if (loaded == NULL) + loaded = g_hash_table_new (g_str_hash, g_str_equal); - ++ ++ installed_module_name_builder = g_strv_builder_new (); dir = g_dir_open (dirname, 0, NULL); -@@ -221,15 +225,22 @@ load_module_dir (const char *dirname) - while ((name = g_dir_read_name (dir))) + if (dir) +@@ -232,13 +237,20 @@ load_module_dir (const char *dirname) { if (g_str_has_suffix (name, "." G_MODULE_SUFFIX)) -- { + { - char *filename; - - filename = g_build_filename (dirname, - name, - NULL); -- nautilus_module_load_file (filename); +- nautilus_module_load_file (filename, installed_module_name_builder); - g_free (filename); -- } -+ { -+ /* Make sure each module is loaded only twice or this could -+ lead to a crash. Double loading can occur if DIRNAME -+ occurs more than once in $NAUTILUS_EXTENSION_PATH. */ -+ if (!g_hash_table_contains (loaded, name)) -+ { -+ char *filename; ++ /* Make sure each module is loaded only twice or this could ++ lead to a crash. Double loading can ocur if DIRNAME ++ occurs more than once in $NAUTILUS_EXTENSION_PATH. */ ++ if (!g_hash_table_contains (loaded, name)) ++ { ++ char *filename; + -+ filename = g_build_filename (dirname, -+ name, -+ NULL); -+ nautilus_module_load_file (filename); -+ g_hash_table_add (loaded, g_strdup (name)); -+ g_free (filename); -+ } -+ } ++ filename = g_build_filename (dirname, ++ name, ++ NULL); ++ nautilus_module_load_file (filename, installed_module_name_builder); ++ g_hash_table_add (loaded, g_strdup (name)); ++ g_free (filename); ++ } + } } - g_dir_close (dir); -@@ -257,10 +268,24 @@ nautilus_module_setup (void) +@@ -278,10 +290,24 @@ nautilus_module_setup (void) if (!initialized) { |