[tigervnc] tigervnc-setcursor-crash.patch: Attempt to paper over a crash in Xvnc when
Adam Jackson
ajax at fedoraproject.org
Mon Jun 17 14:10:21 UTC 2013
commit 839c8ef6e23410d48e2793a91221f0cee8dfd263
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jun 17 10:10:00 2013 -0400
tigervnc-setcursor-crash.patch: Attempt to paper over a crash in Xvnc when
setting the cursor.
tigervnc-setcursor-crash.patch | 13 +++++++++++++
tigervnc.spec | 9 ++++++++-
2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/tigervnc-setcursor-crash.patch b/tigervnc-setcursor-crash.patch
new file mode 100644
index 0000000..1efbd0e
--- /dev/null
+++ b/tigervnc-setcursor-crash.patch
@@ -0,0 +1,13 @@
+diff -up tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/XserverDesktop.cc.jx tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/XserverDesktop.cc
+--- tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/XserverDesktop.cc.jx 2012-08-27 09:02:47.000000000 -0400
++++ tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/XserverDesktop.cc 2013-06-17 09:42:14.310725996 -0400
+@@ -479,6 +479,9 @@ void XserverDesktop::setCursor(CursorPtr
+ }
+ } else {
+ #endif
++ if (!cmap)
++ return;
++
+ xColorItem fg, bg;
+ fg.red = cursor->foreRed;
+ fg.green = cursor->foreGreen;
diff --git a/tigervnc.spec b/tigervnc.spec
index e3b49be..637d571 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -2,7 +2,7 @@
Name: tigervnc
Version: 1.2.80
-Release: 0.15.%{snap}%{?dist}
+Release: 0.16.%{snap}%{?dist}
Summary: A TigerVNC remote display system
Group: User Interface/Desktops
@@ -45,6 +45,7 @@ Patch11: tigervnc11-gethomedir.patch
Patch13: tigervnc11-rh692048.patch
Patch14: tigervnc12-xorg113-glx.patch
Patch15: tigervnc-inetd-nowait.patch
+Patch16: tigervnc-setcursor-crash.patch
%description
Virtual Network Computing (VNC) is a remote display system which
@@ -156,6 +157,8 @@ popd
# mode (bug #920373).
%patch15 -p1 -b .inetd-nowait
+%patch16 -p1 -b .setcursor-crash
+
%build
%ifarch sparcv9 sparc64 s390 s390x
export CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -323,6 +326,10 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Mon Jun 17 2013 Adam Jackson <ajax at redhat.com> 1.2.80-0.16.20130314svn5065
+- tigervnc-setcursor-crash.patch: Attempt to paper over a crash in Xvnc when
+ setting the cursor.
+
* Sat Jun 08 2013 Dennis Gilmore <dennis at ausil.us> 1.2.80-0.15.20130314svn5065
- bump to rebuild and pick up bugfix causing X to crash on ppc and arm
More information about the scm-commits
mailing list