rpms/xorg-x11-server/FC-5 xorg-x11-server-1.0.1-debug-bz187083.patch, NONE, 1.1.2.1 xorg-x11-server.spec, 1.46.2.1, 1.46.2.2

[fedora-cvs-commits at redhat.com]

Author: dwmw2

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

Modified Files:
      Tag: private-wtf-bz187083-branch
	xorg-x11-server.spec 
Added Files:
      Tag: private-wtf-bz187083-branch
	xorg-x11-server-1.0.1-debug-bz187083.patch 
Log Message:
more debug


xorg-x11-server-1.0.1-debug-bz187083.patch:
 lnx_KbdMap.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-server-1.0.1-debug-bz187083.patch ---
--- xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c~	2005-07-03 11:51:16.000000000 +0100
+++ xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c	2006-04-02 16:36:39.000000000 +0100
@@ -36,7 +36,7 @@
  *      and the modifiermap is computed.
  */
 
-static void readKernelMapping(InputInfoPtr pInfo,
+void readKernelMapping(InputInfoPtr pInfo,
                               KeySymsPtr pKeySyms, CARD8 *pModMap);
 void
 KbdGetMapping (InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
@@ -251,7 +251,7 @@ static unsigned char at2lnx[NUM_KEYCODES
 
 #define NUM_CUSTOMKEYS	NR_KEYS
 
-static void
+void
 readKernelMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
 {
   KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
@@ -286,6 +286,8 @@ readKernelMapping(InputInfoPtr pInfo, Ke
     k = map+GLYPHS_PER_KEY;
     maxkey = NUM_AT2LNX;
   }
+  ErrorF("readKernelMapping. map %p is of size 0x%x (i.e. ends %p)\n", map, sizeof(map), ((char *)map)+sizeof(map));
+  ErrorF("NUM_CUSTOMKEYS %d, NUM_AT2LNX %d, NUM_KEYCODES %d, GLYPHS_PER_KEY %d\n", NUM_CUSTOMKEYS, NUM_AT2LNX, NUM_KEYCODES, GLYPHS_PER_KEY);
 
   for (i = 0; i < maxkey; ++i)
   {
@@ -301,6 +303,7 @@ readKernelMapping(InputInfoPtr pInfo, Ke
     {
       unsigned short kval;
 
+      ErrorF("i is %d, j is %d, k is %p\n", i, j, k);
       *k = NoSymbol;
 
       kbe.kb_table = tbl[j];


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.46.2.1
retrieving revision 1.46.2.2
diff -u -r1.46.2.1 -r1.46.2.2
--- xorg-x11-server.spec	2 Apr 2006 13:09:12 -0000	1.46.2.1
+++ xorg-x11-server.spec	2 Apr 2006 15:37:46 -0000	1.46.2.2
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   9.wtf.1
+Release:   9.wtf.2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -35,6 +35,8 @@
 Patch1000:  xorg-redhat-die-ugly-pattern-die-die-die.patch
 Patch1001:  xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
 
+Patch2000: xorg-x11-server-1.0.1-debug-bz187083.patch
+
 # INFO: We don't ship the X server on s390/s390x/ppc64
 #ExcludeArch: s390 s390x ppc64
 ExclusiveArch: ppc
@@ -254,6 +256,8 @@
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
 
+%patch2000 -p1 -b .wtf
+
 %build
 #FONTDIR="${datadir}/X11/fonts"
 #DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"