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.

xc.patch 1.8KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667
  1. diff -bcr xc.org/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
  2. *** xc.org/programs/Xserver/Imakefile 2004-12-15 20:22:53.000000000 +0100
  3. --- xc/programs/Xserver/Imakefile 2005-02-14 14:23:21.000000000 +0100
  4. ***************
  5. *** 128,134 ****
  6. LIBREGEX = RegexLibrary
  7. #if DoLoadableServer
  8. ! LIBCWRAPPER = os/libcwrapper.o
  9. #endif
  10. #if BuildXprint
  11. --- 128,134 ----
  12. LIBREGEX = RegexLibrary
  13. #if DoLoadableServer
  14. ! LIBCWRAPPER = os/libcwrapper.o os/libos.a
  15. #endif
  16. #if BuildXprint
  17. ***************
  18. *** 414,419 ****
  19. --- 414,430 ----
  20. #define ServerToInstall Xsun
  21. #endif
  22. #endif /* XsunServer */
  23. + XCOMM
  24. + XCOMM X VNC server
  25. + XCOMM
  26. + FBSUBDIR = fb
  27. + XVNCDDXDIR = vnc/Xvnc
  28. + XVNCDIRS = $(STDDIRS) $(FBSUBDIR) miext/damage $(XVNCDDXDIR) $(DEPDIRS)
  29. + XVNCLIBS = PreFbLibs vnc/Xvnc/LibraryTargetName(xvnc) FbPostFbLibs
  30. + XVNCOBJS = $(XVNCDDXDIR)/stubs.o $(XVNCDDXDIR)/miinitext.o
  31. + XVNCSYSLIBS = $(FONTLIBS) $(SYSLIBS)
  32. + ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS), \
  33. + $(XVNCLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XVNCSYSLIBS))
  34. #if defined(Xsun24Server) && Xsun24Server
  35. diff -bcr xc.org/programs/Xserver/mi/miinitext.c xc/programs/Xserver/mi/miinitext.c
  36. *** xc.org/programs/Xserver/mi/miinitext.c 2004-12-13 06:48:41.000000000 +0100
  37. --- xc/programs/Xserver/mi/miinitext.c 2005-02-11 16:47:34.000000000 +0100
  38. ***************
  39. *** 286,291 ****
  40. --- 286,294 ----
  41. #ifdef MITMISC
  42. extern void MITMiscExtensionInit(INITARGS);
  43. #endif
  44. + #ifdef VNCEXT
  45. + extern void vncExtensionInit(INITARGS);
  46. + #endif
  47. #ifdef XIDLE
  48. extern void XIdleExtensionInit(INITARGS);
  49. #endif
  50. ***************
  51. *** 587,592 ****
  52. --- 590,598 ----
  53. #ifdef MITMISC
  54. if (!noMITMiscExtension) MITMiscExtensionInit();
  55. #endif
  56. + #ifdef VNCEXT
  57. + vncExtensionInit();
  58. + #endif
  59. #ifdef XIDLE
  60. if (!noXIdleExtension) XIdleExtensionInit();
  61. #endif