[X2Go-Commits] nx-libs.git - build-main (branch) updated: redist-server/3.5.0.8-7-g2d226a6
X2Go dev team
git-admin at x2go.org
Fri Aug 30 16:23:16 CEST 2013
The branch, build-main has been updated
via 2d226a609540168640a874a9bd26f54fbf478571 (commit)
from 3467d6b762bd56ea728c64bab322263ce73e605d (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 5 +++
.../patches/202_nx-x11_enable-xinerama.full.patch | 32 +++++++++++++++++---
2 files changed, 33 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f56b3a0..7ade3b8 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..6845ec5 100644
--- a/debian/patches/202_nx-x11_enable-xinerama.full.patch
+++ b/debian/patches/202_nx-x11_enable-xinerama.full.patch
@@ -31,17 +31,41 @@ 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 @@
+@@ -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);
+
-+ 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 @@
+@@ -266,7 +276,6 @@
+ return rep.state;
+ }
+
+-#include <stdio.h>
+
+ XineramaScreenInfo *
+ XineramaQueryScreens(
+@@ -279,39 +288,72 @@
xXineramaQueryScreensReq *req;
XineramaScreenInfo *scrnInfo = NULL;
@@ -186,7 +210,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