pool/gnome-control-center
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1079274 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1079274
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=226
This commit is contained in:
Dominique Leuenberger 2023-04-14 11:58:39 +00:00 committed by Git OBS Bridge
commit 54a602f17b
5 changed files with 62 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnome-control-center-44.0+20.obscpio
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:95ed11d7c84e7fbc39f053e2b8442015b36f72f907812f68281d06f896663119 oid sha256:a812f784a234237fcc1420fc0984db0092901f165cfb714a694de4539ebe9789
size 45768205 size 45768205

67
gnome-control-center-disable-error-message-for-NM.patch
View File

@ -1,20 +1,8 @@
From b5ae9ddfa0df356ae7bf9445631b756883226825 Mon Sep 17 00:00:00 2001 diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
From: Jonathan Kang <jonathankang@gnome.org> index 6a3074ce..40fb0283 100644
Date: Sun, 26 Sep 2021 11:04:13 +0800 --- a/panels/network/cc-network-panel.c
Subject: [PATCH] add error messages when wicked is used as network manager +++ b/panels/network/cc-network-panel.c
@@ -659,10 +659,24 @@ static void
---
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
panel_check_network_manager_version (CcNetworkPanel *self) panel_check_network_manager_version (CcNetworkPanel *self)
{ {
const gchar *version; const gchar *version;
@ -40,7 +28,7 @@ Index: gnome-control-center-43.1/panels/network/cc-network-panel.c
GtkWidget *status_page; GtkWidget *status_page;
status_page = adw_status_page_new (); 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 " _("NetworkManager needs to be running to view or make "
"connections. Contact a system administrator or the " "connections. Contact a system administrator or the "
"software vendor.")); "software vendor."));
@ -64,22 +52,11 @@ Index: gnome-control-center-43.1/panels/network/cc-network-panel.c
} }
static void static void
Index: gnome-control-center-43.1/panels/network/cc-wifi-panel.c diff --git a/panels/network/cc-wifi-panel.c b/panels/network/cc-wifi-panel.c
=================================================================== index 8e0b17b0..495b5616 100644
--- gnome-control-center-43.1.orig/panels/network/cc-wifi-panel.c --- a/panels/network/cc-wifi-panel.c
+++ gnome-control-center-43.1/panels/network/cc-wifi-panel.c +++ b/panels/network/cc-wifi-panel.c
@@ -425,8 +425,8 @@ remove_wifi_device (CcWifiPanel *self, @@ -302,21 +302,41 @@ static void
}
/* 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
check_main_stack_page (CcWifiPanel *self) check_main_stack_page (CcWifiPanel *self)
{ {
const gchar *nm_version; const gchar *nm_version;
@ -122,11 +99,11 @@ Index: gnome-control-center-43.1/panels/network/cc-wifi-panel.c
} }
static void static void
Index: gnome-control-center-43.1/panels/network/cc-wifi-panel.ui diff --git a/panels/network/cc-wifi-panel.ui b/panels/network/cc-wifi-panel.ui
=================================================================== index 722ca3d4..c196f984 100644
--- gnome-control-center-43.1.orig/panels/network/cc-wifi-panel.ui --- a/panels/network/cc-wifi-panel.ui
+++ gnome-control-center-43.1/panels/network/cc-wifi-panel.ui +++ b/panels/network/cc-wifi-panel.ui
@@ -311,10 +311,53 @@ @@ -226,6 +226,50 @@ Error details: NetworkManager not running.</property>
</object> </object>
</child> </child>
@ -177,14 +154,10 @@ Index: gnome-control-center-43.1/panels/network/cc-wifi-panel.ui
</object> </object>
</child> </child>
- diff --git a/tests/meson.build b/tests/meson.build
</object> index 69667acb..5f6a932d 100644
</child> --- a/tests/meson.build
+++ b/tests/meson.build
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
@@ -1,8 +1,11 @@ @@ -1,8 +1,11 @@
subdir('common') subdir('common')
#subdir('datetime') #subdir('datetime')

28
gnome-control-center-fix-6f1567f23.patch Normal file
View File

@ -0,0 +1,28 @@
From 14b3652289df4f7d1a44c9607a3880916ef74a56 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathankang@gnome.org>
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

8
gnome-control-center.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Apr 13 08:08:26 UTC 2023 - Jonathan Kang <songchuan.kang@suse.com>
- 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 Fri Mar 31 08:18:27 UTC 2023 - bjorn.lie@gmail.com

7
gnome-control-center.spec
View File

@ -35,8 +35,10 @@ URL: https://apps.gnome.org/app/org.gnome.Settings
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
Source99: %{name}-rpmlintrc 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 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 ### 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. # 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 %prep
%setup -q %setup -q
#patch1 -p1 %patch1 -p1
%patch2 -p1
# patches for Leap >= 15 plus SLE >= 15, but not TW # patches for Leap >= 15 plus SLE >= 15, but not TW
%if 0%{?sle_version} >= 150000 %if 0%{?sle_version} >= 150000