Author: branden
Date: 2004-04-23 00:44:56 -0500 (Fri, 23 Apr 2004)
New Revision: 1304
Modified:
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Revert patch from XFree86 CVS upstream authored by David Dawes after the
XFree86 license. Reportedly, all changes by David Dawes to XFree86 CVS are
under the new copyright license whether there is any indication of this
fact or not.
changeset: reverts 1190
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-21 19:01:41 UTC (rev 1303)
+++ trunk/debian/changelog 2004-04-23 05:44:56 UTC (rev 1304)
@@ -74,13 +74,6 @@
packages' config scripts, invoke the discover command such that an
abnormal exit on its part does not crash the script.
- * Fix loud chatter from Linux 2.6 such as: "atkbd.c: This is an XFree86 bug.
- It shouldn't access hardware directly." by performing KDKDBREP ioctl() on
- the correct file descriptor, avoiding the fallback method for changing the
- keyboard repeat rate that triggers this warning. Patch by David Dawes,
- from XFree86 CVS 2004-03-04 (XXX: POTENTIAL LICENSING PROBLEM). (Closes:
- #230204)
-
* Grab fixes to the X server's DIX events processing from XFree86 CVS
(none later than 2004-01-23).
+ Fix a potential hang in Xinerama caused by an uninitialized
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-04-21 19:01:41 UTC
(rev 1303)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-04-23 05:44:56 UTC
(rev 1304)
@@ -76,14 +76,6 @@
751. Fix some rules in en_US.UTF-8 Compose file (Bugzilla #1071,
Matthew Fischer).
-xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c @ 3.27
-xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c @ 1.6
- 6. Do the Linux KDKBDREP ioctl on the correct fd. This prevents the
- fallback that tries to directly program the keyboard repeat rate,
- and the related warning messages that recent Linux kernels generate
- (David Dawes).
-XXX: POTENTIAL LICENSE PROBLEM IN THE ABOVE
-
xc/programs/Xserver/dix/events.c @ 3.48
Fix a potential hang in Xinerama caused by an uninitialized
sprite.hotShape. [Mark Vojkovich]
@@ -738,8 +730,9 @@
}
if (versions[version_index].major_version > Dont_Check)
---- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c~ 2004-03-26
14:02:57.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-03-26
14:03:22.000000000 -0500
+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 @@
* from util-linux-2.9t package */
@@ -748,45 +741,10 @@
#ifdef __sparc__
#include <asm/param.h>
#include <asm/kbio.h>
-@@ -80,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. */
-@@ -89,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;
- }
-
-@@ -104,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;
- }
-
-@@ -178,7 +179,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? */
---- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c~ 2004-03-26
14:03:00.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-03-26
14:03:22.000000000 -0500
-@@ -93,14 +93,22 @@
+diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
+--- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
2003-11-12 18:00:24.000000000 +1100
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2003-11-12
18:01:33.000000000 +1100
+@@ -93,12 +93,20 @@
/* kbd rate stuff based on kbdrate.c from Rik Faith <[EMAIL PROTECTED]> et.al.
* from util-linux-2.9t package */
@@ -806,29 +764,8 @@
+#endif
+
static int
--KDKBDREP_ioctl_ok(int rate, int delay) {
-+KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
+ KDKBDREP_ioctl_ok(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. */
-@@ -109,7 +117,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;
- }
-
-@@ -124,7 +132,7 @@
- if (kbdrep_s.delay < 1)
- kbdrep_s.delay = 1;
-
-- if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
-+ if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
- return 0;
- }
-
@@ -160,6 +168,8 @@
#endif /* KIOCSRATE */
}
@@ -838,15 +775,6 @@
static void
SetKbdRepeat(InputInfoPtr pInfo, char rad)
{
-@@ -190,7 +200,7 @@
- if (pKbd->delay >= 0)
- delay = pKbd->delay;
-
-- if(KDKBDREP_ioctl_ok(rate, delay)) /* m68k? */
-+ if(KDKBDREP_ioctl_ok(pInfo->fd, rate, delay)) /* m68k? */
- return;
-
- if(KIOCSRATE_ioctl_ok(rate, delay)) /* sparc? */
--- xc/nls/locale.alias 18 Dec 2003 04:14:22 -0000 1.64
+++ xc/nls/locale.alias 3 Jan 2004 03:31:00 -0000 1.65
@@ -419,6 +419,7 @@
