pool/tigervnc
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 245056 from X11:XOrg

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/245056
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=11
This commit is contained in:
Ludwig Nussel 2014-08-20 15:53:42 +00:00 committed by Git OBS Bridge
commit b1955302af
3 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tigervnc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Aug 18 11:07:09 UTC 2014 - msrb@suse.com
- u_tigervnc-check-shm-harder.patch
* Check if SHM really works before deciding to use it.
(bnc#890580)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 4 10:37:08 UTC 2014 - msrb@suse.com Mon Aug 4 10:37:08 UTC 2014 - msrb@suse.com

24
tigervnc.spec
View File

@ -109,12 +109,14 @@ Patch6: u_tigervnc-dont-send-ascii-control-characters.patch
Patch7: u_tigervnc-ignore-epipe-on-write.patch Patch7: u_tigervnc-ignore-epipe-on-write.patch
Patch8: n_tigervnc-date-time.patch Patch8: n_tigervnc-date-time.patch
Patch9: U_include-vencrypt-only-if-any-subtype-present.patch Patch9: U_include-vencrypt-only-if-any-subtype-present.patch
Patch10: u_tigervnc-check-shm-harder.patch
# Xserver patches # Xserver patches
Patch10: tigervnc-1.2.80-fix-int-to-pointer.patch Patch20: tigervnc-1.2.80-fix-int-to-pointer.patch
Patch11: u_aarch64-support.patch Patch21: u_aarch64-support.patch
Patch12: N_xorg-server-xdmcp.patch Patch22: N_xorg-server-xdmcp.patch
Patch13: n_tigervnc-dont-build-gtf.patch Patch23: n_tigervnc-dont-build-gtf.patch
Patch14: u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch Patch24: u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch
%description %description
TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing),
@ -150,13 +152,15 @@ fi
%patch7 -p0 %patch7 -p0
%patch8 -p1 %patch8 -p1
%patch9 -p0 %patch9 -p0
%patch10 -p0
pushd unix/xserver pushd unix/xserver
patch -p1 < ../xserver114.patch patch -p1 < ../xserver114.patch
%patch10 -p1 %patch20 -p1
%patch11 -p1 %patch21 -p1
%patch12 -p1 %patch22 -p1
%patch13 -p1 %patch23 -p1
%patch14 -p1 %patch24 -p1
popd popd
%build %build

26
u_tigervnc-check-shm-harder.patch Normal file
View File

@ -0,0 +1,26 @@
Index: vncviewer/X11PixelBuffer.cxx
===================================================================
--- vncviewer/X11PixelBuffer.cxx (revision 5186)
+++ vncviewer/X11PixelBuffer.cxx (working copy)
@@ -158,6 +158,8 @@
Bool pixmaps;
XErrorHandler old_handler;
Status status;
+ Window test_window;
+ GC test_gc;
if (!XShmQueryVersion(fl_display, &major, &minor, &pixmaps))
return 0;
@@ -187,6 +189,12 @@
old_handler = XSetErrorHandler(XShmAttachErrorHandler);
XShmAttach(fl_display, shminfo);
+ test_window = XCreateSimpleWindow(fl_display, XDefaultRootWindow(fl_display), 0, 0, width(), height(), 0, 0, 0);
+ test_gc = XCreateGC(fl_display, test_window, 0, 0);
+ XShmPutImage(fl_display, test_window, test_gc, xim, 0, 0, 0, 0, width(), height(), False);
+ XFreeGC(fl_display, test_gc);
+ XDestroyWindow(fl_display, test_window);
+
XSync(fl_display, False);
XSetErrorHandler(old_handler);