rpms/vnc/devel vnc-render-sigfault.patch, NONE, 1.1 vnc.spec, 1.163, 1.164

[fedora-cvs-commits at redhat.com]

Author: atkac

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

Modified Files:
	vnc.spec 
Added Files:
	vnc-render-sigfault.patch 
Log Message:
fixed Xvnc's render extension crashes in 8bpp mode
Resolves: #222007


vnc-render-sigfault.patch:
 XserverDesktop.cc |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE vnc-render-sigfault.patch ---
--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.cc.render-sigfault	2006-05-15 18:56:20.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.cc	2007-01-15 15:52:40.000000000 +0100
@@ -741,15 +741,15 @@
   } else {
     EntryPtr pent;
     pent = (EntryPtr)&cmap->red[index];
-    if (pent->fShared) {
-      *r = pent->co.shco.red->color;
-      *g = pent->co.shco.green->color;
-      *b = pent->co.shco.blue->color;
-    } else {
+    //if (pent->fShared) {
+    //  *r = pent->co.shco.red->color;
+    //  *g = pent->co.shco.green->color;
+    //  *b = pent->co.shco.blue->color;
+    //} else {
       *r = pent->co.local.red;
       *g = pent->co.local.green;
       *b = pent->co.local.blue;
-    }
+    //}
   }
 }
 


Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- vnc.spec	8 Jan 2007 12:00:48 -0000	1.163
+++ vnc.spec	15 Jan 2007 15:29:27 -0000	1.164
@@ -5,7 +5,7 @@
 Summary:   A remote display system.
 Name:      vnc
 Version:   4.1.2
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -45,6 +45,7 @@
 Patch27:   vnc-selinux.patch
 Patch28:   vnc-render.patch
 Patch29:   vnc-mesa-6.5.2.patch
+Patch30:   vnc-render-sigfault.patch
 License:   GPL
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -130,6 +131,7 @@
 %patch27 -p0 -b .selinux
 %patch28 -p1 -b .render
 %patch29 -p1 -b .mesa-652
+%patch30 -p1 -b .render-sigfault
 
 cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 	unix/xc/programs/Xserver/Xvnc.man \
@@ -295,6 +297,9 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Mon Jan 15 2007 Adam Tkac <atkac redhat com> 4.1.2-10.fc7
+- fixed render crashing when run in 8bpp
+
 * Mon Jan 08 2007 Adam Tkac <atkac redhat com> 4.1.2-9.fc7
 - enable render extensions by default on s390 & s390x