X Strike Force XFree86 SVN commit: r1305 - in trunk/debian: . patches
Author: branden
Date: 2004-04-23 01:00:04 -0500 (Fri, 23 Apr 2004)
New Revision: 1305
Added:
trunk/debian/patches/088_fix_keyboard_rate_ioctls.diff
Modified:
trunk/debian/changelog
Log:
Fix AT keyboard rate I/O controls by operating on the actual console file
descriptor, not on file descriptor zero (thanks, Keith Packard).
Suppresses warning messages from Linux 2.6. (Closes: #224909)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-23 05:44:56 UTC (rev 1304)
+++ trunk/debian/changelog 2004-04-23 06:00:04 UTC (rev 1305)
@@ -288,8 +288,12 @@
override current definitions of Alt keys or the Mod1 modifier map (thanks,
Denis Barbier). (Closes: #234081)
- -- Branden Robinson <branden@debian.org> Wed, 21 Apr 2004 13:46:08 -0500
+ * Fix AT keyboard rate I/O controls by operating on the actual console file
+ descriptor, not on file descriptor zero (thanks, Keith Packard).
+ Suppresses warning messages from Linux 2.6. (Closes: #224909)
+ -- Branden Robinson <branden@debian.org> Fri, 23 Apr 2004 00:58:44 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Added: trunk/debian/patches/088_fix_keyboard_rate_ioctls.diff
===================================================================
--- trunk/debian/patches/088_fix_keyboard_rate_ioctls.diff 2004-04-23 05:44:56 UTC (rev 1304)
+++ trunk/debian/patches/088_fix_keyboard_rate_ioctls.diff 2004-04-23 06:00:04 UTC (rev 1305)
@@ -0,0 +1,50 @@
+$Id$
+
+Fix AT keyboard rate I/O controls by operating on the actual console file
+descriptor, not on file descriptor zero. Suppresses warning messages from
+Linux 2.6. See Debian #224909.
+
+This patch by Keith Packard.
+
+diff -urN xc/programs/Xserver/hw/xfree86/os-support/linux~/lnx_io.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
+--- xc/programs/Xserver/hw/xfree86/os-support/linux~/lnx_io.c 2004-04-23 00:45:50.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-04-23 00:48:01.000000000 -0500
+@@ -92,7 +92,7 @@
+ /* don't change, just test */
+ kbdrep_s.rate = -1;
+ kbdrep_s.delay = -1;
+- if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
++ if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) {
+ return 0;
+ }
+
+@@ -107,7 +107,7 @@
+ if (kbdrep_s.delay < 1)
+ kbdrep_s.delay = 1;
+
+- if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
++ if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) {
+ return 0;
+ }
+
+diff -urN xc/programs/Xserver/hw/xfree86/os-support/linux~/lnx_kbd.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
+--- xc/programs/Xserver/hw/xfree86/os-support/linux~/lnx_kbd.c 2004-04-23 00:45:50.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-04-23 00:48:01.000000000 -0500
+@@ -120,7 +120,7 @@
+ /* don't change, just test */
+ kbdrep_s.rate = -1;
+ kbdrep_s.delay = -1;
+- if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
++ if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) {
+ return 0;
+ }
+
+@@ -135,7 +135,7 @@
+ if (kbdrep_s.delay < 1)
+ kbdrep_s.delay = 1;
+
+- if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
++ if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) {
+ return 0;
+ }
+
Property changes on: trunk/debian/patches/088_fix_keyboard_rate_ioctls.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: