aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorOleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de>2012-01-30 13:05:01 +0100
committerOleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de>2012-01-30 13:05:01 +0100
commitf17b59824868623ee51670e365b67d49def2c658 (patch)
treebf5393256291fe482bcbcce8ae20a7cb36d44a90 /debian/patches
parent36ca6646b0998d0571716a5c825dc4268a4d0481 (diff)
downloadnx-libs-f17b59824868623ee51670e365b67d49def2c658.tar.gz
nx-libs-f17b59824868623ee51670e365b67d49def2c658.tar.bz2
nx-libs-f17b59824868623ee51670e365b67d49def2c658.zip
Update patch: 202_nx-x11_enable-xinerama.full.patch disable Xinerama extension if NX_XINERAMA_CONF not exists
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/202_nx-x11_enable-xinerama.full.patch15
1 files changed, 11 insertions, 4 deletions
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