| 1 |
commit: e1b75bb5ecb953f5501cce82dabe07994aff338f |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 8 18:03:29 2022 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 8 18:04:20 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b75bb5 |
| 7 |
|
| 8 |
gnome-base/gnome-control-center: Add patch to fix goa-helper on X11 |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
...2.0-online-accounts-Fix-goa-helper-on-X11.patch | 32 ++++++++++++++++++++++ |
| 13 |
....ebuild => gnome-control-center-42.0-r1.ebuild} | 2 ++ |
| 14 |
2 files changed, 34 insertions(+) |
| 15 |
|
| 16 |
diff --git a/gnome-base/gnome-control-center/files/42.0-online-accounts-Fix-goa-helper-on-X11.patch b/gnome-base/gnome-control-center/files/42.0-online-accounts-Fix-goa-helper-on-X11.patch |
| 17 |
new file mode 100644 |
| 18 |
index 000000000000..dfa56eab9e61 |
| 19 |
--- /dev/null |
| 20 |
+++ b/gnome-base/gnome-control-center/files/42.0-online-accounts-Fix-goa-helper-on-X11.patch |
| 21 |
@@ -0,0 +1,32 @@ |
| 22 |
+From 7fe322b9cedae313cd9af6f403eab9bfc6027674 Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Jan Tojnar <jtojnar@×××××.com> |
| 24 |
+Date: Mon, 28 Mar 2022 21:02:23 +0200 |
| 25 |
+Subject: [PATCH] online-accounts: Fix goa-helper on X11 |
| 26 |
+MIME-Version: 1.0 |
| 27 |
+Content-Type: text/plain; charset=UTF-8 |
| 28 |
+Content-Transfer-Encoding: 8bit |
| 29 |
+ |
| 30 |
+The handle_str contains the “x11:” prefix so strtol would return 0. |
| 31 |
+We need to pass it the numeric substring. |
| 32 |
+ |
| 33 |
+Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1651 |
| 34 |
+--- |
| 35 |
+ panels/online-accounts/gnome-control-center-goa-helper.c | 2 +- |
| 36 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 37 |
+ |
| 38 |
+diff --git a/panels/online-accounts/gnome-control-center-goa-helper.c b/panels/online-accounts/gnome-control-center-goa-helper.c |
| 39 |
+index 56513147e..533609cbc 100644 |
| 40 |
+--- a/panels/online-accounts/gnome-control-center-goa-helper.c |
| 41 |
++++ b/panels/online-accounts/gnome-control-center-goa-helper.c |
| 42 |
+@@ -129,7 +129,7 @@ set_external_parent_from_handle (GtkApplication *application, |
| 43 |
+ int xid; |
| 44 |
+ |
| 45 |
+ errno = 0; |
| 46 |
+- xid = strtol (handle_str, NULL, 16); |
| 47 |
++ xid = strtol (handle_str + strlen (x11_prefix), NULL, 16); |
| 48 |
+ if (errno != 0) |
| 49 |
+ { |
| 50 |
+ g_warning ("Failed to reference external X11 window, invalid XID %s", handle_str); |
| 51 |
+-- |
| 52 |
+2.35.1 |
| 53 |
+ |
| 54 |
|
| 55 |
diff --git a/gnome-base/gnome-control-center/gnome-control-center-42.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-42.0-r1.ebuild |
| 56 |
similarity index 98% |
| 57 |
rename from gnome-base/gnome-control-center/gnome-control-center-42.0.ebuild |
| 58 |
rename to gnome-base/gnome-control-center/gnome-control-center-42.0-r1.ebuild |
| 59 |
index 43a08b3e178c..70008f3ef6ff 100644 |
| 60 |
--- a/gnome-base/gnome-control-center/gnome-control-center-42.0.ebuild |
| 61 |
+++ b/gnome-base/gnome-control-center/gnome-control-center-42.0-r1.ebuild |
| 62 |
@@ -118,6 +118,8 @@ BDEPEND=" |
| 63 |
" |
| 64 |
|
| 65 |
PATCHES=( |
| 66 |
+ "${FILESDIR}"/${PV}-online-accounts-Fix-goa-helper-on-X11.patch |
| 67 |
+ |
| 68 |
# Patches from gnome-40 branch on top of 40.0 |
| 69 |
# Makes some panels and dependencies optional |
| 70 |
# https://bugzilla.gnome.org/686840, 697478, 700145 |
Archives