package/x11/vnc/hotfix.patch

   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 - 2008 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
  17 Due to 2.6 kernel headers we have to mess a bit with the older XFree86
  18 linux support files ... :-(
  19
  20   - Rene Rebe <rene@exactcode.de>
  21
  22 --- ./unix/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.orig        2004-11-07 19:11:14.037468118 +0000
  23 +++ ./unix/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c     2004-11-07 19:12:40.379726573 +0000
  24 @@ -73,11 +73,7 @@
  25  #endif
  26
  27  /* Deal with spurious kernel header change */
  28 -#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
  29 -# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
  30 -#  define rate period
  31 -# endif
  32 -#endif
  33 +#define rate period
  34
  35  static int
  36  KDKBDREP_ioctl_ok(int rate, int delay) {
  37 --- ./unix/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig       2004-11-07 19:13:59.942061811 +0000
  38 +++ ./unix/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c    2004-11-07 19:19:09.523762656 +0000
  39 @@ -107,7 +107,7 @@
  40     struct kbd_repeat kbdrep_s;
  41
  42     /* don't change, just test */
  43 -   kbdrep_s.rate = -1;
  44 +   kbdrep_s.period = -1;
  45     kbdrep_s.delay = -1;
  46     if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
  47         return 0;
  48 @@ -115,11 +115,11 @@
  49
  50     /* do the change */
  51     if (rate == 0)                              /* switch repeat off */
  52 -     kbdrep_s.rate = 0;
  53 +     kbdrep_s.period = 0;
  54     else
  55 -     kbdrep_s.rate  = 10000 / rate;            /* convert cps to msec */
  56 -   if (kbdrep_s.rate < 1)
  57 -     kbdrep_s.rate = 1;
  58 +     kbdrep_s.period  = 10000 / rate;          /* convert cps to msec */
  59 +   if (kbdrep_s.period < 1)
  60 +     kbdrep_s.period = 1;
  61     kbdrep_s.delay = delay;
  62     if (kbdrep_s.delay < 1)
  63       kbdrep_s.delay = 1;