diff --git a/gnome-control-center-44.0+20.obscpio b/gnome-control-center-44.0+20.obscpio index b79e8a9..5b7a245 100644 --- a/gnome-control-center-44.0+20.obscpio +++ b/gnome-control-center-44.0+20.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95ed11d7c84e7fbc39f053e2b8442015b36f72f907812f68281d06f896663119 +oid sha256:a812f784a234237fcc1420fc0984db0092901f165cfb714a694de4539ebe9789 size 45768205 diff --git a/gnome-control-center-disable-error-message-for-NM.patch b/gnome-control-center-disable-error-message-for-NM.patch index 2f8139d..35e59be 100644 --- a/gnome-control-center-disable-error-message-for-NM.patch +++ b/gnome-control-center-disable-error-message-for-NM.patch @@ -1,20 +1,8 @@ -From b5ae9ddfa0df356ae7bf9445631b756883226825 Mon Sep 17 00:00:00 2001 -From: Jonathan Kang -Date: Sun, 26 Sep 2021 11:04:13 +0800 -Subject: [PATCH] add error messages when wicked is used as network manager - ---- - panels/network/cc-network-panel.c | 37 ++++++++++++++++++++++++++- - panels/network/cc-wifi-panel.c | 22 +++++++++++++++- - panels/network/cc-wifi-panel.ui | 42 +++++++++++++++++++++++++++++++ - tests/meson.build | 3 +++ - 4 files changed, 102 insertions(+), 2 deletions(-) - -Index: gnome-control-center-43.1/panels/network/cc-network-panel.c -=================================================================== ---- gnome-control-center-43.1.orig/panels/network/cc-network-panel.c -+++ gnome-control-center-43.1/panels/network/cc-network-panel.c -@@ -646,10 +646,24 @@ static void +diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c +index 6a3074ce..40fb0283 100644 +--- a/panels/network/cc-network-panel.c ++++ b/panels/network/cc-network-panel.c +@@ -659,10 +659,24 @@ static void panel_check_network_manager_version (CcNetworkPanel *self) { const gchar *version; @@ -40,7 +28,7 @@ Index: gnome-control-center-43.1/panels/network/cc-network-panel.c GtkWidget *status_page; status_page = adw_status_page_new (); -@@ -661,9 +675,23 @@ panel_check_network_manager_version (CcN +@@ -674,9 +688,23 @@ panel_check_network_manager_version (CcNetworkPanel *self) _("NetworkManager needs to be running to view or make " "connections. Contact a system administrator or the " "software vendor.")); @@ -64,22 +52,11 @@ Index: gnome-control-center-43.1/panels/network/cc-network-panel.c } static void -Index: gnome-control-center-43.1/panels/network/cc-wifi-panel.c -=================================================================== ---- gnome-control-center-43.1.orig/panels/network/cc-wifi-panel.c -+++ gnome-control-center-43.1/panels/network/cc-wifi-panel.c -@@ -425,8 +425,8 @@ remove_wifi_device (CcWifiPanel *self, - } - - /* Disconnect the signal to prevent assertion crash */ -- g_signal_handlers_disconnect_by_func (device, -- G_CALLBACK (wifi_panel_update_qr_image_cb), -+ g_signal_handlers_disconnect_by_func (device, -+ G_CALLBACK (wifi_panel_update_qr_image_cb), - self); - - /* Destroy all stack pages related to this device */ -@@ -444,21 +444,41 @@ static void +diff --git a/panels/network/cc-wifi-panel.c b/panels/network/cc-wifi-panel.c +index 8e0b17b0..495b5616 100644 +--- a/panels/network/cc-wifi-panel.c ++++ b/panels/network/cc-wifi-panel.c +@@ -302,21 +302,41 @@ static void check_main_stack_page (CcWifiPanel *self) { const gchar *nm_version; @@ -122,11 +99,11 @@ Index: gnome-control-center-43.1/panels/network/cc-wifi-panel.c } static void -Index: gnome-control-center-43.1/panels/network/cc-wifi-panel.ui -=================================================================== ---- gnome-control-center-43.1.orig/panels/network/cc-wifi-panel.ui -+++ gnome-control-center-43.1/panels/network/cc-wifi-panel.ui -@@ -311,10 +311,53 @@ +diff --git a/panels/network/cc-wifi-panel.ui b/panels/network/cc-wifi-panel.ui +index 722ca3d4..c196f984 100644 +--- a/panels/network/cc-wifi-panel.ui ++++ b/panels/network/cc-wifi-panel.ui +@@ -226,6 +226,50 @@ Error details: NetworkManager not running. @@ -177,14 +154,10 @@ Index: gnome-control-center-43.1/panels/network/cc-wifi-panel.ui -- - - - -Index: gnome-control-center-43.1/tests/meson.build -=================================================================== ---- gnome-control-center-43.1.orig/tests/meson.build -+++ gnome-control-center-43.1/tests/meson.build +diff --git a/tests/meson.build b/tests/meson.build +index 69667acb..5f6a932d 100644 +--- a/tests/meson.build ++++ b/tests/meson.build @@ -1,8 +1,11 @@ subdir('common') #subdir('datetime') diff --git a/gnome-control-center-fix-6f1567f23.patch b/gnome-control-center-fix-6f1567f23.patch new file mode 100644 index 0000000..a3ae229 --- /dev/null +++ b/gnome-control-center-fix-6f1567f23.patch @@ -0,0 +1,28 @@ +From 14b3652289df4f7d1a44c9607a3880916ef74a56 Mon Sep 17 00:00:00 2001 +From: Jonathan Kang +Date: Wed, 12 Apr 2023 15:19:13 +0800 +Subject: [PATCH] network/connection-editor: fix crash when removing a + connection + +This was caused by commit 6f1567f23. +--- + panels/network/connection-editor/net-connection-editor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c +index bb0c1c96b..297c6607e 100644 +--- a/panels/network/connection-editor/net-connection-editor.c ++++ b/panels/network/connection-editor/net-connection-editor.c +@@ -169,8 +169,8 @@ static void page_changed (NetConnectionEditor *self); + static void + cancel_editing (NetConnectionEditor *self) + { +- gtk_window_destroy (GTK_WINDOW (self)); + g_signal_emit (self, signals[DONE], 0, FALSE); ++ gtk_window_destroy (GTK_WINDOW (self)); + } + + static void +-- +2.40.0 + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 13d63f2..3e62feb 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 13 08:08:26 UTC 2023 - Jonathan Kang + +- Rebase gnome-control-center-disable-error-message-for-NM.patch +- Add gnome-control-center-fix-6f1567f23.patch: + network/connection-editor: fix crash when removing a connection + (glgo#GNOME/gnome-control-center/commit/8cb77b4d3, bsc#1210377). + ------------------------------------------------------------------- Fri Mar 31 08:18:27 UTC 2023 - bjorn.lie@gmail.com diff --git a/gnome-control-center.spec b/gnome-control-center.spec index a798959..62abd66 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -35,8 +35,10 @@ URL: https://apps.gnome.org/app/org.gnome.Settings Source0: %{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc -# PATCH-NEED-REBASE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running WAS:PATCH-FIX-OPENSUSE +# PATCH-FIX-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running WAS:PATCH-FIX-OPENSUSE Patch1: gnome-control-center-disable-error-message-for-NM.patch +# PATCH-FIX-UPSTREAM gnome-control-center-fix-6f1567f23.patch glgo#GNOME/gnome-control-center/commit/8cb77b4d3, bsc#1210377 sckang@suse.com -- network/connection-editor: fix crash when removing a connection +Patch2: gnome-control-center-fix-6f1567f23.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. @@ -181,7 +183,8 @@ GNOME control center. %prep %setup -q -#patch1 -p1 +%patch1 -p1 +%patch2 -p1 # patches for Leap >= 15 plus SLE >= 15, but not TW %if 0%{?sle_version} >= 150000