VNC needs to be initialised early to get its hooks at a proper
place. The new patch for 1.13+ broke at least animated cursors
by moving VNC further down the init list.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5095 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/unix/xserver114.patch b/unix/xserver114.patch
index 944bc4a..81b1c70 100644
--- a/unix/xserver114.patch
+++ b/unix/xserver114.patch
@@ -72,16 +72,16 @@
/* The following is only a small first step towards run-time
* configurable extensions.
*/
-@@ -302,6 +306,9 @@ static ExtensionModule staticExtensions[
- #ifdef XSELINUX
- {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension},
- #endif
+@@ -238,6 +242,9 @@ EnableDisableExtensionError(const char *
+
+ /* List of built-in (statically linked) extensions */
+ static ExtensionModule staticExtensions[] = {
+#ifdef TIGERVNC
+ {vncExtensionInit, "VNC-EXTENSION", NULL},
+#endif
- };
-
- static ExtensionModule *ExtensionModuleList = NULL;
+ {GEExtensionInit, "Generic Event Extension", &noGEExtension},
+ {ShapeExtensionInit, "SHAPE", NULL},
+ #ifdef MITSHM
diff -up xserver/os/WaitFor.c.vnc xserver/os/WaitFor.c
--- xserver/os/WaitFor.c.vnc 2013-04-10 14:51:13.000000000 +0200
+++ xserver/os/WaitFor.c 2013-04-10 14:55:40.000000000 +0200