rpms/vnc/devel vnc-render.patch,1.5,1.6 vnc.spec,1.65,1.66

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16891

Modified Files:
	vnc-render.patch vnc.spec 
Log Message:
* Thu Mar 31 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-7
- Render patch fix from Peter Ã…strand.  Enabled render by default again.


vnc-render.patch:
 Imakefile        |    2 -
 Xvnc/xvnc.cc     |   41 +++++++++++++++++++++++++++++++++++++-
 module/Imakefile |    2 -
 vncHooks.cc      |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 100 insertions(+), 3 deletions(-)

Index: vnc-render.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-render.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vnc-render.patch	17 Mar 2005 10:35:22 -0000	1.5
+++ vnc-render.patch	31 Mar 2005 11:44:52 -0000	1.6
@@ -1,3 +1,4 @@
+unchanged:
 --- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.render	2005-03-17 09:57:08.000000000 +0000
 +++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc	2005-03-17 10:31:39.000000000 +0000
 @@ -135,6 +135,9 @@
@@ -5,7 +6,7 @@
  static char needswap = 0;
  static int lastScreen = -1;
 +#ifdef RENDER
-+static Bool Render = FALSE;
++static Bool Render = TRUE;
 +#endif
  
  static bool displaySpecified = false;
@@ -76,6 +77,7 @@
    for (i = 1; i <= 32; i++)
    {
      if (vfbPixmapDepths[i])
+unchanged:
 --- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile.render	2005-03-17 09:57:09.000000000 +0000
 +++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile	2005-03-17 09:57:09.000000000 +0000
 @@ -13,7 +13,7 @@
@@ -87,6 +89,7 @@
   DEFINES = $(STD_DEFINES) -DGC_HAS_COMPOSITE_CLIP -DXFree86LOADER
  
  LinkSourceFile(vncExtInit.cc,..)
+unchanged:
 --- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile.render	2005-03-17 09:57:09.000000000 +0000
 +++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile	2005-03-17 09:57:09.000000000 +0000
 @@ -19,7 +19,7 @@
@@ -98,8 +101,9 @@
  #if defined(XFree86Version) && XFree86Version >= 4000
     VNCDEFINES = -DGC_HAS_COMPOSITE_CLIP
  #endif
---- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc.render	2005-03-11 15:08:41.000000000 +0000
-+++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc	2005-03-17 09:57:09.000000000 +0000
+diff -u vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc
+--- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc	2005-03-17 09:57:09.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc	2005-03-31 12:43:05.000000000 +0100
 @@ -29,6 +29,9 @@
  #include "regionstr.h"
  #include "dixfontstr.h"
@@ -160,7 +164,7 @@
  
    return TRUE;
  }
-@@ -470,6 +495,36 @@
+@@ -470,6 +495,39 @@
    SCREEN_REWRAP(BlockHandler);
  }
  
@@ -178,6 +182,9 @@
 +  BoxRec box;
 +  PictureScreenPtr ps = GetPictureScreen(pScreen);
 +
++  if ((xDst < 0) || (yDst < 0))
++      return;
++
 +  box.x1 = pDst->pDrawable->x + xDst;
 +  box.y1 = pDst->pDrawable->y + yDst;
 +  box.x2 = box.x1 + width;


Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- vnc.spec	29 Mar 2005 11:01:23 -0000	1.65
+++ vnc.spec	31 Mar 2005 11:44:52 -0000	1.66
@@ -212,6 +212,9 @@
 /usr/X11R6
 
 %changelog
+* Thu Mar 31 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-7
+- Render patch fix from Peter Ã…strand.  Enabled render by default again.
+
 * Mon Mar 28 2005 Christopher Aillon <caillon at redhat.com> 4.1.1-6
 - rebuilt