Bug#988184: unblock: gnome-desktop3/3.38.5-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: debian-gtk-gnome@lists.debian.org
I'd like to update gnome-desktop3 in bullseye.
[ Reason ]
Fix bad UI for keyboard layouts in gnome-control-center, caused by a
regression in changes backported from GNOME 40.
[ Impact ]
If not fixed, when users add a keyboard layout in gnome-control-center,
all keyboard layouts not already in use are listed in a very large
"Other" category. The intended UI is that if the user already has at
least one English keyboard layout, then English (GB), English (US),
English (Dvorak), etc. are more conveniently available as an "English"
category, and similar for other languages.
[ Tests ]
Manually tested: I can reproduce the bug with 3.38.5-1 and it is fixed with
3.38.5-2. The same patch is also in Ubuntu 21.04 already.
[ Risks ]
Key package, but a simple and obvious change.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock gnome-desktop3/3.38.5-2
diffstat for gnome-desktop3-3.38.5 gnome-desktop3-3.38.5
changelog | 15 +++++++
patches/series | 1
patches/xkbinfo-Update-iso639Ids-correctly-in-evdev.patch | 27 ++++++++++++++
3 files changed, 43 insertions(+)
diff -Nru gnome-desktop3-3.38.5/debian/changelog gnome-desktop3-3.38.5/debian/changelog
--- gnome-desktop3-3.38.5/debian/changelog 2021-03-23 07:47:36.000000000 +0000
+++ gnome-desktop3-3.38.5/debian/changelog 2021-05-04 20:42:48.000000000 +0100
@@ -1,3 +1,18 @@
+gnome-desktop3 (3.38.5-2) unstable; urgency=medium
+
+ * Team upload
+
+ [ Gunnar Hjalmarsson ]
+ * d/p/xkbinfo-Update-iso639Ids-correctly-in-evdev.patch:
+ Don't list all keyboard layouts under "Other" in
+ gnome-control-center's list of input sources
+ (Closes: #987603, LP: #1925792)
+
+ [ Simon McVittie ]
+ * Improve patch metadata
+
+ -- Simon McVittie <smcv@debian.org> Tue, 04 May 2021 20:42:48 +0100
+
gnome-desktop3 (3.38.5-1) unstable; urgency=medium
* New upstream release
diff -Nru gnome-desktop3-3.38.5/debian/patches/series gnome-desktop3-3.38.5/debian/patches/series
--- gnome-desktop3-3.38.5/debian/patches/series 2021-03-23 07:47:36.000000000 +0000
+++ gnome-desktop3-3.38.5/debian/patches/series 2021-05-04 20:42:48.000000000 +0100
@@ -3,3 +3,4 @@
xkbinfo-refactor-some-of-the-rules-parsing.patch
test-convert-the-xkbinfo-test-to-produce-YAML.patch
xkbinfo-use-libxkbregistry-to-parse-the-rules-files-for-u.patch
+xkbinfo-Update-iso639Ids-correctly-in-evdev.patch
diff -Nru gnome-desktop3-3.38.5/debian/patches/xkbinfo-Update-iso639Ids-correctly-in-evdev.patch gnome-desktop3-3.38.5/debian/patches/xkbinfo-Update-iso639Ids-correctly-in-evdev.patch
--- gnome-desktop3-3.38.5/debian/patches/xkbinfo-Update-iso639Ids-correctly-in-evdev.patch 1970-01-01 01:00:00.000000000 +0100
+++ gnome-desktop3-3.38.5/debian/patches/xkbinfo-Update-iso639Ids-correctly-in-evdev.patch 2021-05-04 20:42:48.000000000 +0100
@@ -0,0 +1,27 @@
+From: Takao Fujiwara <tfujiwar@redhat.com>
+Date: Fri, 12 Feb 2021 20:45:26 +0900
+Subject: xkbinfo: Update iso639Ids but not iso3166Ids correctly in evdev
+
+rxkb parser updates iso3166Ids by mistake for iso639Ids elements in evdev.
+
+Origin: upstream, 40~beta, https://gitlab.gnome.org/GNOME/gnome-desktop/-/commit/a56f1349
+Bug: https://gitlab.gnome.org/GNOME/gnome-desktop/-/issues/187
+Bug-Debian: https://bugs.debian.org/987603
+Bug-Ubuntu: https://launchpad.net/bugs/1925792
+---
+ libgnome-desktop/gnome-xkb-info.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgnome-desktop/gnome-xkb-info.c b/libgnome-desktop/gnome-xkb-info.c
+index 6140921..b2eca69 100644
+--- a/libgnome-desktop/gnome-xkb-info.c
++++ b/libgnome-desktop/gnome-xkb-info.c
+@@ -258,7 +258,7 @@ add_layouts (GnomeXkbInfo *self,
+ iso639 = rxkb_iso639_code_next (iso639))
+ {
+ char *id = g_strdup (rxkb_iso639_code_get_code (iso639));
+- l->iso3166Ids = g_slist_prepend (l->iso3166Ids, id);
++ l->iso639Ids = g_slist_prepend (l->iso639Ids, id);
+ }
+ for (iso3166 = rxkb_layout_get_iso3166_first (layout);
+ iso3166;
Reply to: