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.

64 lines
2.2 KiB

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