From 725cccff6b0155d7885e8d1afb8875d0f2dac008 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Feb 16 2009 06:04:44 +0000
Subject: * Mon Feb 16 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.3-12

- xserver-1.5.3-xkb-colors.patch: fix color copying in XKB geometry
  (#469572)

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 3536d7c..c1a1b8c 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.3
-Release:   11%{?dist}
+Release:   12%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -99,6 +99,8 @@ Patch6007: xserver-1.5.3-aspect-me-harder.patch
 
 # pushed upstream
 Patch6008: xserver-1.5.3-xinerama-events.patch
+# RH 469572, FDO 20081
+Patch6009: xserver-1.5.3-xkb-colors.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -531,6 +533,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb 16 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.3-12
+- xserver-1.5.3-xkb-colors.patch: fix color copying in XKB geometry
+  (#469572)
+
 * Fri Feb 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.3-11
 - Update 10-x11-keymap.fdi: only call fedora-setup-keyboard for devices with
   input.capabilities = keyboard (#484217)
diff --git a/xserver-1.5.3-xkb-colors.patch b/xserver-1.5.3-xkb-colors.patch
new file mode 100644
index 0000000..6b49c90
--- /dev/null
+++ b/xserver-1.5.3-xkb-colors.patch
@@ -0,0 +1,35 @@
+From 97b23d4a932a493c5f6dc470925a67ad684e4f0f Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 13 Feb 2009 09:56:22 +1000
+Subject: [PATCH] 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 <peter.hutterer@who-t.net>
+Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+---
+ xkb/xkbUtils.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+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) {
+-- 
+1.6.0.6
+