diff options
author | Brian Hinz <bphinz@users.sourceforge.net> | 2013-12-08 18:26:09 +0000 |
---|---|---|
committer | Brian Hinz <bphinz@users.sourceforge.net> | 2013-12-08 18:26:09 +0000 |
commit | b834fa2278dba631f0e0fea6d1b0a23c36b7a5a5 (patch) | |
tree | d528b93831a6eef856374a1d0e7ed299e6e74069 /contrib/packages/rpm/sle11/SOURCES/p_xnest-ignore-getimage-errors.diff | |
parent | f88b3add41d41de674712d9b5ce06a0f2a2f63bf (diff) | |
download | tigervnc-b834fa2278dba631f0e0fea6d1b0a23c36b7a5a5.tar.gz tigervnc-b834fa2278dba631f0e0fea6d1b0a23c36b7a5a5.zip |
Added rpm spec file & sources for building Suse linux packages to contrib folder
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5146 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'contrib/packages/rpm/sle11/SOURCES/p_xnest-ignore-getimage-errors.diff')
-rw-r--r-- | contrib/packages/rpm/sle11/SOURCES/p_xnest-ignore-getimage-errors.diff | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/contrib/packages/rpm/sle11/SOURCES/p_xnest-ignore-getimage-errors.diff b/contrib/packages/rpm/sle11/SOURCES/p_xnest-ignore-getimage-errors.diff new file mode 100644 index 00000000..797327c9 --- /dev/null +++ b/contrib/packages/rpm/sle11/SOURCES/p_xnest-ignore-getimage-errors.diff @@ -0,0 +1,32 @@ +Index: build-GucBkyZ/xorg-server-1.6.3.901/hw/xnest/GCOps.c +================================================================================ +--- BUILD/xorg-server-1.7.99/hw/xnest/GCOps.c ++++ BUILD/xorg-server-1.7.99/hw/xnest/GCOps.c +@@ -94,6 +94,13 @@ + } + } + ++static int ++xnestIgnoreErrorHandler (Display *display, ++ XErrorEvent *event) ++{ ++ return False; /* return value is ignored */ ++} ++ + void + xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h, + unsigned int format, unsigned long planeMask, +@@ -101,9 +108,13 @@ + { + XImage *ximage; + int length; ++ int (*old_handler)(Display*, XErrorEvent*); + ++ /* we may get BadMatch error when xnest window is minimized */ ++ old_handler = XSetErrorHandler (xnestIgnoreErrorHandler); + ximage = XGetImage(xnestDisplay, xnestDrawable(pDrawable), + x, y, w, h, planeMask, format); ++ XSetErrorHandler (old_handler); + + if (ximage) { + length = ximage->bytes_per_line * ximage->height; |