debian/changelog | 10 ++++++++ debian/patches/171_xkb_geometry_copying.patch | 30 ++++++++++++++++++++++++++ debian/patches/series | 1 3 files changed, 41 insertions(+)
New commits: commit 6b7fd78abc77237f4170371a08a5e490bb8fa258 Author: Bryce Harrington <[email protected]> Date: Fri Mar 27 19:51:49 2009 -0700 Found another bug that I think will be fixed by this diff --git a/debian/changelog b/debian/changelog index c6c6b32..312d851 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,9 @@ xorg-server (2:1.6.0-0ubuntu6) UNRELEASED; urgency=low - Fixes crash when plugging/unplugging USB devices due to incorrect copying of XKB geometry base_color and label_color. Patch cherrypicked from upstream. - (LP: #333222) + (LP: #333222, #321946) - -- Bryce Harrington <[email protected]> Fri, 27 Mar 2009 19:36:24 -0700 + -- Bryce Harrington <[email protected]> Fri, 27 Mar 2009 19:41:43 -0700 xorg-server (2:1.6.0-0ubuntu5) jaunty; urgency=low commit a41541aad29bb4397a7f9da22f968030d90351eb Author: Bryce Harrington <[email protected]> Date: Fri Mar 27 19:39:09 2009 -0700 Fix for 333222 - crash when plugging/unplugging USB devices diff --git a/debian/changelog b/debian/changelog index 5dcde04..c6c6b32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +xorg-server (2:1.6.0-0ubuntu6) UNRELEASED; urgency=low + + * Add 171_xkb_geometry_copying.patch: + - Fixes crash when plugging/unplugging USB devices due to incorrect + copying of XKB geometry base_color and label_color. Patch + cherrypicked from upstream. + (LP: #333222) + + -- Bryce Harrington <[email protected]> Fri, 27 Mar 2009 19:36:24 -0700 + xorg-server (2:1.6.0-0ubuntu5) jaunty; urgency=low [Tormod Volden] diff --git a/debian/patches/171_xkb_geometry_copying.patch b/debian/patches/171_xkb_geometry_copying.patch new file mode 100644 index 0000000..f94c5a2 --- /dev/null +++ b/debian/patches/171_xkb_geometry_copying.patch @@ -0,0 +1,30 @@ +commit f5bf1fdaf36163d5c2f1b9b51df96326ebbb0e9c +Author: Peter Hutterer <[email protected]> +Date: Fri Feb 13 09:56:22 2009 +1000 + + xkb: Fix wrong colour reference in XKB geometry copying. #20081 + + base_color and label_color need to reference the color in the destination, not + in the source. + + X.Org Bug 20081 <http://bugs.freedesktop.org/show_bug.cgi?id=20081> + + Signed-off-by: Peter Hutterer <[email protected]> + Signed-off-by: Daniel Stone <[email protected]> + +diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c +index aa63b35..9a1edc9 100644 +--- a/xkb/xkbUtils.c ++++ b/xkb/xkbUtils.c +@@ -1955,9 +1955,9 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst) + + strcpy(dst->geom->label_font, src->geom->label_font); + i = XkbGeomColorIndex(src->geom, src->geom->label_color); +- dst->geom->label_color = &(src->geom->colors[i]); ++ dst->geom->label_color = &(dst->geom->colors[i]); + i = XkbGeomColorIndex(src->geom, src->geom->base_color); +- dst->geom->base_color = &(src->geom->colors[i]); ++ dst->geom->base_color = &(dst->geom->colors[i]); + } + else { + if (dst->geom->label_font) { diff --git a/debian/patches/series b/debian/patches/series index 27cb6ef..9de2217 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -27,3 +27,4 @@ 169_mipointer_nullptr_checks.patch #999_default_modedebug_on.patch 170_primary_pci_video_device.patch +171_xkb_geometry_copying.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
