Author: branden
Date: 2004-01-27 00:31:33 -0500 (Tue, 27 Jan 2004)
New Revision: 972
Modified:
trunk/debian/patches/098_fix_lnx_io_kbd_rate_fix.diff
Log:
Make patch actually apply to XFree86 4.2.1.
Modified: trunk/debian/patches/098_fix_lnx_io_kbd_rate_fix.diff
===================================================================
--- trunk/debian/patches/098_fix_lnx_io_kbd_rate_fix.diff 2004-01-27
03:44:01 UTC (rev 971)
+++ trunk/debian/patches/098_fix_lnx_io_kbd_rate_fix.diff 2004-01-27
05:31:33 UTC (rev 972)
@@ -8,13 +8,13 @@
Not submitted upstream yet.
---- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.orig
2004-01-16 13:17:05.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-01-16
13:17:15.000000000 -0500
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.orig
2004-01-27 00:21:06.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-01-27
00:24:57.000000000 -0500
@@ -73,7 +73,9 @@
#include <asm/kbio.h>
#endif
--/* Deal with spurious kernel header change */
+-/* Deal with gratuitous kernel header change */
+/* Deal with spurious kernel header change in struct kbd_repeat.
+ We undo this define after the routine using that struct is over,
+ so as not to interfere with other 'rate' elements. */
@@ -35,30 +35,3 @@
static int
KIOCSRATE_ioctl_ok(int rate, int delay) {
#ifdef KIOCSRATE
---- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig
2004-01-16 13:17:10.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-01-16
13:18:21.000000000 -0500
-@@ -100,7 +100,9 @@
- #include <asm/kbio.h>
- #endif
-
--/* Deal with spurious kernel header change */
-+/* Deal with spurious kernel header change in struct kbd_repeat.
-+ We undo this define after the routine using that struct is over,
-+ so as not to interfere with other 'rate' elements. */
- #if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
- # if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
- # define rate period
-@@ -142,6 +144,13 @@
- #endif /* KDKBDREP */
- }
-
-+/* Undo the earlier define for the struct kbd_repeat problem. */
-+#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
-+# undef rate
-+# endif
-+#endif
-+
- static int
- KIOCSRATE_ioctl_ok(int rate, int delay) {
- #ifdef KIOCSRATE
