[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tigervnc-commits
Subject:    [Tigervnc-commits] SF.net SVN: tigervnc:[5095] trunk/unix
From:       ossman_ () users ! sourceforge ! net
Date:       2013-05-08 11:22:05
Message-ID: E1Ua2Rh-0002Na-2G () sfp-svn-1 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 5095
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5095&view=rev
Author:   ossman_
Date:     2013-05-08 11:22:04 +0000 (Wed, 08 May 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/unix/xserver113.patch
    trunk/unix/xserver114.patch

Modified: trunk/unix/xserver113.patch
===================================================================
--- trunk/unix/xserver113.patch	2013-05-08 00:19:05 UTC (rev 5094)
+++ trunk/unix/xserver113.patch	2013-05-08 11:22:04 UTC (rev 5095)
@@ -80,13 +80,13 @@
  /* 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

Modified: trunk/unix/xserver114.patch
===================================================================
--- trunk/unix/xserver114.patch	2013-05-08 00:19:05 UTC (rev 5094)
+++ trunk/unix/xserver114.patch	2013-05-08 11:22:04 UTC (rev 5095)
@@ -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

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and 
their applications. This 200-page book is written by three acclaimed 
leaders in the field. The early access version is available now. 
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits


[prev in list] [next in list] [prev in thread] [next in thread]