rpms/nx/FC-6 nx-2.1.0-fixes.patch, NONE, 1.1 nxagent-64bit-clean.diff, NONE, 1.1

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/nx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6684/FC-6

Added Files:
	nx-2.1.0-fixes.patch nxagent-64bit-clean.diff 
Log Message:
Copy over patches from devel.

nx-2.1.0-fixes.patch:

--- NEW FILE nx-2.1.0-fixes.patch ---
--- nx-X11/programs/Imakefile.fixes	2007-02-01 16:51:26.000000000 +0100
+++ nx-X11/programs/Imakefile	2007-02-19 20:07:49.000000000 +0100
@@ -125,7 +125,7 @@
 #if defined(NXEmbeddedXServer)
 SUBDIRS = $(XSSRCDIR) 
 #else
-SUBDIRS = $(XSSRCDIR) nxauth
+SUBDIRS = $(XSSRCDIR)
 #endif
 #else
 SUBDIRS = \
--- nxcomp/RenderExtension.h.fixes	2006-06-19 19:55:57.000000000 +0200
+++ nxcomp/RenderExtension.h	2007-02-19 20:07:49.000000000 +0100
@@ -315,6 +315,8 @@
   data;
 };
 
+class RenderMinorExtensionStore;
+
 class RenderExtensionStore : public MessageStore
 {
   public:
--- nxcomp/configure.in.fixes	2006-11-24 18:28:22.000000000 +0100
+++ nxcomp/configure.in	2007-02-19 20:07:49.000000000 +0100
@@ -7,8 +7,8 @@
 
 dnl Set our default compilation flags.
 
-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
-CFLAGS="-O3"
+CXXFLAGS="-O2 -fPIC -fno-rtti -fno-exceptions"
+CFLAGS="-O2 -fPIC"
 
 dnl Reset default linking directives.
 
--- nxcompext/configure.in.fixes	2006-11-24 18:33:30.000000000 +0100
+++ nxcompext/configure.in	2007-02-19 20:07:49.000000000 +0100
@@ -7,8 +7,8 @@
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="-O3"
-CFLAGS="-O3"
+CXXFLAGS="-O2 -fPIC"
+CPPFLAGS="-O2 -fPIC"
 
 dnl Reset default linking directives.
 
--- nxviewer/nxviewer/Imakefile.fixes	2006-12-01 17:54:17.000000000 +0100
+++ nxviewer/nxviewer/Imakefile	2007-02-19 20:07:49.000000000 +0100
@@ -43,6 +43,8 @@
 ZLIB_LIB = -L/usr/local/lib -lz
 JPEG_LIB = -L/usr/local/lib -ljpeg
 
+XPLIB =
+
 #ifdef SunArchitecture
 USRLIBDIR = /usr/NX/lib
 SUN_LIB = -L/usr/openwin/lib

nxagent-64bit-clean.diff:

--- NEW FILE nxagent-64bit-clean.diff ---
--- nxcomp.old/NXproto.h	2006-06-19 19:55:56.000000000 +0200
+++ nxcomp/NXproto.h	2007-02-12 18:17:41.000000000 +0100
@@ -26,6 +26,30 @@
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
 
+/*
+  Copied from Xproto.h
+ */
+
+/* For the purpose of the structure definitions in this file,
+we must redefine the following types in terms of Xmd.h's types, which may
+include bit fields.  All of these are #undef'd at the end of this file,
+restoring the definitions in X.h.  */
+
+#define Window CARD32
+#define Drawable CARD32
+#define Font CARD32
+#define Pixmap CARD32
+#define Cursor CARD32
+#define Colormap CARD32
+#define GContext CARD32
+#define Atom CARD32
+#define VisualID CARD32
+#define Time CARD32
+#define KeyCode CARD8
+#define KeySym CARD32
+
+/* End copied from Xproto.h */
+
 #define sz_xNXGetControlParametersReq           4
 #define sz_xNXGetCleanupParametersReq           4
 #define sz_xNXGetImageParametersReq             4
@@ -343,9 +367,9 @@
     CARD8    dstDepth;
     CARD32   srcLength B32;
     CARD32   dstLength B32;
-    INT16    srcX B16, srcY B16;
+    CARD16    srcX B16, srcY B16;
     CARD16   srcWidth B16, srcHeight B16;
-    INT16    dstX B16, dstY B16;
+    CARD16    dstX B16, dstY B16;
     CARD16   dstWidth B16, dstHeight B16;
 } xNXPutPackedImageReq;
 
@@ -463,4 +487,20 @@
 }
 #endif
 
+/* Copied from Xproto.h */
+
+/* restore these definitions back to the typedefs in X.h */
+#undef Window
+#undef Drawable
+#undef Font
+#undef Pixmap
+#undef Cursor
+#undef Colormap
+#undef GContext
+#undef Atom
+#undef VisualID
+#undef Time
+#undef KeyCode
+#undef KeySym
+
 #endif /* NXproto_H */
diff -ur nx-X11/programs/Xserver/hw/nxagent.old/Millis.c nx-X11/programs/Xserver/hw/nxagent/Millis.c
--- nx-X11/programs/Xserver/hw/nxagent.old/Millis.c	2006-05-25 11:37:31.000000000 +0200
+++ nx-X11/programs/Xserver/hw/nxagent/Millis.c	2007-02-12 19:10:10.000000000 +0100
@@ -22,7 +22,7 @@
 #include "Millis.h"
 
 #ifdef DDXTIME
-unsigned long GetTimeInMillis()
+CARD32 GetTimeInMillis()
 {
   struct timeval ts;
 
diff -ur nx-X11/programs/Xserver/hw/nxagent.old/Millis.h nx-X11/programs/Xserver/hw/nxagent/Millis.h
--- nx-X11/programs/Xserver/hw/nxagent.old/Millis.h	2006-05-22 15:02:16.000000000 +0200
+++ nx-X11/programs/Xserver/hw/nxagent/Millis.h	2007-02-12 19:22:26.000000000 +0100
@@ -18,7 +18,7 @@
 #ifndef __Millis_H__
 #define __Millis_H__
 
-unsigned long GetTimeInMillis(void);
+#include "os.h"
 
 const char *GetTimeInMillisAsString(void);
 
diff -ur lib.old/X11/XlcDL.c lib/X11/XlcDL.c
--- nx-X11.old/lib/X11/XlcDL.c	2006-06-19 16:20:46.000000000 +0200
+++ nx-X11/lib/X11/XlcDL.c	2007-02-12 06:32:53.000000000 +0100
@@ -61,7 +61,7 @@
 # elif defined(__ia64__) 
 #  undef MACH64_NAME
 # else
-#  error "Unknown architecture"
+#  warning "Unknown architecture"
 # endif /* defined(__sparcv9) */
 # ifdef _MACH64_NAME
 #  define	_MACH64_NAME_LEN	(sizeof (_MACH64_NAME) - 1)