Author: branden
Date: 2004-01-15 12:36:38 -0500 (Thu, 15 Jan 2004)
New Revision: 918
Added:
branches/4.3.0/sid/debian/patches/050_fix_lnx_io_kbd_rate_fix.diff
Modified:
branches/4.3.0/sid/debian/TODO
branches/4.3.0/sid/debian/changelog
Log:
Neutralize the workaround for the Linux kernel kbd_rate structure change
after it is no longer needed, so that we don't inadvertently re-#define a
symbol used by the Linux kernel's kbd_repeat structure. Yeesh. Fixes
FTBFS on SPARC (thanks, Daniel Jacobowitz and Nathanael Nerode!)
(Closes: #220814)
(debian/patches/050_fix_lnx_io_kbd_rate_fix.diff): Add patch.
(debian/TODO): Remove 4.3.0-1 showstopper item.
Modified: branches/4.3.0/sid/debian/TODO
===================================================================
--- branches/4.3.0/sid/debian/TODO 2004-01-15 14:16:04 UTC (rev 917)
+++ branches/4.3.0/sid/debian/TODO 2004-01-15 17:36:38 UTC (rev 918)
@@ -4,8 +4,6 @@
-1
--
-* Fix #220814
-
* ensure packages are at least as functional on the architectures in
testing as the 4.2.1 packages are (so that no arch sees a horrendous
regression)
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-15 14:16:04 UTC (rev 917)
+++ branches/4.3.0/sid/debian/changelog 2004-01-15 17:36:38 UTC (rev 918)
@@ -79,8 +79,15 @@
- debian/patches/030b_radeon_rv280_support.diff
[Michel Dänzer]
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 14 Jan 2004 13:12:27 -0500
+ * Neutralize the workaround for the Linux kernel kbd_rate structure change
+ after it is no longer needed, so that we don't inadvertently re-#define a
+ symbol used by the Linux kernel's kbd_repeat structure. Yeesh. Fixes
+ FTBFS on SPARC (thanks, Daniel Jacobowitz and Nathanael Nerode!)
+ (Closes: #220814)
+ - debian/patches/050_fix_lnx_io_kbd_rate_fix.diff
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 15 Jan 2004 12:29:23 -0500
+
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
* Grab fixes to upstream CVS xf-4_3-branch since last pull.
Added: branches/4.3.0/sid/debian/patches/050_fix_lnx_io_kbd_rate_fix.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/050_fix_lnx_io_kbd_rate_fix.diff
2004-01-15 14:16:04 UTC (rev 917)
+++ branches/4.3.0/sid/debian/patches/050_fix_lnx_io_kbd_rate_fix.diff
2004-01-15 17:36:38 UTC (rev 918)
@@ -0,0 +1,37 @@
+$Id$
+
+Upstream's workaround for structure rejiggering in the Linux kernel needs
+to be undone before the symbol in question is used again. Fixes Debian
+#220814.
+
+This patch by Nathanael Nerode.
+
+Not submitted upstream yet.
+
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.orig
2004-01-14 20:01:04.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-01-14
20:14:56.000000000 -0500
+@@ -73,7 +73,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
+@@ -115,6 +117,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
Property changes on:
branches/4.3.0/sid/debian/patches/050_fix_lnx_io_kbd_rate_fix.diff
___________________________________________________________________
Name: svn:keywords
+ Id
