From 08b044418fe76980147ee33750b02e36068b398a Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Jan 29 2007 23:07:35 +0000
Subject: * Wed Jan 24 2007 Adam Jackson <ajax@redhat.com> 1.2.0-2

- Delete ModulePath lines rather than attempt to munge them.  (#186338)

---

diff --git a/xserver-1.2.0-xephyr-keysym-madness.patch b/xserver-1.2.0-xephyr-keysym-madness.patch
index 7e22253..becc829 100644
--- a/xserver-1.2.0-xephyr-keysym-madness.patch
+++ b/xserver-1.2.0-xephyr-keysym-madness.patch
@@ -1,5 +1,5 @@
---- 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
+--- xorg-server-1.2.0/hw/kdrive/ephyr/hostx.c.xephyr-keysym	2007-01-22 22:13:14.000000000 -0500
++++ xorg-server-1.2.0/hw/kdrive/ephyr/hostx.c	2007-01-29 17:58:00.000000000 -0500
 @@ -77,9 +77,10 @@
  
  static int            HostXWantDamageDebug = 0;
@@ -13,12 +13,12 @@
  extern int	      kdMinScanCode;
  extern int	      kdMaxScanCode;
  extern int	      kdMinKeyCode;
-@@ -668,7 +669,7 @@
+@@ -662,7 +663,7 @@
  void
  hostx_load_keymap(void)
  {
 -  KeySym          *keymap;
-+  unsigned int	   *keymap;
-   int              mapWidth, min_keycode, max_keycode;
++  unsigned int     *keymap;
+   int              host_width, min_keycode, max_keycode, width;
    int              i,j;