aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/202_nx-x11_enable-xinerama.full.patch15
2 files changed, 16 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index f56b3a0b5..c62127730 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@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 f097f0ba7..089df2571 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