From bc3a3888c2be85477d5f3f09c5aafafa5275b0f50f3e9ed6cc150e28ec9df045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 29 Mar 2022 19:58:42 +0000 Subject: [PATCH] Accepting request 965683 from home:badshah400:branches:GNOME:Factory Add gnome-control-center-goa-helper-on-X11.patch: Fix GOA helper not showing up on X11 [glgo#GNOME/gnome-control-center!1651]. OBS-URL: https://build.opensuse.org/request/show/965683 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=477 --- gnome-control-center-goa-helper-on-X11.patch | 32 ++++++++++++++++++++ gnome-control-center.changes | 6 ++++ gnome-control-center.spec | 3 ++ 3 files changed, 41 insertions(+) create mode 100644 gnome-control-center-goa-helper-on-X11.patch diff --git a/gnome-control-center-goa-helper-on-X11.patch b/gnome-control-center-goa-helper-on-X11.patch new file mode 100644 index 0000000..bc3f549 --- /dev/null +++ b/gnome-control-center-goa-helper-on-X11.patch @@ -0,0 +1,32 @@ +From 7fe322b9cedae313cd9af6f403eab9bfc6027674 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +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 + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 996058e..f5389a2 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 29 13:54:31 UTC 2022 - Atri Bhattacharya + +- Add gnome-control-center-goa-helper-on-X11.patch: Fix GOA helper + not showing up on X11 [glgo#GNOME/gnome-control-center!1651]. + ------------------------------------------------------------------- Fri Mar 18 21:53:18 UTC 2022 - Bjørn Lie diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 31b10c6..be0706b 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -38,6 +38,8 @@ Source0: https://download.gnome.org/sources/gnome-control-center/42/%{nam 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 Patch3: 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 +Patch4: gnome-control-center-goa-helper-on-X11.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,6 +183,7 @@ GNOME control center. # Patch needs rebase #%%patch0 -p1 %patch3 -p1 +%patch4 -p1 # patches for Leap >= 15 plus SLE >= 15, but not TW %if 0%{?sle_version} >= 150000