Julien Cristau pushed to branch debian-unstable at X Strike Force / app / x11-xkb-utils
Commits:
-
2e4db4c2
by Julien Cristau at 2022-04-25T18:50:36+02:00
-
7ac3d7fd
by Julien Cristau at 2022-04-25T18:53:23+02:00
4 changed files:
- debian/changelog
- debian/control
- + debian/patches/01_Be-more-careful-about-querying-randr.diff
- debian/patches/series
Changes:
| 1 | +x11-xkb-utils (7.7+7) unstable; urgency=medium
|
|
| 2 | + |
|
| 3 | + * Fix setxkbmap crash in d-i (closes: #1010161)
|
|
| 4 | + |
|
| 5 | + -- Julien Cristau <jcristau@debian.org> Mon, 25 Apr 2022 18:53:16 +0200
|
|
| 6 | + |
|
| 1 | 7 | x11-xkb-utils (7.7+6) unstable; urgency=medium
|
| 2 | 8 | |
| 3 | 9 | [ Jelmer Vernooij ]
|
| ... | ... | @@ -22,7 +22,7 @@ Build-Depends: |
| 22 | 22 | # xkbprint: libx11-dev, libxkbfile-dev
|
| 23 | 23 | # xkbutils: libx11-dev, libxaw7-dev, x11proto-core-dev
|
| 24 | 24 | Standards-Version: 4.5.0
|
| 25 | -Vcs-Git: https://salsa.debian.org/xorg-team/app/x11-xkb-utils
|
|
| 25 | +Vcs-Git: https://salsa.debian.org/xorg-team/app/x11-xkb-utils.git
|
|
| 26 | 26 | Vcs-Browser: https://salsa.debian.org/xorg-team/app/x11-xkb-utils
|
| 27 | 27 | |
| 28 | 28 | Package: x11-xkb-utils
|
| 1 | +From 1c5597c529a8a8f836cd4da6e22e65c74c588064 Mon Sep 17 00:00:00 2001
|
|
| 2 | +From: Julien Cristau <jcristau@debian.org>
|
|
| 3 | +Date: Mon, 25 Apr 2022 15:41:26 +0200
|
|
| 4 | +Subject: [PATCH app/setxkbmap] Be more careful about querying randr
|
|
| 5 | + |
|
| 6 | +Check for extension version and number of outputs:
|
|
| 7 | +XRRGetScreenResourcesCurrent was added in v1.3. Also, there's no
|
|
| 8 | +guarantee it returns any outputs, and we don't want to die with a
|
|
| 9 | +BadRROutput error.
|
|
| 10 | +---
|
|
| 11 | + setxkbmap.c | 5 ++++-
|
|
| 12 | + 1 file changed, 4 insertions(+), 1 deletion(-)
|
|
| 13 | + |
|
| 14 | +Forwarded: https://gitlab.freedesktop.org/xorg/app/setxkbmap/-/merge_requests/4
|
|
| 15 | + |
|
| 16 | +diff --git a/setxkbmap/setxkbmap.c b/setxkbmap/setxkbmap.c
|
|
| 17 | +index 96761a0..6b6259c 100644
|
|
| 18 | +--- a/setxkbmap/setxkbmap.c
|
|
| 19 | ++++ b/setxkbmap/setxkbmap.c
|
|
| 20 | +@@ -1090,9 +1090,12 @@ is_xwayland(void)
|
|
| 21 | + /* e.g. Xnest, but definitely not Xwayland */
|
|
| 22 | + goto out;
|
|
| 23 | + }
|
|
| 24 | ++ if (major < 1 || (major == 1 && minor < 3)) {
|
|
| 25 | ++ goto out;
|
|
| 26 | ++ }
|
|
| 27 | +
|
|
| 28 | + resources = XRRGetScreenResourcesCurrent(dpy, DefaultRootWindow(dpy));
|
|
| 29 | +- if (!resources) {
|
|
| 30 | ++ if (!resources || resources->noutput < 1) {
|
|
| 31 | + goto out;
|
|
| 32 | + }
|
|
| 33 | +
|
|
| 34 | +--
|
|
| 35 | +2.30.2
|
|
| 36 | + |
| 1 | +01_Be-more-careful-about-querying-randr.diff
|
|
| 1 | 2 | #11_xkb_documentation_updates.diff -p0 |