Accepting request 973115 from GNOME:Next

Update to 42.1

OBS-URL: https://build.opensuse.org/request/show/973115
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=481

gnome-control-center-42.0-fix-sharing-panel-crash.patch

@@ -1,48 +0,0 @@
-From c2f088ac5220f3a64edc2c15e60fc0d7f1dfc9e5 Mon Sep 17 00:00:00 2001
-From: Hu Jialun <hujialun@comp.nus.edu.sg>
-Date: Mon, 28 Mar 2022 14:35:21 +0800
-Subject: [PATCH] sharing/remote-desktop: Fallback when getlogin() fails
-
-getlogin() can fail for several reasons as detailed in the man page, and
-the current behaviour is a segmentation fault when it fails and returns
-NULL.
-
-Make it fallback to getpwuid(getuid())->pw_name when that happens to
-prevent crashing.
----
- panels/sharing/cc-sharing-panel.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/panels/sharing/cc-sharing-panel.c b/panels/sharing/cc-sharing-panel.c
-index d126a2236..e65ebf92d 100644
---- a/panels/sharing/cc-sharing-panel.c
-+++ b/panels/sharing/cc-sharing-panel.c
-@@ -45,6 +45,9 @@
- 
- #include <config.h>
- 
-+#include <unistd.h>
-+#include <pwd.h>
-+
- static void cc_sharing_panel_setup_label_with_hostname (CcSharingPanel *self, GtkWidget *label);
- static GtkWidget *cc_sharing_panel_new_media_sharing_row (const char     *uri_or_path,
-                                                           CcSharingPanel *self);
-@@ -1372,9 +1375,13 @@ cc_sharing_panel_setup_remote_desktop_dialog (CcSharingPanel *self)
-                             G_CALLBACK (remote_desktop_credentials_changed),
-                             self);
- 
--  if (username == NULL)
-+  if (username == NULL) {
-+    username = getlogin ();
-+    if (username == NULL)
-+      username = getpwuid (getuid ())->pw_name;
-     gtk_editable_set_text (GTK_EDITABLE (self->remote_desktop_username_entry),
--                           getlogin ());
-+                           username);
-+  }
-   if (password == NULL)
-     gtk_editable_set_text (GTK_EDITABLE (self->remote_desktop_password_entry),
-                            pw_generate ());
--- 
-GitLab
-

gnome-control-center-42.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda
-size 6238096

gnome-control-center-42.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb30aff90fbe1d2ad56107d6e9f5f8a4a3aaf3635bbd88920d75b568bb776785
+size 6239960

gnome-control-center-goa-helper-on-X11.patch

@@ -1,32 +0,0 @@
-From 7fe322b9cedae313cd9af6f403eab9bfc6027674 Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar@gmail.com>
-Date: Mon, 28 Mar 2022 21:02:23 +0200
-Subject: [PATCH] online-accounts: Fix goa-helper on X11
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The handle_str contains the “x11:” prefix so strtol would return 0.
-We need to pass it the numeric substring.
-
-Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1651
----
- panels/online-accounts/gnome-control-center-goa-helper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panels/online-accounts/gnome-control-center-goa-helper.c b/panels/online-accounts/gnome-control-center-goa-helper.c
-index 56513147e..533609cbc 100644
---- a/panels/online-accounts/gnome-control-center-goa-helper.c
-+++ b/panels/online-accounts/gnome-control-center-goa-helper.c
-@@ -129,7 +129,7 @@ set_external_parent_from_handle (GtkApplication *application,
-           int xid;
- 
-           errno = 0;
--          xid = strtol (handle_str, NULL, 16);
-+          xid = strtol (handle_str + strlen (x11_prefix), NULL, 16);
-           if (errno != 0)
-             {
-               g_warning ("Failed to reference external X11 window, invalid XID %s", handle_str);
--- 
-GitLab
-

gnome-control-center-reload-vpn-plugins.patch

@@ -1,19 +0,0 @@
-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) {

gnome-control-center.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Wed Apr 27 11:31:19 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 42.1:
+  + Display:
+    - Various small behavior improvements.
+    - Fix monitor labels.
+  + Network: Improve handling of VPN connections.
+  + Online Accounts:
+    - Fix behavior of helper application on X11.
+    - Fix changes to online accounts services not applying
+      correctly.
+  + User Accounts: Various small polishments.
+  + Wacom: Properly translate various strings.
+  + Updated translations.
+- Drop upstream fixed patches:
+  + gnome-control-center-reload-vpn-plugins.patch
+  + gnome-control-center-goa-helper-on-X11.patch
+  + gnome-control-center-42.0-fix-sharing-panel-crash.patch
+  + 1283.patch
+
+-------------------------------------------------------------------
+Thu Apr 21 14:28:29 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add 1283.patch: user-accounts: close password change dialog.
+  Addresses boo#1198235: Fail to change password on GNOME42.
+
 -------------------------------------------------------------------
 Wed Mar 30 05:25:34 UTC 2022 - Luciano Santos <luc14n0@opensuse.org>
 

gnome-control-center.spec

@@ -26,7 +26,7 @@
 %endif
 
 Name:           gnome-control-center
-Version:        42.0
+Version:        42.1
 Release:        0
 Summary:        The GNOME Control Center
 License:        GPL-2.0-or-later
@@ -36,16 +36,6 @@ Source0:        https://download.gnome.org/sources/gnome-control-center/42/%{nam
 
 # PATCH-NEEDS-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
 Patch0:         gnome-control-center-disable-error-message-for-NM.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
-Patch1:         gnome-control-center-reload-vpn-plugins.patch
-# PATCH-FIX_UPSTREAM gnome-control-center-goa-helper-on-X11.patch glgo#GNOME/gnome-control-center!1651 badshah400@gmail.com -- Fix GOA helper not showing up on X11
-Patch2:         gnome-control-center-goa-helper-on-X11.patch
-# PATCH-FIX-UPSTREAM gnome-control-center-42.0-fix-sharing-panel-crash.patch -- luc14n0@opensuse.org
-#  Sharing panel crashes when inicialized due to getlogin() returning NULL rather than the username.
-#  Upstream issue: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1727
-#  Bug report: https://bugzilla.opensuse.org/show_bug.cgi?id=1197529
-#  Based on commit: c2f088ac5220f3a64edc2c15e60fc0d7f1dfc9e5
-Patch3:         gnome-control-center-42.0-fix-sharing-panel-crash.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.
@@ -190,9 +180,6 @@ GNOME control center.
 %setup -q
 # Patch needs rebase
 #%%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # patches for Leap >= 15 plus SLE >= 15, but not TW
 %if 0%{?sle_version} >= 150000