rpms/xorg-x11-server/FC-6 xserver-1.2.0-xephyr-keysym-madness.patch, NONE, 1.1 xorg-x11-server.spec, 1.185, 1.186

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv13460

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.2.0-xephyr-keysym-madness.patch 
Log Message:
* Mon Jan 29 2007 Adam Jackson <ajax at redhat.com> 1.1.1-47.5.fc6
- Fix Xephyr keysym init on LP64. (#224311)


xserver-1.2.0-xephyr-keysym-madness.patch:
 hostx.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE xserver-1.2.0-xephyr-keysym-madness.patch ---
--- xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c.jx	2006-07-05 14:31:39.000000000 -0400
+++ xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c	2007-01-29 17:56:34.000000000 -0500
@@ -77,9 +77,10 @@
 
 static int            HostXWantDamageDebug = 0;
 
-extern KeySym         EphyrKeymap[];
+/* these two need to be 32-bits. do not say KeySym, that way lies madness */
+extern unsigned int   EphyrKeymap[];
+extern unsigned int   kdKeymap[];
 
-extern KeySym	      kdKeymap[];
 extern int	      kdMinScanCode;
 extern int	      kdMaxScanCode;
 extern int	      kdMinKeyCode;
@@ -668,7 +669,7 @@
 void
 hostx_load_keymap(void)
 {
-  KeySym          *keymap;
+  unsigned int	   *keymap;
   int              mapWidth, min_keycode, max_keycode;
   int              i,j;
 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-6/xorg-x11-server.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- xorg-x11-server.spec	9 Jan 2007 22:54:00 -0000	1.185
+++ xorg-x11-server.spec	29 Jan 2007 22:59:12 -0000	1.186
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   47.4%{?dist}
+Release:   47.5%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -27,6 +27,7 @@
 Patch11:   xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch
 Patch12:   xorg-x11-server-1.1.1-graphics-expose.patch
 Patch13:   xorg-x11-server-1.1.1-xkb-vidmode-switch.patch
+Patch14:   xserver-1.2.0-xephyr-keysym-madness.patch
 
 # http://xorg.freedesktop.org/releases/X11R7.1/patches/xorg-xserver-1.1.0-dbe-render.diff
 Patch50:   xorg-xserver-1.1.0-dbe-render.diff
@@ -357,6 +358,7 @@
 %patch11 -p1 -b .vt-activate
 %patch12 -p1 -b .graphics-expose
 %patch13 -p1 -b .xkb-vidmode-switch
+%patch14 -p1 -b .xephyr-keysym
 
 %patch50 -p1 -b .alloca
 
@@ -735,6 +737,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Jan 29 2007 Adam Jackson <ajax at redhat.com> 1.1.1-47.5.fc6
+- Fix Xephyr keysym init on LP64. (#224311)
+
 * Tue Jan 09 2007 Adam Jackson <ajax at redhat.com> 1.1.1-47.4.fc6
 - xorg-xserver-1.1.0-dbe-render.diff: CVE #2006-6101.