[X2go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.8-3-gf17b598

X2go dev team git-admin at x2go.org
Mon Jan 30 13:06:28 CET 2012


The branch, master has been updated
       via  f17b59824868623ee51670e365b67d49def2c658 (commit)
      from  36ca6646b0998d0571716a5c825dc4268a4d0481 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f17b59824868623ee51670e365b67d49def2c658
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date:   Mon Jan 30 13:05:01 2012 +0100

    Update patch: 202_nx-x11_enable-xinerama.full.patch disable Xinerama extension if NX_XINERAMA_CONF not exists

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    5 +++++
 .../patches/202_nx-x11_enable-xinerama.full.patch  |   15 +++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f56b3a0..c621277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 nx-libs (2:3.5.0.9-0) UNRELEASED; urgency=low
 
+  [ Mike Gabriel ]
   * Continue development...
 
+  [ Oleksandr Shneyder ]
+  * Update patch: 202_nx-x11_enable-xinerama.full.patch disable Xinerama
+    extension if NX_XINERAMA_CONF not exists
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 23 Jan 2012 00:04:57 +0100
 
 nx-libs (2:3.5.0.8-0) unstable; urgency=low
diff --git a/debian/patches/202_nx-x11_enable-xinerama.full.patch b/debian/patches/202_nx-x11_enable-xinerama.full.patch
index f097f0b..089df25 100644
--- a/debian/patches/202_nx-x11_enable-xinerama.full.patch
+++ b/debian/patches/202_nx-x11_enable-xinerama.full.patch
@@ -31,17 +31,24 @@ Last-Update: 2012-01-13
  #define BuildDmxDevelTools	NO
 --- a/nx-X11/lib/Xinerama/Xinerama.c
 +++ b/nx-X11/lib/Xinerama/Xinerama.c
-@@ -249,6 +249,9 @@
+@@ -249,6 +249,16 @@
      xXineramaIsActiveReq  	*req;
      XExtDisplayInfo 		*info = find_display (dpy);
  
 +
-+    return True;
++    FILE* fptr;
++    if((fptr=fopen(getenv("NX_XINERAMA_CONF"),"r"))!=NULL) {
++	fclose(fptr);
++	return True;
++    }
++    else {
++	return False;
++    }
 +
      if(!XextHasExtension(info))
  	return False;  /* server doesn't even have the extension */
  
-@@ -279,39 +282,72 @@
+@@ -279,39 +289,72 @@
      xXineramaQueryScreensReq	*req;
      XineramaScreenInfo		*scrnInfo = NULL;
  
@@ -186,7 +193,7 @@ Last-Update: 2012-01-13
  	else
  #endif
 -	    result = (ProcXvStopVideo(client)); break;
-+	    result = (ProcXvStopVideo(client)); 
++	    result = (ProcXvStopVideo(client));
 +            break;
      case xv_SetPortAttribute: 
  #ifdef PANORAMIX


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).




More information about the x2go-commits mailing list