[patch] X.org foundation X11R6.7.0

[Tim Waugh]

I've finally figured out how to get VNC 4.0beta5 to build against
xorg-x11 6.7.0.  Here is the patch I needed.

Tim.
*/

--- vnc-4.0b4-unixsrc/xc/programs/Xserver/Imakefile.xorg        2004-03-04 
17:47:16.000000000 +0000
+++ vnc-4.0b4-unixsrc/xc/programs/Xserver/Imakefile     2004-03-22 17:50:05.000000000 
+0000
@@ -119,7 +119,7 @@
        LIBREGEX = RegexLibrary
 
 #if DoLoadableServer
-    LIBCWRAPPER = os/libcwrapper.o
+    LIBCWRAPPER = os/libcwrapper.o os/libos.a
 #endif
 
 #if BuildXprint
--- vnc-4.0b4-unixsrc/xc.patch.xorg     2004-03-23 10:53:05.000000000 +0000
+++ vnc-4.0b4-unixsrc/xc.patch  2004-03-23 10:53:42.000000000 +0000
@@ -8,11 +8,11 @@
 + XCOMM
 + XCOMM X VNC server
 + XCOMM
-+ MFBDIR = mfb
-+ CFB8DIR = cfb
-+ CFB16DIR = cfb16
-+ CFB24DIR = cfb24
-+ CFB32DIR = cfb32
++ MFBSUBDIR = mfb
++ CFB8SUBDIR = cfb
++ CFB16SUBDIR = cfb16
++ CFB24SUBDIR = cfb24
++ CFB32SUBDIR = cfb32
 + XVNCDDXDIR = vnc/Xvnc
 + XVNCDIRS = $(STDDIRS) $(MFBDIR) \
 +          $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
--- vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h.xorg       2004-05-26 
16:38:01.851144699 +0100
+++ vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h    2004-05-26 
16:38:45.287827345 +0100
@@ -36,7 +36,7 @@
   RegionHelper(ScreenPtr pScreen_, RegionPtr pRegion)
     : pScreen(pScreen_), reg(&regRec)
   {
-    REGION_INIT(pScreen, reg, NullBox, 0);
+    REGION_NULL(pScreen, reg);
     REGION_COPY(pScreen, reg, pRegion);
   }
 
@@ -55,7 +55,7 @@
   void init(BoxPtr rect, int size) {
     reg = &regRec;
     if (rect && (rect->x2 == rect->x1 || rect->y2 == rect->y1)) {
-      REGION_INIT(pScreen, reg, NullBox, 0);
+      REGION_NULL(pScreen, reg);
     } else {
       REGION_INIT(pScreen, reg, rect, size);
     }
_______________________________________________
VNC-List mailing list
[EMAIL PROTECTED]
To remove yourself from the list visit:
http://www.realvnc.com/mailman/listinfo/vnc-list