rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=109

Browse Source
This commit is contained in:
OBS User unknown 2009-01-09 01:10:45 +00:00 committed by Git OBS Bridge
parent f1b3cb222a
commit 8d73b6e969
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xorg-server-xf4vnc-clientTimeout.diff Normal file
View File

@ -0,0 +1,15 @@
--- a/hw/vnc/sockets.c 2008-12-11 20:30:21.000000000 +0100
+++ b/hw/vnc/sockets.c 2008-12-17 14:09:17.539288000 +0100
@@ -490,8 +490,10 @@
n = select(sock+1, NULL, &fds, NULL, &tv);
#if 1
if (n < 0) {
- rfbLogPerror("WriteExact: select");
- return n;
+ if (errno != EINTR) {
+ rfbLogPerror("WriteExact: select");
+ return n;
+ }
}
if (n == 0) {
totalTimeWaited += 5000;

6
xorg-x11-server.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Dec 20 02:53:00 CET 2008 - sndirsch@suse.de
- xorg-server-xf4vnc-clientTimeout.diff
* fixes vnc client timeout handling (bnc #441935)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 28 03:56:16 CET 2008 - sndirsch@suse.de Fri Nov 28 03:56:16 CET 2008 - sndirsch@suse.de

9
xorg-x11-server.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xorg-x11-server (Version 7.4) # spec file for package xorg-x11-server (Version 7.4)
# #
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -29,7 +29,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.4 Version: 7.4
Release: 17 Release: 18
License: X11/MIT License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -77,6 +77,7 @@ Patch42: xorg-server-xf4vnc-TranslateNone.diff
Patch43: xorg-server-xf4vnc-abi-version.diff Patch43: xorg-server-xf4vnc-abi-version.diff
Patch44: xorg-server-xf4vnc-cutpaste.diff Patch44: xorg-server-xf4vnc-cutpaste.diff
Patch46: xorg-server-xf4vnc-busyloop.diff Patch46: xorg-server-xf4vnc-busyloop.diff
Patch47: xorg-server-xf4vnc-clientTimeout.diff
%endif %endif
Patch41: loadmod-bug197195.diff Patch41: loadmod-bug197195.diff
Patch45: bug-197858_dpms.diff Patch45: bug-197858_dpms.diff
@ -192,6 +193,7 @@ popd
%patch43 -p0 %patch43 -p0
%patch44 %patch44
%patch46 -p1 %patch46 -p1
%patch47 -p1
chmod 755 hw/vnc/symlink-vnc.sh chmod 755 hw/vnc/symlink-vnc.sh
%endif %endif
%patch41 -p1 %patch41 -p1
@ -546,6 +548,9 @@ exit 0
%endif %endif
%changelog %changelog
* Sat Dec 20 2008 sndirsch@suse.de
- xorg-server-xf4vnc-clientTimeout.diff
* fixes vnc client timeout handling (bnc #441935)
* Fri Nov 28 2008 sndirsch@suse.de * Fri Nov 28 2008 sndirsch@suse.de
- dpms_screensaver.diff - dpms_screensaver.diff
* DMPS calls dixSaveScreens() when turned on but not when turned * DMPS calls dixSaveScreens() when turned on but not when turned