SOURCES: nx-gcc-4.1.patch (NEW) - added

[aredridel]

Author: aredridel                    Date: Mon Mar 20 00:23:01 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- added

---- Files affected:
SOURCES:
   nx-gcc-4.1.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/nx-gcc-4.1.patch
diff -u /dev/null SOURCES/nx-gcc-4.1.patch:1.1
--- /dev/null	Mon Mar 20 01:23:01 2006
+++ SOURCES/nx-gcc-4.1.patch	Mon Mar 20 01:22:56 2006
@@ -0,0 +1,73 @@
+diff -ur nx-1.5.0-orig/nxcomp/RenderExtension.h nx-1.5.0-new/nxcomp/RenderExtension.h
+--- nx-1.5.0-orig/nxcomp/RenderExtension.h	2005-02-19 11:23:32.000000000 -0700
++++ nx-1.5.0-new/nxcomp/RenderExtension.h	2006-03-19 13:10:23.000000000 -0700
+@@ -68,6 +68,8 @@
+ // The message class.
+ //
+ 
++class RenderMinorExtensionStore;
++
+ class RenderExtensionMessage : public Message
+ {
+   friend class RenderExtensionStore;
+diff -ur nx-1.5.0-orig/nxviewer/nxviewer/cursor.c nx-1.5.0-new/nxviewer/nxviewer/cursor.c
+--- nx-1.5.0-orig/nxviewer/nxviewer/cursor.c	2005-07-18 20:19:46.000000000 -0600
++++ nx-1.5.0-new/nxviewer/nxviewer/cursor.c	2006-03-19 16:07:52.000000000 -0700
+@@ -412,7 +412,6 @@
+ 	  offset = y * rcWidth + x;
+ 	  if (rcMask[offset]) {
+ 	    pos = (char *)&rcSource[offset * bytesPerPixel];
+-	    //CopyDataToScreen(pos, x0, y0, 1, 1);
+ 	  }
+ 	}
+       }
+diff -ur nx-1.5.0-orig/nxviewer/nxviewer/desktop.c nx-1.5.0-new/nxviewer/nxviewer/desktop.c
+--- nx-1.5.0-orig/nxviewer/nxviewer/desktop.c	2005-07-18 20:17:27.000000000 -0600
++++ nx-1.5.0-new/nxviewer/nxviewer/desktop.c	2006-03-19 16:08:26.000000000 -0700
+@@ -487,7 +487,6 @@
+     XClearWindow(dpy, win);
+     
+     
+-    //XFlush(dpy);
+     XSync(dpy, False);
+     
+     XFreePixmap(dpy, nxviewerPixmapLogo);
+@@ -884,7 +883,7 @@
+   }
+ 
+ #ifdef NXVIEWER_DESKTOP_USES_PACKED_IMAGES
+-  if(myFormat.bitsPerPixel == 8 && nxviewerUseNXTrans)// && (width>1 || height>1))
++  if(myFormat.bitsPerPixel == 8 && nxviewerUseNXTrans)
+   {
+ #endif
+       if (!appData.useBGR233)
+@@ -962,7 +961,7 @@
+               visdepth, width, height);
+   #endif
+ 
+-  if (nxviewerUseNXTrans && nxpackMethod != NO_PACK)// && (width>1 || height>1))
++  if (nxviewerUseNXTrans && nxpackMethod != NO_PACK)
+   {
+ 
+   if(width % 2 == 0 || BitmapPad(dpy) == myFormat.bitsPerPixel)
+diff -ur nx-1.5.0-orig/nxviewer/nxviewer/rfbproto.c nx-1.5.0-new/nxviewer/nxviewer/rfbproto.c
+--- nx-1.5.0-orig/nxviewer/nxviewer/rfbproto.c	2005-07-18 20:20:01.000000000 -0600
++++ nx-1.5.0-new/nxviewer/nxviewer/rfbproto.c	2006-03-19 16:10:35.000000000 -0700
+@@ -268,9 +268,6 @@
+   case rfbVncAuth:
+     if (!ReadFromRFBServerNoX((char *)challenge, CHALLENGESIZE)) return False;
+ 
+-    //if (appData.passwordFile) {
+-    //  passwd = vncDecryptPasswdFromFile(appData.passwordFile);
+-    //FIXME strip all appDate variables 
+     if (vncServerPasswordFile) {
+       passwd = vncDecryptPasswdFromFile(vncServerPasswordFile);
+       if (!passwd) {
+@@ -628,7 +625,6 @@
+     {
+        if ((x >=  (si.framebufferWidth - 2)) && (y <= 2))
+        {
+-	//ToggleFullScreen();  
+         FullScreenOff();
+        }
+     }
================================================================