diff options
| author | Pierre Ossman <ossman@cendio.se> | 2013-05-08 11:22:04 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2013-05-08 11:22:04 +0000 |
| commit | 5cb75ac9bbd3b445b883bb470b7a77387e079620 (patch) | |
| tree | 2d7d181ae2b4f02652a152227f8c417c431c8c6f /unix | |
| parent | 6f26548e0dde309feec7d8d6fd5cf6bd4186f60e (diff) | |
| download | tigervnc-5cb75ac9bbd3b445b883bb470b7a77387e079620.tar.gz tigervnc-5cb75ac9bbd3b445b883bb470b7a77387e079620.zip | |
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
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/xserver113.patch | 14 | ||||
| -rw-r--r-- | unix/xserver114.patch | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/unix/xserver113.patch b/unix/xserver113.patch index e0a03d84..da0d590d 100644 --- a/unix/xserver113.patch +++ b/unix/xserver113.patch @@ -80,13 +80,13 @@ diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c /* The following is only a small first step towards run-time * configurable extensions. */ -@@ -299,6 +303,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 --git a/unix/xserver114.patch b/unix/xserver114.patch index 944bc4a3..81b1c709 100644 --- a/unix/xserver114.patch +++ b/unix/xserver114.patch @@ -72,16 +72,16 @@ diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c /* 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 |