aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorOleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de>2012-01-30 13:18:30 +0100
committerOleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de>2012-01-30 13:18:30 +0100
commit3467d6b762bd56ea728c64bab322263ce73e605d (patch)
tree40be78abde199c6b4e73aee3a0470bed93a79e78 /debian
parent3c0e43a41b660d50b71f917dfb767f5deca16a59 (diff)
downloadnx-libs-3467d6b762bd56ea728c64bab322263ce73e605d.tar.gz
nx-libs-3467d6b762bd56ea728c64bab322263ce73e605d.tar.bz2
nx-libs-3467d6b762bd56ea728c64bab322263ce73e605d.zip
Revert "Update patch: 202_nx-x11_enable-xinerama.full.patch disable Xinerama extension if NX_XINERAMA_CONF not exists"
This reverts commit f17b59824868623ee51670e365b67d49def2c658.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/202_nx-x11_enable-xinerama.full.patch15
2 files changed, 4 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index c62127730..f56b3a0b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,7 @@
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 089df2571..f097f0ba7 100644
--- a/debian/patches/202_nx-x11_enable-xinerama.full.patch
+++ b/debian/patches/202_nx-x11_enable-xinerama.full.patch
@@ -31,24 +31,17 @@ 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,16 @@
+@@ -249,6 +249,9 @@
xXineramaIsActiveReq *req;
XExtDisplayInfo *info = find_display (dpy);
+
-+ FILE* fptr;
-+ if((fptr=fopen(getenv("NX_XINERAMA_CONF"),"r"))!=NULL) {
-+ fclose(fptr);
-+ return True;
-+ }
-+ else {
-+ return False;
-+ }
++ return True;
+
if(!XextHasExtension(info))
return False; /* server doesn't even have the extension */
-@@ -279,39 +289,72 @@
+@@ -279,39 +282,72 @@
xXineramaQueryScreensReq *req;
XineramaScreenInfo *scrnInfo = NULL;
@@ -193,7 +186,7 @@ Last-Update: 2012-01-13
else
#endif
- result = (ProcXvStopVideo(client)); break;
-+ result = (ProcXvStopVideo(client));
++ result = (ProcXvStopVideo(client));
+ break;
case xv_SetPortAttribute:
#ifdef PANORAMIX