diff --git a/tigervnc-xserver-1.14-rebased.patch b/tigervnc-xserver-1.14-rebased.patch index c2f3de4..fd1d8d6 100644 --- a/tigervnc-xserver-1.14-rebased.patch +++ b/tigervnc-xserver-1.14-rebased.patch @@ -113,3 +113,25 @@ diff -up xorg-server-1.16.0/os/WaitFor.c.vnc xorg-server-1.16.0/os/WaitFor.c BlockHandler((void *) &wt, (void *) &LastSelectMask); if (NewOutputPending) FlushAllOutput(); +@@ -223,10 +223,20 @@ WaitForSomething(int *pClientsReady) + i = Select(MaxClients, &LastSelectMask, &clientsWritable, NULL, wt); + } + else { +- i = Select(MaxClients, &LastSelectMask, NULL, NULL, wt); ++ if (AnyClientsWriteBlocked) ++ XFD_ORSET(&socketsWritable, &ClientsWriteBlocked, &socketsWritable); ++ ++ if (XFD_ANYSET(&socketsWritable)) { ++ i = Select(MaxClients, &LastSelectMask, &socketsWritable, NULL, wt); ++ if (AnyClientsWriteBlocked) ++ XFD_ANDSET(&clientsWritable, &socketsWritable, &ClientsWriteBlocked); ++ } else { ++ i = Select(MaxClients, &LastSelectMask, NULL, NULL, wt); ++ } + } + selecterr = GetErrno(); + WakeupHandler(i, (void *) &LastSelectMask); ++ vncWriteWakeupHandler(i, &socketsWritable); + if (i <= 0) { /* An error or timeout occurred */ + if (dispatchException) + return 0; diff --git a/tigervnc.spec b/tigervnc.spec index 0b5b5f5..f0d6120 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -1,6 +1,6 @@ Name: tigervnc Version: 1.3.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A TigerVNC remote display system %global _hardened_build 1 @@ -376,6 +376,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Sep 9 2014 Tim Waugh - 1.3.1-11 +- Added missing part of xserver114.patch (bug #1137023). + * Wed Sep 3 2014 Tim Waugh - 1.3.1-10 - Fix build against xorg-x11-server-1.16.0 (bug #1136532).