X Strike Force XFree86 SVN commit: rev 765 - trunk/debian/patches
Author: branden
Date: 2003-11-12 23:47:39 -0500 (Wed, 12 Nov 2003)
New Revision: 765
Modified:
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Properly backport fix from XFree86 CVS HEAD for Linux kernel 2.6 header
rate/period problem; initial patch was incomplete.
- debian/patches/000_stolen_from_HEAD.diff
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2003-11-12 20:58:28 UTC (rev 764)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2003-11-13 04:47:39 UTC (rev 765)
@@ -5454,10 +5454,9 @@
}
#endif
if (setuid(verify->uid) < 0)
-diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
---- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-12 18:00:24.000000000 +1100
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-12 18:01:33.000000000 +1100
-@@ -67,6 +67,7 @@
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c~ 2003-11-12 23:19:43.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-12 23:23:38.000000000 -0500
+@@ -67,11 +67,19 @@
* from util-linux-2.9t package */
#include <linux/kd.h>
@@ -5465,3 +5464,23 @@
#ifdef __sparc__
#include <asm/param.h>
#include <asm/kbio.h>
+ #endif
+
++/* Deal with gratuitous kernel header change */
++#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
++# define rate period
++# endif
++#endif
++
+ static int
+ KDKBDREP_ioctl_ok(int rate, int delay) {
+ #if defined(KDKBDREP) && !defined(__sparc__)
+@@ -133,6 +141,7 @@
+ #endif /* KIOCSRATE */
+ }
+
++#undef rate
+
+ #if NeedFunctionPrototypes
+ void xf86SetKbdRepeat(char rad)
Reply to: