OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

63 lines
2.2 KiB

  1. # --- T2-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # T2 SDE: package/.../vnc/compile.patch
  5. # Copyright (C) 2004 - 2006 The T2 SDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- T2-COPYRIGHT-NOTE-END ---
  16. Due to 2.6 kernel headers we have to mess a bit with the older XFree86
  17. linux support files ... :-(
  18. - Rene Rebe <rene@exactcode.de>
  19. --- ./xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.orig 2004-11-07 19:11:14.037468118 +0000
  20. +++ ./xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-11-07 19:12:40.379726573 +0000
  21. @@ -73,11 +73,7 @@
  22. #endif
  23. /* Deal with spurious kernel header change */
  24. -#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
  25. -# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
  26. -# define rate period
  27. -# endif
  28. -#endif
  29. +#define rate period
  30. static int
  31. KDKBDREP_ioctl_ok(int rate, int delay) {
  32. --- ./xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig 2004-11-07 19:13:59.942061811 +0000
  33. +++ ./xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-11-07 19:19:09.523762656 +0000
  34. @@ -107,7 +107,7 @@
  35. struct kbd_repeat kbdrep_s;
  36. /* don't change, just test */
  37. - kbdrep_s.rate = -1;
  38. + kbdrep_s.period = -1;
  39. kbdrep_s.delay = -1;
  40. if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
  41. return 0;
  42. @@ -115,11 +115,11 @@
  43. /* do the change */
  44. if (rate == 0) /* switch repeat off */
  45. - kbdrep_s.rate = 0;
  46. + kbdrep_s.period = 0;
  47. else
  48. - kbdrep_s.rate = 10000 / rate; /* convert cps to msec */
  49. - if (kbdrep_s.rate < 1)
  50. - kbdrep_s.rate = 1;
  51. + kbdrep_s.period = 10000 / rate; /* convert cps to msec */
  52. + if (kbdrep_s.period < 1)
  53. + kbdrep_s.period = 1;
  54. kbdrep_s.delay = delay;
  55. if (kbdrep_s.delay < 1)
  56. kbdrep_s.delay = 1;