Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gnome-control-center for
openSUSE:Factory checked in at 2022-12-08 16:01:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old)
and /work/SRC/openSUSE:Factory/.gnome-control-center.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-control-center"
Thu Dec 8 16:01:53 2022 rev:219 rq: version:43.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes
2022-12-07 17:35:45.380799110 +0100
+++
/work/SRC/openSUSE:Factory/.gnome-control-center.new.1835/gnome-control-center.changes
2022-12-08 16:01:54.588748961 +0100
@@ -2,17 +1,0 @@
-Thu Dec 6 09:00:52 UTC 2022 - Jonathan Kang <[email protected]>
-
-- Rebase gnome-control-center-disable-error-message-for-NM.patch.
-- Add gnome-control-center-network-use-AdwStatusPage.patch:
- network-panel: Use AdwStatusPage to show NetworkManager error.
- This is needed by the above rebased patch
- (glgo#GNOME/gnome-control-center/commit/2b3de01124).
-
--------------------------------------------------------------------
-Tue Dec 6 04:31:50 UTC 2022 - Alynx Zhou <[email protected]>
-
-- Add gnome-control-center-fix-ws-sea-pass-toggle.patch: Fix crash
- when user clicking password visibility toggle in Security page
- when method is WPA3 Personal
- (glgo#GNOME/gnome-control-center!1520).
-
--------------------------------------------------------------------
Old:
----
gnome-control-center-fix-ws-sea-pass-toggle.patch
gnome-control-center-network-use-AdwStatusPage.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-control-center.spec ++++++
--- /var/tmp/diff_new_pack.RGTPNC/_old 2022-12-08 16:01:55.240752470 +0100
+++ /var/tmp/diff_new_pack.RGTPNC/_new 2022-12-08 16:01:55.248752513 +0100
@@ -35,12 +35,8 @@
Source0:
https://download.gnome.org/sources/gnome-control-center/43/%{name}-%{version}.tar.xz
Source99: %{name}-rpmlintrc
-# PATCH-FIX-UPSTREAM gnome-control-center-network-use-AdwStatusPage.patch
glgo#GNOME/gnome-contorl-center/commit/2b3de01124 [email protected]
network-panel: Use AdwStatusPage to show NetworkManager error.
-Patch0: gnome-control-center-network-use-AdwStatusPage.patch
-# PATCH-FIX-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch
bsc#989801 [email protected] -- 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-ws-sea-pass-toggle.patch
glgo#GNOME/gnome-control-center!1520 -- network: Fix wrong signal of SEA
password visibility toggle
-Patch2: gnome-control-center-fix-ws-sea-pass-toggle.patch
+# PATCH-NEEDS-REBASE gnome-control-center-disable-error-message-for-NM.patch
bsc#989801 [email protected] -- network: Improve the check for whether NM or
wicked is running Was:PATCH-FIX-OPENSUSE
+Patch0: gnome-control-center-disable-error-message-for-NM.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 [email protected] -- 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.
@@ -186,9 +182,8 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+# Patch needs rebase
+#%%patch0 -p1
# patches for Leap >= 15 plus SLE >= 15, but not TW
%if 0%{?sle_version} >= 150000
++++++ gnome-control-center-disable-error-message-for-NM.patch ++++++
--- /var/tmp/diff_new_pack.RGTPNC/_old 2022-12-08 16:01:55.284752707 +0100
+++ /var/tmp/diff_new_pack.RGTPNC/_new 2022-12-08 16:01:55.288752728 +0100
@@ -1,8 +1,20 @@
-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
+From b5ae9ddfa0df356ae7bf9445631b756883226825 Mon Sep 17 00:00:00 2001
+From: Jonathan Kang <[email protected]>
+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(-)
+
+diff --git a/panels/network/cc-network-panel.c
b/panels/network/cc-network-panel.c
+index 01b164ea0..d32e94d09 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -643,10 +643,24 @@ static void
panel_check_network_manager_version (CcNetworkPanel *self)
{
const gchar *version;
@@ -25,23 +37,31 @@
version = nm_client_get_version (self->client);
- if (version == NULL) {
+ if (version == NULL && g_strcmp0 (state, "inactive") == 0) {
- GtkWidget *status_page;
+ GtkWidget *box;
+ GtkWidget *label;
+ g_autofree gchar *markup = NULL;
+@@ -671,10 +685,31 @@ panel_check_network_manager_version (CcNetworkPanel
*self)
+ gtk_widget_set_valign (label, GTK_ALIGN_START);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
- status_page = adw_status_page_new ();
-@@ -661,9 +675,23 @@ panel_check_network_manager_version (CcN
- _("NetworkManager needs to
be running to view or make "
- "connections. Contact a
system administrator or the "
- "software vendor."));
++ gtk_widget_show_all (box);
+ } else if (version == NULL && g_strcmp0 (state, "active") == 0) {
-+ GtkWidget *status_page;
++ GtkWidget *box;
++ GtkWidget *label;
+
-+ status_page = adw_status_page_new ();
-+ cc_panel_set_content (CC_PANEL (self), status_page);
++ gtk_container_remove (GTK_CONTAINER (self), gtk_bin_get_child
(GTK_BIN (self)));
+
-+ adw_status_page_set_icon_name (ADW_STATUS_PAGE (status_page),
"network-error-symbolic");
-+ adw_status_page_set_title (ADW_STATUS_PAGE (status_page),
_("Wicked is running"));
-+ adw_status_page_set_description (ADW_STATUS_PAGE
(status_page),
-+ _("Please use YaST2 to
configure your network."));
++ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
++ gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
++ gtk_widget_set_vexpand (box, TRUE);
++ gtk_container_add (GTK_CONTAINER (self), box);
++
++ label = gtk_label_new (_("Please use YaST2 to configure your
network."));
++ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
++ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
++ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
++
+ gtk_widget_show_all (box);
} else {
manager_running (self);
}
@@ -52,22 +72,11 @@
}
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 9ca6e6ee5..c4622e684 100644
+--- a/panels/network/cc-wifi-panel.c
++++ b/panels/network/cc-wifi-panel.c
+@@ -439,21 +439,41 @@ static void
check_main_stack_page (CcWifiPanel *self)
{
const gchar *nm_version;
@@ -110,14 +119,15 @@
}
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,6 +311,48 @@
- </object>
+diff --git a/panels/network/cc-wifi-panel.ui b/panels/network/cc-wifi-panel.ui
+index 2ac7570f9..5a53f9a57 100644
+--- a/panels/network/cc-wifi-panel.ui
++++ b/panels/network/cc-wifi-panel.ui
+@@ -318,6 +318,48 @@
+ <property name="name">nm-not-running</property>
+ </packing>
</child>
-
++
+ <!-- "Wicked Running" page -->
+ <child>
+ <object class="GtkBox">
@@ -159,14 +169,13 @@
+ <property name="name">wicked-running</property>
+ </packing>
+ </child>
-+
</object>
</child>
-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 d4fe361ef..da3bd104d 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
@@ -1,8 +1,11 @@
subdir('common')
#subdir('datetime')
@@ -179,4 +188,7 @@
subdir('interactive-panels')
+--
+2.31.1
+
