From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Thu, 18 Mar 2004 10:34:40 +0000 (+0000)
Subject: - more of it
X-Git-Tag: auto/ac/XFree86-4_4_0-1~1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=0fe126157619654b7d253f3371c918ce9dcf6e72;p=packages%2FXFree86.git

- more of it

Changed files:
    XFree86-lnx_kbd.patch -> 1.2
---

diff --git a/XFree86-lnx_kbd.patch b/XFree86-lnx_kbd.patch
index 0496c0c..1c6bd00 100644
--- a/XFree86-lnx_kbd.patch
+++ b/XFree86-lnx_kbd.patch
@@ -1,5 +1,47 @@
---- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig	2004-02-16 18:25:42.000000000 +0100
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	2004-02-16 18:29:53.875110184 +0100
+Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
+diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c:3.26 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c:3.27
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c:3.26	Mon Nov 17 22:20:41 2003
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c	Wed Mar  3 18:53:41 2004
+@@ -81,7 +81,7 @@
+ #endif
+ 
+ static int
+-KDKBDREP_ioctl_ok(int rate, int delay) {
++KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
+ #if defined(KDKBDREP) && !defined(__sparc__)
+      /* This ioctl is defined in <linux/kd.h> but is not
+ 	implemented anywhere - must be in some m68k patches. */
+@@ -90,7 +90,7 @@
+    /* don't change, just test */
+    kbdrep_s.rate = -1;
+    kbdrep_s.delay = -1;
+-   if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
++   if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
+        return 0;
+    }
+ 
+@@ -105,7 +105,7 @@
+    if (kbdrep_s.delay < 1)
+      kbdrep_s.delay = 1;
+    
+-   if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
++   if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
+      return 0;
+    }
+ 
+@@ -174,7 +174,7 @@
+     delay = xf86Info.kbdDelay;
+ 
+ 
+-  if(KDKBDREP_ioctl_ok(rate, delay)) 	/* m68k? */
++  if(KDKBDREP_ioctl_ok(xf86Info.consoleFd, rate, delay)) 	/* m68k? */
+     return;
+ 
+   if(KIOCSRATE_ioctl_ok(rate, delay))	/* sparc? */
+Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
+diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c:1.5 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c:1.6
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c:1.5	Tue Nov  4 03:14:39 2003
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	Wed Mar  3 18:53:41 2004
 @@ -108,7 +108,7 @@
  #endif