summaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-10-29 11:38:01 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-11-11 12:18:28 -0500
commitb64d3bb6d45757b2b280b5c6fd45990989c2fcfd (patch)
treeba9b362a0ea46c6eff9d2e9b7fe5b26f2ef7e3e0 /gnu/packages/patches
parentf19ea27ad08aa12045bebb806a9575f6881e1e9c (diff)
gnu: network-manager: Update to 1.32.12.
* gnu/packages/gnome.scm (network-manager): Update to 1.32.12. [origin]: Remove snippet field. [meson]: New argument. [phases]: Remove trailing #t. {pre-configure}: Adjust; disable failing jansson test. * gnu/packages/patches/network-manager-plugin-path.patch: Adjust patch.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/network-manager-plugin-path.patch69
1 files changed, 30 insertions, 39 deletions
diff --git a/gnu/packages/patches/network-manager-plugin-path.patch b/gnu/packages/patches/network-manager-plugin-path.patch
index 505ae31534..ec6767aaac 100644
--- a/gnu/packages/patches/network-manager-plugin-path.patch
+++ b/gnu/packages/patches/network-manager-plugin-path.patch
@@ -3,49 +3,40 @@ From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= <sleep_walker@gnu.org>
Date: Wed, 3 Jul 2019 13:31:54 +0200
Subject: [PATCH] respect NM_VPN_PLUGIN_DIR
----
- src/vpn/nm-vpn-manager.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/vpn/nm-vpn-manager.c b/src/vpn/nm-vpn-manager.c
-index d063916..d779166 100644
---- a/src/vpn/nm-vpn-manager.c
-+++ b/src/vpn/nm-vpn-manager.c
-@@ -223,6 +223,7 @@ nm_vpn_manager_init (NMVpnManager *self)
- GSList *infos, *info;
- const char *conf_dir_etc = _nm_vpn_plugin_info_get_default_dir_etc ();
- const char *conf_dir_lib = _nm_vpn_plugin_info_get_default_dir_lib ();
-+ const char *conf_dir_user = _nm_vpn_plugin_info_get_default_dir_user ();
+--- a/src/core/vpn/nm-vpn-manager.c 2021-10-29 13:20:01.062917840 -0400
++++ b/src/core/vpn/nm-vpn-manager.c 2021-10-29 13:26:46.094397018 -0400
+@@ -211,6 +211,7 @@
+ GSList * infos, *info;
+ const char * conf_dir_etc = _nm_vpn_plugin_info_get_default_dir_etc();
+ const char * conf_dir_lib = _nm_vpn_plugin_info_get_default_dir_lib();
++ const char * conf_dir_user = _nm_vpn_plugin_info_get_default_dir_user ();
- /* Watch the VPN directory for changes */
- file = g_file_new_for_path (conf_dir_lib);
-@@ -241,6 +242,14 @@ nm_vpn_manager_init (NMVpnManager *self)
- G_CALLBACK (vpn_dir_changed), self);
- }
+ /* Watch the VPN directory for changes */
+ file = g_file_new_for_path(conf_dir_lib);
+@@ -229,6 +230,14 @@
+ g_signal_connect(priv->monitor_etc, "changed", G_CALLBACK(vpn_dir_changed), self);
+ }
-+ file = g_file_new_for_path (conf_dir_user);
-+ priv->monitor_etc = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL, NULL);
-+ g_object_unref (file);
-+ if (priv->monitor_etc) {
-+ priv->monitor_id_etc = g_signal_connect (priv->monitor_etc, "changed",
-+ G_CALLBACK (vpn_dir_changed), self);
-+ }
++ file = g_file_new_for_path (conf_dir_user);
++ priv->monitor_etc = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL, NULL);
++ g_object_unref (file);
++ if (priv->monitor_etc) {
++ priv->monitor_id_etc =
++ g_signal_connect (priv->monitor_etc, "changed", G_CALLBACK (vpn_dir_changed), self);
++ }
+
- /* first read conf_dir_lib. The name files are not really user configuration, but
- * plugin configuration. Hence we expect ~newer~ plugins to install their files
- * in /usr/lib/NetworkManager. We want to prefer those files.
-@@ -255,6 +264,11 @@ nm_vpn_manager_init (NMVpnManager *self)
- try_add_plugin (self, info->data);
- g_slist_free_full (infos, g_object_unref);
+ /* first read conf_dir_lib. The name files are not really user configuration, but
+ * plugin configuration. Hence we expect ~newer~ plugins to install their files
+ * in /usr/lib/NetworkManager. We want to prefer those files.
+@@ -243,6 +252,11 @@
+ try_add_plugin(self, info->data);
+ g_slist_free_full(infos, g_object_unref);
-+ infos = _nm_vpn_plugin_info_list_load_dir (conf_dir_user, TRUE, 0, NULL, NULL);
-+ for (info = infos; info; info = info->next)
-+ try_add_plugin (self, info->data);
-+ g_slist_free_full (infos, g_object_unref);
++ infos = _nm_vpn_plugin_info_list_load_dir(conf_dir_user, TRUE, 0, NULL, NULL);
++ for (info = infos; info; info = info->next)
++ try_add_plugin (self, info->data);
++ g_slist_free_full (infos, g_object_unref);
+
- priv->active_services = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, NULL);
+ priv->active_services = g_hash_table_new_full(nm_str_hash, g_str_equal, g_free, NULL);
}
---
-2.22.0
-