From a7bbc3de3267e0b38e43148026b2c3615540d40302da1696ba3844619621d763 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 27 Dec 2022 08:59:29 +0000 Subject: [PATCH] Accepting request 1045052 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/1045052 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=497 --- gnome-control-center-43.1.tar.xz | 3 -- gnome-control-center-43.2.tar.xz | 3 ++ ...ontrol-center-fix-ws-sea-pass-toggle.patch | 28 ------------------- ...rol-center-network-use-AdwStatusPage.patch | 25 +++++++---------- gnome-control-center.changes | 23 +++++++++++++++ gnome-control-center.spec | 5 +--- 6 files changed, 37 insertions(+), 50 deletions(-) delete mode 100644 gnome-control-center-43.1.tar.xz create mode 100644 gnome-control-center-43.2.tar.xz delete mode 100644 gnome-control-center-fix-ws-sea-pass-toggle.patch diff --git a/gnome-control-center-43.1.tar.xz b/gnome-control-center-43.1.tar.xz deleted file mode 100644 index f97747d..0000000 --- a/gnome-control-center-43.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e98bc6b784afd04f297db5e8e6c59910e2cd090332710774f26dc8de89af4fc7 -size 5702380 diff --git a/gnome-control-center-43.2.tar.xz b/gnome-control-center-43.2.tar.xz new file mode 100644 index 0000000..a1afbfd --- /dev/null +++ b/gnome-control-center-43.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563 +size 5724016 diff --git a/gnome-control-center-fix-ws-sea-pass-toggle.patch b/gnome-control-center-fix-ws-sea-pass-toggle.patch deleted file mode 100644 index 30e5bfd..0000000 --- a/gnome-control-center-fix-ws-sea-pass-toggle.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d6d05abeba9dffc4840e52d24dbef871c97ae38c Mon Sep 17 00:00:00 2001 -From: Alynx Zhou -Date: Thu, 1 Dec 2022 11:17:38 +0800 -Subject: [PATCH] network: Fix wrong signal of SEA password visibility toggle - -Wrong pointer is used because of missing `_swapped`. ---- - panels/network/wireless-security/ws-sae.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/panels/network/wireless-security/ws-sae.c b/panels/network/wireless-security/ws-sae.c -index 83fe0c793..c9e4e5040 100644 ---- a/panels/network/wireless-security/ws-sae.c -+++ b/panels/network/wireless-security/ws-sae.c -@@ -212,8 +212,8 @@ ws_sae_new (NMConnection *connection) - (HelperSecretFunc) nm_setting_wireless_security_get_psk); - } - -- g_signal_connect (self->show_password_check, "toggled", -- G_CALLBACK (show_toggled_cb), self); -+ g_signal_connect_swapped (self->show_password_check, "toggled", -+ G_CALLBACK (show_toggled_cb), self); - - /* Hide WPA/RSN for now since this can be autodetected by NM and the - * supplicant when connecting to the AP. --- -GitLab - diff --git a/gnome-control-center-network-use-AdwStatusPage.patch b/gnome-control-center-network-use-AdwStatusPage.patch index e5bde73..63e008c 100644 --- a/gnome-control-center-network-use-AdwStatusPage.patch +++ b/gnome-control-center-network-use-AdwStatusPage.patch @@ -8,23 +8,26 @@ This commit also fixes missing header bar when the error is shown panels/network/cc-network-panel.c | 34 ++++++++++--------------------- 1 file changed, 11 insertions(+), 23 deletions(-) -diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c -index e80fd4a4e..24a6c6f8b 100644 ---- a/panels/network/cc-network-panel.c -+++ b/panels/network/cc-network-panel.c -@@ -658,29 +658,17 @@ panel_check_network_manager_version (CcNetworkPanel *self) +Index: gnome-control-center-43.2/panels/network/cc-network-panel.c +=================================================================== +--- gnome-control-center-43.2.orig/panels/network/cc-network-panel.c ++++ gnome-control-center-43.2/panels/network/cc-network-panel.c +@@ -650,29 +650,17 @@ panel_check_network_manager_version (CcN /* parse running version */ version = nm_client_get_version (self->client); if (version == NULL) { - GtkWidget *box; - GtkWidget *label; - g_autofree gchar *markup = NULL; -- ++ GtkWidget *status_page; + - box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20); - gtk_box_set_homogeneous (GTK_BOX (box), TRUE); - gtk_widget_set_vexpand (box, TRUE); - adw_bin_set_child (ADW_BIN (self), box); -- ++ status_page = adw_status_page_new (); ++ cc_panel_set_content (CC_PANEL (self), status_page); + - label = gtk_label_new (_("Oops, something has gone wrong. Please contact your software vendor.")); - gtk_widget_set_vexpand (label, TRUE); - gtk_label_set_wrap (GTK_LABEL (label), TRUE); @@ -39,11 +42,6 @@ index e80fd4a4e..24a6c6f8b 100644 - gtk_label_set_wrap (GTK_LABEL (label), TRUE); - gtk_widget_set_valign (label, GTK_ALIGN_START); - gtk_box_append (GTK_BOX (box), label); -+ GtkWidget *status_page; -+ -+ status_page = adw_status_page_new (); -+ cc_panel_set_content (CC_PANEL (self), status_page); -+ + adw_status_page_set_icon_name (ADW_STATUS_PAGE (status_page), "network-error-symbolic"); + adw_status_page_set_title (ADW_STATUS_PAGE (status_page), _("Can’t Connect to Network")); + adw_status_page_set_description (ADW_STATUS_PAGE (status_page), @@ -53,6 +51,3 @@ index e80fd4a4e..24a6c6f8b 100644 } else { manager_running (self); } --- -2.38.1 - diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 8db7bc4..baea19a 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Fri Dec 23 15:30:42 UTC 2022 - Bjørn Lie + +- Update to version 43.2: + + About: Update distro logo when dark-mode changes. + + Applications: Don't recurse into symlinks when clearing cache. + + Cellular: Avoid duplicated entries in SIM providers list. + + Color: Fix crash when first device row is non-existent. + + Common: Make list row switches work when annimations are OFF. + + Display: Allow the Night Light error label to wrap for small + screens. + + Mouse: Fix activation of rows while navigating with keyboard. + + Network: + - Fix crashes when EAP password is missing. + - Fix wrong signal of SEA password visibility toggle. + + Notifications: Sync lock screen notification setting string. + + Users: Show a missing-avatar image when avatars cannot be + loaded. + + Updated translations. +- Drop gnome-control-center-fix-ws-sea-pass-toggle.patch: Fixed + upstream. +- Refresh patches with quilt. + ------------------------------------------------------------------- Mon Dec 19 06:39:59 UTC 2022 - Jonathan Kang diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 72410a6..eb8a54b 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -26,7 +26,7 @@ %endif Name: gnome-control-center -Version: 43.1 +Version: 43.2 Release: 0 Summary: The GNOME Control Center License: GPL-2.0-or-later @@ -39,8 +39,6 @@ Source99: %{name}-rpmlintrc Patch0: gnome-control-center-network-use-AdwStatusPage.patch # 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-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 ### 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. @@ -188,7 +186,6 @@ GNOME control center. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 # patches for Leap >= 15 plus SLE >= 15, but not TW %if 0%{?sle_version} >= 150000