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

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


The branch, master has been updated
       via  2d226a609540168640a874a9bd26f54fbf478571 (commit)
       via  3467d6b762bd56ea728c64bab322263ce73e605d (commit)
       via  3c0e43a41b660d50b71f917dfb767f5deca16a59 (commit)
      from  d4d85ca860752b8aea86f1d54e29194215f9be9d (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 2d226a609540168640a874a9bd26f54fbf478571
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date:   Mon Jan 30 13:45:07 2012 +0100

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

commit 3467d6b762bd56ea728c64bab322263ce73e605d
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date:   Mon Jan 30 13:18:30 2012 +0100

    Revert "Update patch: 202_nx-x11_enable-xinerama.full.patch disable Xinerama extension if NX_XINERAMA_CONF not exists"
    
    This reverts commit f17b59824868623ee51670e365b67d49def2c658.

commit 3c0e43a41b660d50b71f917dfb767f5deca16a59
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date:   Mon Jan 30 13:18:12 2012 +0100

    Revert "changelog cleanup: add interpunctation."
    
    This reverts commit d4d85ca860752b8aea86f1d54e29194215f9be9d.

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

Summary of changes:
 .../patches/202_nx-x11_enable-xinerama.full.patch  |   21 ++++++++++++++++++-
 1 files changed, 19 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/patches/202_nx-x11_enable-xinerama.full.patch b/debian/patches/202_nx-x11_enable-xinerama.full.patch
index 089df25..6845ec5 100644
--- a/debian/patches/202_nx-x11_enable-xinerama.full.patch
+++ b/debian/patches/202_nx-x11_enable-xinerama.full.patch
@@ -31,6 +31,15 @@ Last-Update: 2012-01-13
  #define BuildDmxDevelTools	NO
 --- a/nx-X11/lib/Xinerama/Xinerama.c
 +++ b/nx-X11/lib/Xinerama/Xinerama.c
+@@ -34,7 +34,7 @@
+ #include <X11/extensions/panoramiXext.h>
+ #include <X11/extensions/panoramiXproto.h>
+ #include <X11/extensions/Xinerama.h>
+-
++#include <stdio.h>
+ 
+ static XExtensionInfo _panoramiX_ext_info_data;
+ static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
 @@ -249,6 +249,16 @@
      xXineramaIsActiveReq  	*req;
      XExtDisplayInfo 		*info = find_display (dpy);
@@ -38,7 +47,7 @@ Last-Update: 2012-01-13
 +
 +    FILE* fptr;
 +    if((fptr=fopen(getenv("NX_XINERAMA_CONF"),"r"))!=NULL) {
-+	fclose(fptr);
++	fclose (fptr);
 +	return True;
 +    }
 +    else {
@@ -48,7 +57,15 @@ Last-Update: 2012-01-13
      if(!XextHasExtension(info))
  	return False;  /* server doesn't even have the extension */
  
-@@ -279,39 +289,72 @@
+@@ -266,7 +276,6 @@
+     return rep.state;
+ }
+ 
+-#include <stdio.h>
+ 
+ XineramaScreenInfo * 
+ XineramaQueryScreens(
+@@ -279,39 +288,72 @@
      xXineramaQueryScreensReq	*req;
      XineramaScreenInfo		*scrnInfo = NULL;
  


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