From 7f7ec496eaaeac66a25f20c94800c9775829bb67eb013396c859e34f9cd39776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 18 Mar 2022 10:22:45 +0000 Subject: [PATCH] Accepting request 962297 from home:JonathanKang:branches:GNOME:Factory - Add gnome-control-center-reload-vpn-plugins.patch: network/connection-editor: always load all available VPN plugins (glgo#GNOME/gnome-control-center!1263). OBS-URL: https://build.opensuse.org/request/show/962297 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=473 --- gnome-control-center-reload-vpn-plugins.patch | 19 +++++++++++++++++++ gnome-control-center.changes | 7 +++++++ gnome-control-center.spec | 3 +++ 3 files changed, 29 insertions(+) create mode 100644 gnome-control-center-reload-vpn-plugins.patch diff --git a/gnome-control-center-reload-vpn-plugins.patch b/gnome-control-center-reload-vpn-plugins.patch new file mode 100644 index 0000000..946816a --- /dev/null +++ b/gnome-control-center-reload-vpn-plugins.patch @@ -0,0 +1,19 @@ +Index: gnome-control-center-41.4/panels/network/connection-editor/vpn-helpers.c +=================================================================== +--- gnome-control-center-41.4.orig/panels/network/connection-editor/vpn-helpers.c ++++ gnome-control-center-41.4/panels/network/connection-editor/vpn-helpers.c +@@ -53,14 +53,9 @@ _sort_vpn_plugins (NMVpnPluginInfo *aa, + GSList * + vpn_get_plugins (void) + { +- static gboolean plugins_loaded = FALSE; + static GSList *plugins = NULL; + GSList *p; + +- if (G_LIKELY (plugins_loaded)) +- return plugins; +- plugins_loaded = TRUE; +- + p = nm_vpn_plugin_info_list_load (); + plugins = NULL; + while (p) { diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 92c0578..63ecc65 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 16 06:47:50 UTC 2022 - Jonathan Kang + +- Add gnome-control-center-reload-vpn-plugins.patch: + network/connection-editor: always load all available VPN plugins + (glgo#GNOME/gnome-control-center!1263). + ------------------------------------------------------------------- Mon Feb 14 09:05:02 UTC 2022 - Bjørn Lie diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 4f0086d..ac8242b 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -40,6 +40,8 @@ Patch0: gnome-control-center-disable-error-message-for-NM.patch Patch1: gnome-control-center-fix-autologin-shortcut.patch # PATCH-FIX-UPSTREAM 496c719d7b1492b54c34ace648feb3802f34f774.patch -- Remove duplicate line from .desktop file Patch2: https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/496c719d7b1492b54c34ace648feb3802f34f774.patch +# PATCH-FIX-UPSTREAM gnome-control-center-reload-vpn-plugins.patch glgo#GNOME/gnome-control-center!1263 sckang@suse.com -- network/connection-editor: always load all available VPN plugins +Patch3: gnome-control-center-reload-vpn-plugins.patch ### patches for Leap >= 15 plus SLE >= 15, but not TW # PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer. @@ -185,6 +187,7 @@ GNOME control center. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # patches for Leap >= 15 plus SLE >= 15, but not TW %if 0%{?sle_version} >= 150000 %patch1001 -p1