mirror of the now-defunct rocklinux.org
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.

58 lines
2.2 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/public/vnc/vnc-xfree86.diff
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./xc/programs/Xserver/vnc/XserverDesktop.cc.orig 2004-09-13 06:57:27.998812712 +0200
  20. +++ ./xc/programs/Xserver/vnc/XserverDesktop.cc 2004-09-13 06:57:46.886941280 +0200
  21. @@ -382,25 +382,6 @@
  22. }
  23. }
  24. -static void printRegion(RegionPtr reg)
  25. -{
  26. - int nrects = REGION_NUM_RECTS(reg);
  27. -
  28. - fprintf(stderr,"Region num rects %2d extents %3d,%3d %3dx%3d\n",nrects,
  29. - (REGION_EXTENTS(pScreen,reg))->x1,
  30. - (REGION_EXTENTS(pScreen,reg))->y1,
  31. - (REGION_EXTENTS(pScreen,reg))->x2-(REGION_EXTENTS(pScreen,reg))->x1,
  32. - (REGION_EXTENTS(pScreen,reg))->y2-(REGION_EXTENTS(pScreen,reg))->y1);
  33. -
  34. - for (int i = 0; i < nrects; i++) {
  35. - fprintf(stderr," rect %3d,%3d %3dx%3d\n",
  36. - REGION_RECTS(reg)[i].x1,
  37. - REGION_RECTS(reg)[i].y1,
  38. - REGION_RECTS(reg)[i].x2-REGION_RECTS(reg)[i].x1,
  39. - REGION_RECTS(reg)[i].y2-REGION_RECTS(reg)[i].y1);
  40. - }
  41. -}
  42. -
  43. CARD32 XserverDesktop::deferredUpdateTimerCallback(OsTimerPtr timer,
  44. CARD32 now, pointer arg)
  45. {
  46. --- ./xc/programs/Xserver/Imakefile.orig 2004-09-13 07:22:05.729163552 +0200
  47. +++ ./xc/programs/Xserver/Imakefile 2004-09-13 07:22:25.665132824 +0200
  48. @@ -118,7 +118,7 @@
  49. LIBREGEX = RegexLibrary
  50. #if DoLoadableServer
  51. - LIBCWRAPPER = os/libcwrapper.o
  52. + LIBCWRAPPER = os/libcwrapper.o os/libos.a
  53. #endif
  54. #if BuildXprint