[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: rev 758 - in branches/4.3.0/sid/debian: . patches



Author: daniel
Date: 2003-11-12 02:39:17 -0500 (Wed, 12 Nov 2003)
New Revision: 758

Modified:
   branches/4.3.0/sid/debian/changelog
   branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
Log:
  * debian/patches/000_stolen_from_HEAD.diff: add '#define rate period' where
    necessary to work around stupid change to newer kernels; fixes build issues.


Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog	2003-11-12 06:22:22 UTC (rev 757)
+++ branches/4.3.0/sid/debian/changelog	2003-11-12 07:39:17 UTC (rev 758)
@@ -86,8 +86,12 @@
     - debian/control
     [DROP THIS ENTRY WHEN 4.2.1-14 MERGED.]
 
- -- Branden Robinson <branden@debian.org>  Sat,  1 Nov 2003 17:03:39 -0500
+  * Fix building on 2.6.x kernels by adding '#define rate period' where needed
+    (thanks, Fabio di Nitto).
+    - debian/patches/000_stolen_from_HEAD.diff
 
+ -- Branden Robinson <branden@debian.org>  Sat, 12 Nov 2003 02:27:58 -0500
+
 xfree86 (4.3.0-0pre1v4) experimental; urgency=low
 
   * Add missing symbolic links for libXTrap. [ISHIKAWA Mutsumi]
@@ -2444,7 +2448,7 @@
       (Closes: #85365)
     + Sync with Type1 font rasterizer from HEAD:
       - Some minor include cleanups. (David Dawes)
-      - Avoid redefining abort(), a well known C library function.  This can
+      - Avoid redefining abort(), a well known C library function.  This can
         cause errors when the abort() prototype from stdlib.h is included
         later by Xos.h. (Matthieu Herrb)
       - A "hammer" approach at ensuring font properties are freed properly.

Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff	2003-11-12 06:22:22 UTC (rev 757)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff	2003-11-12 07:39:17 UTC (rev 758)
@@ -7,6 +7,7 @@
   * Drivers shouldn't have to care about recolouring ARGB cursors.
   * Fix Xv regression in trident driver.
   * Implement two missing relocations in the ia64 module loader.
+  * Add '#define rate period', in line with a kernel change.
 
 (xc/lib/Xi/XExtInt.c,
  xc/lib/Xi/XGetVers.c,
@@ -649,3 +650,48 @@
  	}
  
      if (versions[version_index].major_version > Dont_Check)
+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 */
+ 
+ #include <linux/kd.h>
++#include <linux/version.h>
+ #ifdef __sparc__
+ #include <asm/param.h>
+ #include <asm/kbio.h>
+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 <faith@cs.unc.edu> et.al.
+  * from util-linux-2.9t package */
+ 
+-
++#include <linux/kd.h>
++#include <linux/version.h>
+ #ifdef __sparc__
+ #include <asm/param.h>
+ #include <asm/kbio.h>
+ #endif
+ 
++/* Deal with spurious 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__)
+@@ -160,6 +168,8 @@
+ #endif /* KIOCSRATE */
+ }
+ 
++#undef rate
++
+ static void
+ SetKbdRepeat(InputInfoPtr pInfo, char rad)
+ {



Reply to: