SOURCES: nx-gcc-4.1.patch, nxviewer.patch, nx-X11-libs.patch - 2.0.0
aredridel
aredridel at pld-linux.org
Mon Jul 10 19:56:07 CEST 2006
Author: aredridel Date: Mon Jul 10 17:56:07 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- 2.0.0
---- Files affected:
SOURCES:
nx-gcc-4.1.patch (1.1 -> 1.2) , nxviewer.patch (1.1 -> 1.2) , nx-X11-libs.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/nx-gcc-4.1.patch
diff -u SOURCES/nx-gcc-4.1.patch:1.1 SOURCES/nx-gcc-4.1.patch:1.2
--- SOURCES/nx-gcc-4.1.patch:1.1 Mon Mar 20 01:22:56 2006
+++ SOURCES/nx-gcc-4.1.patch Mon Jul 10 19:56:01 2006
@@ -1,18 +1,116 @@
-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.
- //
+diff -ur nx-2.0.0-o/nxcomp/RenderExtension.h nx-2.0.0/nxcomp/RenderExtension.h
+--- nx-2.0.0-o/nxcomp/RenderExtension.h 2006-06-19 11:55:57.000000000 -0600
++++ nx-2.0.0/nxcomp/RenderExtension.h 2006-07-10 11:13:51.000000000 -0600
+@@ -20,22 +20,12 @@
+
+ #include "Message.h"
+
+-//
+-// Set the verbosity level.
+-//
+-
+ #define PANIC
+ #define WARNING
+ #undef TEST
+ #undef DEBUG
+ #undef DUMP
+
+-//
+-// Compression of data part is not enabled as
+-// most messages of this type are smaller than
+-// the current data size compression threshold.
+-//
+-
+ #define RENDEREXTENSION_ENABLE_CACHE 1
+ #define RENDEREXTENSION_ENABLE_DATA 0
+ #define RENDEREXTENSION_ENABLE_SPLIT 0
+@@ -52,16 +42,8 @@
+ #define RENDEREXTENSION_CACHE_THRESHOLD_IF_PROTO_STEP_7 30
+ #define RENDEREXTENSION_CACHE_LOWER_THRESHOLD_IF_PROTO_STEP_7 20
+
+-//
+-// Used to build the table of minor opcodes.
+-//
+-
+ #define RENDEREXTENSION_MINOR_OPCODE_LIMIT 256
+
+-//
+-// The message class.
+-//
+-
+ class RenderMinorExtensionStore;
-+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
+@@ -102,14 +84,6 @@
+ {
+ }
+
+- //
+- // We consider for this message a data offset of 36,
+- // that is size of the biggest among all requests of
+- // this extension. The most common requests have a
+- // specific differential encoding, others are simply
+- // encoded through an array of int or char caches.
+- //
+-
+ private:
+
+ union
+@@ -338,10 +312,6 @@
+ return sizeof(RenderExtensionMessage);
+ }
+
+- //
+- // Message handling methods.
+- //
+-
+ public:
+
+ virtual Message *create() const
+@@ -359,18 +329,8 @@
+ delete (RenderExtensionMessage *) message;
+ }
+
+- //
+- // Determine if the message must be stored
+- // in the cache.
+- //
+-
+ virtual int validateMessage(const unsigned char *buffer, int size);
+
+- //
+- // Since protocol step 5 these methods are
+- // specialized in their minor opcode stores.
+- //
+-
+ virtual int identitySize(const unsigned char *buffer, unsigned int size);
+
+ virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+@@ -403,10 +363,6 @@
+
+ unsigned char opcode_;
+
+- //
+- // Keep pointers to specialized classes.
+- //
+-
+ RenderMinorExtensionStore *minors_[RENDEREXTENSION_MINOR_OPCODE_LIMIT];
+
+ RenderMinorExtensionStore *generic_;
+@@ -445,10 +401,6 @@
+ unsigned int size, md5_state_t *md5_state,
+ int bigEndian) const = 0;
+
+- //
+- // Internal encode and decode utilities.
+- //
+-
+ protected:
+
+ void encodeLongData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+diff -ur nx-2.0.0-o/nxviewer/nxviewer/cursor.c nx-2.0.0/nxviewer/nxviewer/cursor.c
+--- nx-2.0.0-o/nxviewer/nxviewer/cursor.c 2006-01-09 06:43:52.000000000 -0700
++++ nx-2.0.0/nxviewer/nxviewer/cursor.c 2006-07-10 11:12:36.000000000 -0600
@@ -412,7 +412,6 @@
offset = y * rcWidth + x;
if (rcMask[offset]) {
@@ -21,53 +119,3 @@
}
}
}
-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();
- }
- }
================================================================
Index: SOURCES/nxviewer.patch
diff -u SOURCES/nxviewer.patch:1.1 SOURCES/nxviewer.patch:1.2
--- SOURCES/nxviewer.patch:1.1 Sun Sep 18 00:07:14 2005
+++ SOURCES/nxviewer.patch Mon Jul 10 19:56:01 2006
@@ -1,11 +1,15 @@
-diff -ru nxviewer/nxviewer/Imakefile nxviewer.mod/nxviewer/Imakefile
---- nxviewer/nxviewer/Imakefile 2004-06-17 11:44:40.000000000 +0200
-+++ nxviewer.mod/nxviewer/Imakefile 2004-09-14 15:33:31.000000000 +0200
-@@ -51,6 +51,7 @@
+Only in nx-2.0.0/nxviewer: Imakefile.orig
+Only in nx-2.0.0/nxviewer: Imakefile.rej
+diff -ur nx-2.0.0-o/nxviewer/nxviewer/Imakefile nx-2.0.0/nxviewer/nxviewer/Imakefile
+--- nx-2.0.0-o/nxviewer/nxviewer/Imakefile 2006-02-22 10:23:57.000000000 -0700
++++ nx-2.0.0/nxviewer/nxviewer/Imakefile 2006-07-10 08:32:42.000000000 -0600
+@@ -51,6 +51,8 @@
DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
+#define XawClientLibs -L/usr/X11R6/lib -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext-nx -lX11-nx
- LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) $(NX_LIB)
-
++
#ifdef SunArchitecture
+ LOCAL_LIBRARIES = $(NX_LIB) $(SUN_LIB) XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB)
+ #else
+Only in nx-2.0.0/nxviewer/nxviewer: Imakefile~
================================================================
Index: SOURCES/nx-X11-libs.patch
diff -u SOURCES/nx-X11-libs.patch:1.1 SOURCES/nx-X11-libs.patch:1.2
--- SOURCES/nx-X11-libs.patch:1.1 Sun Sep 18 00:04:08 2005
+++ SOURCES/nx-X11-libs.patch Mon Jul 10 19:56:01 2006
@@ -1,6 +1,6 @@
-diff -Nru /home/couriousous/nx-1.5/nx-X11/config/cf/Imake.cf nx-X11/config/cf/Imake.cf
---- /home/couriousous/nx-1.5/nx-X11/config/cf/Imake.cf 2003-02-18 17:51:46.000000000 +0100
-+++ nx-X11/config/cf/Imake.cf 2005-07-09 15:07:22.181305848 +0200
+diff -ur nx-2.0.0-o/nx-X11/config/cf/Imake.cf nx-2.0.0/nx-X11/config/cf/Imake.cf
+--- nx-2.0.0-o/nx-X11/config/cf/Imake.cf 2006-06-19 08:18:55.000000000 -0600
++++ nx-2.0.0/nx-X11/config/cf/Imake.cf 2006-07-09 22:27:28.000000000 -0600
@@ -747,6 +747,13 @@
# define Mc68020Architecture
# undef mc68000
@@ -15,21 +15,9 @@
# ifdef powerpc
# define PpcArchitecture
# undef powerpc
-diff -Nru /home/couriousous/nx-1.5/nx-X11/config/cf/X11.tmpl nx-X11/config/cf/X11.tmpl
---- /home/couriousous/nx-1.5/nx-X11/config/cf/X11.tmpl 2003-05-13 10:39:14.000000000 +0200
-+++ nx-X11/config/cf/X11.tmpl 2005-07-09 15:07:22.184305916 +0200
-@@ -469,7 +469,7 @@
- #endif
- #endif
- #ifndef BuildXprintLib
--#define BuildXprintLib (BuildXprint && !BuildServersOnly)
-+#define BuildXprintLib YES
- #endif
- #ifndef BuildScreenSaverExt
- #define BuildScreenSaverExt NO
-diff -Nru /home/couriousous/nx-1.5/nx-X11/config/cf/linux.cf nx-X11/config/cf/linux.cf
---- /home/couriousous/nx-1.5/nx-X11/config/cf/linux.cf 2005-04-18 20:23:13.000000000 +0200
-+++ nx-X11/config/cf/linux.cf 2005-07-09 15:07:22.182305871 +0200
+diff -ur nx-2.0.0-o/nx-X11/config/cf/linux.cf nx-2.0.0/nx-X11/config/cf/linux.cf
+--- nx-2.0.0-o/nx-X11/config/cf/linux.cf 2006-06-19 08:18:55.000000000 -0600
++++ nx-2.0.0/nx-X11/config/cf/linux.cf 2006-07-09 22:27:28.000000000 -0600
@@ -288,6 +288,8 @@
# elif defined(HPArchitecture)
# define BuildXF86DRI NO
@@ -65,9 +53,21 @@
#ifdef PpcArchitecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
-diff -Nru /home/couriousous/nx-1.5/nx-X11/config/cf/xfree86.cf nx-X11/config/cf/xfree86.cf
---- /home/couriousous/nx-1.5/nx-X11/config/cf/xfree86.cf 2003-02-26 21:08:00.000000000 +0100
-+++ nx-X11/config/cf/xfree86.cf 2005-07-09 15:07:22.186305961 +0200
+diff -ur nx-2.0.0-o/nx-X11/config/cf/X11.tmpl nx-2.0.0/nx-X11/config/cf/X11.tmpl
+--- nx-2.0.0-o/nx-X11/config/cf/X11.tmpl 2006-06-19 08:18:56.000000000 -0600
++++ nx-2.0.0/nx-X11/config/cf/X11.tmpl 2006-07-09 22:27:28.000000000 -0600
+@@ -469,7 +469,7 @@
+ #endif
+ #endif
+ #ifndef BuildXprintLib
+-#define BuildXprintLib (BuildXprint && !BuildServersOnly)
++#define BuildXprintLib YES
+ #endif
+ #ifndef BuildScreenSaverExt
+ #define BuildScreenSaverExt NO
+diff -ur nx-2.0.0-o/nx-X11/config/cf/xfree86.cf nx-2.0.0/nx-X11/config/cf/xfree86.cf
+--- nx-2.0.0-o/nx-X11/config/cf/xfree86.cf 2006-06-19 08:18:56.000000000 -0600
++++ nx-2.0.0/nx-X11/config/cf/xfree86.cf 2006-07-09 22:27:28.000000000 -0600
@@ -1099,6 +1099,99 @@
# endif
#endif
@@ -181,9 +181,9 @@
#if HasGcc2 && defined(PpcArchitecture)
# ifndef DefaultGcc2PpcOpt
# define DefaultGcc2PpcOpt -O2 GccAliasingArgs
-diff -Nru /home/couriousous/nx-1.5/nx-X11/config/imake/imakemdep.h nx-X11/config/imake/imakemdep.h
---- /home/couriousous/nx-1.5/nx-X11/config/imake/imakemdep.h 2002-12-24 18:42:58.000000000 +0100
-+++ nx-X11/config/imake/imakemdep.h 2005-07-09 15:07:22.187305983 +0200
+diff -ur nx-2.0.0-o/nx-X11/config/imake/imakemdep.h nx-2.0.0/nx-X11/config/imake/imakemdep.h
+--- nx-2.0.0-o/nx-X11/config/imake/imakemdep.h 2002-12-24 10:42:58.000000000 -0700
++++ nx-2.0.0/nx-X11/config/imake/imakemdep.h 2006-07-09 22:27:28.000000000 -0600
@@ -611,6 +611,9 @@
# ifdef ppc
"-Dppc",
@@ -236,9 +236,9 @@
#if defined(__BIG_ENDIAN__)
{"__BIG_ENDIAN__", "1"},
#endif
-diff -Nru /home/couriousous/nx-1.5/nx-X11/include/Xmd.h nx-X11/include/Xmd.h
---- /home/couriousous/nx-1.5/nx-X11/include/Xmd.h 2002-05-31 20:45:40.000000000 +0200
-+++ nx-X11/include/Xmd.h 2005-07-09 15:07:22.187305983 +0200
+diff -ur nx-2.0.0-o/nx-X11/include/Xmd.h nx-2.0.0/nx-X11/include/Xmd.h
+--- nx-2.0.0-o/nx-X11/include/Xmd.h 2006-06-19 08:19:05.000000000 -0600
++++ nx-2.0.0/nx-X11/include/Xmd.h 2006-07-09 22:27:28.000000000 -0600
@@ -63,7 +63,8 @@
defined(__sparc64__) || \
defined(__s390x__) || \
@@ -249,10 +249,10 @@
#define LONG64 /* 32/64-bit architecture */
#endif
#ifdef __sgi
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/Imakefile nx-X11/lib/X11/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/lib/X11/Imakefile 2004-04-27 23:05:26.000000000 +0200
-+++ nx-X11/lib/X11/Imakefile 2005-07-09 15:07:22.188306006 +0200
-@@ -75,7 +75,7 @@
+diff -ur nx-2.0.0-o/nx-X11/lib/X11/Imakefile nx-2.0.0/nx-X11/lib/X11/Imakefile
+--- nx-2.0.0-o/nx-X11/lib/X11/Imakefile 2006-06-19 08:20:43.000000000 -0600
++++ nx-2.0.0/nx-X11/lib/X11/Imakefile 2006-07-09 22:27:28.000000000 -0600
+@@ -62,7 +62,7 @@
#define DoExtraLib SharedLibX11
#define DoDebugLib DebugLibX11
#define DoProfileLib ProfileLibX11
@@ -261,9 +261,10 @@
#define SoRev SOXLIBREV
#define HugeLibrary YES
#define IncSubdir X11
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/XlcDL.c nx-X11/lib/X11/XlcDL.c
---- /home/couriousous/nx-1.5/nx-X11/lib/X11/XlcDL.c 2002-11-25 15:04:54.000000000 +0100
-+++ nx-X11/lib/X11/XlcDL.c 2005-07-09 15:07:22.188306006 +0200
+Only in nx-2.0.0/nx-X11/lib/X11: Imakefile.orig
+diff -ur nx-2.0.0-o/nx-X11/lib/X11/XlcDL.c nx-2.0.0/nx-X11/lib/X11/XlcDL.c
+--- nx-2.0.0-o/nx-X11/lib/X11/XlcDL.c 2006-06-19 08:20:46.000000000 -0600
++++ nx-2.0.0/nx-X11/lib/X11/XlcDL.c 2006-07-09 22:27:28.000000000 -0600
@@ -58,10 +58,8 @@
#ifdef _LP64
# if defined(__sparcv9)
@@ -276,9 +277,9 @@
# endif /* defined(__sparcv9) */
# ifdef _MACH64_NAME
# define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1)
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile 2001-11-16 01:52:30.000000000 +0100
-+++ nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile 2005-07-09 15:07:22.189306028 +0200
+diff -ur nx-2.0.0-o/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile nx-2.0.0/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile
+--- nx-2.0.0-o/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile 2001-11-15 17:52:30.000000000 -0700
++++ nx-2.0.0/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile 2006-07-09 22:27:28.000000000 -0600
@@ -13,7 +13,7 @@
CONN_DEFINES = ConnectionFlags
@@ -288,45 +289,45 @@
LinkSourceFile(imCallbk.c, ../../..)
LinkSourceFile(imDefFlt.c, ../../..)
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile 2001-11-16 01:52:30.000000000 +0100
-+++ nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile 2005-07-09 15:07:22.189306028 +0200
+diff -ur nx-2.0.0-o/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile nx-2.0.0/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile
+--- nx-2.0.0-o/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile 2001-11-15 17:52:30.000000000 -0700
++++ nx-2.0.0/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile 2006-07-09 22:27:28.000000000 -0600
@@ -4,7 +4,7 @@
- XI18NLIBNAME = xlibi18n
- SRCS = lcUTF8Load.c
+ XI18NLIBNAME = xlcDef
+ SRCS = lcDefConv.c
OBJS = ${SRCS:.c=.o}
- REQUIREDLIBS = -L$(XENVLIBDIR) -lX11 -lc
+ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc
- LinkSourceFile(lcUTF8Load.c, ../../..)
+ LinkSourceFile(lcDefConv.c, ../../..)
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile nx-X11/lib/X11/xlibi18n/lc/def/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile 2001-11-16 01:52:30.000000000 +0100
-+++ nx-X11/lib/X11/xlibi18n/lc/def/Imakefile 2005-07-09 15:07:22.189306028 +0200
+diff -ur nx-2.0.0-o/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile nx-2.0.0/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile
+--- nx-2.0.0-o/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile 2001-11-15 17:52:30.000000000 -0700
++++ nx-2.0.0/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile 2006-07-09 22:27:28.000000000 -0600
@@ -4,7 +4,7 @@
- XI18NLIBNAME = xlcDef
- SRCS = lcDefConv.c
+ XI18NLIBNAME = xlibi18n
+ SRCS = lcGenConv.c
OBJS = ${SRCS:.c=.o}
- REQUIREDLIBS = -L$(XENVLIBDIR) -lX11 -lc
+ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc
- LinkSourceFile(lcDefConv.c, ../../..)
+ LinkSourceFile(lcGenConv.c, ../../..)
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile 2001-11-16 01:52:30.000000000 +0100
-+++ nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile 2005-07-09 15:07:22.189306028 +0200
+diff -ur nx-2.0.0-o/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile nx-2.0.0/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile
+--- nx-2.0.0-o/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile 2001-11-15 17:52:30.000000000 -0700
++++ nx-2.0.0/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile 2006-07-09 22:27:28.000000000 -0600
@@ -4,7 +4,7 @@
XI18NLIBNAME = xlibi18n
- SRCS = lcGenConv.c
+ SRCS = lcUTF8Load.c
OBJS = ${SRCS:.c=.o}
- REQUIREDLIBS = -L$(XENVLIBDIR) -lX11 -lc
+ REQUIREDLIBS = -L$(XENVLIBDIR) -lX11-nx -lc
- LinkSourceFile(lcGenConv.c, ../../..)
+ LinkSourceFile(lcUTF8Load.c, ../../..)
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile 2001-11-16 01:52:30.000000000 +0100
-+++ nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile 2005-07-09 15:07:22.190306051 +0200
+diff -ur nx-2.0.0-o/nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile nx-2.0.0/nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile
+--- nx-2.0.0-o/nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile 2001-11-15 17:52:30.000000000 -0700
++++ nx-2.0.0/nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile 2006-07-09 22:27:28.000000000 -0600
@@ -4,7 +4,7 @@
XI18NLIBNAME = xlocale
SRCS = lcEuc.c lcSjis.c lcJis.c
@@ -336,9 +337,9 @@
LinkSourceFile(lcEuc.c, ../../..)
LinkSourceFile(lcSjis.c, ../../..)
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/om/generic/Imakefile nx-X11/lib/X11/xlibi18n/om/generic/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/lib/X11/xlibi18n/om/generic/Imakefile 2001-11-16 01:52:30.000000000 +0100
-+++ nx-X11/lib/X11/xlibi18n/om/generic/Imakefile 2005-07-09 15:07:22.190306051 +0200
+diff -ur nx-2.0.0-o/nx-X11/lib/X11/xlibi18n/om/generic/Imakefile nx-2.0.0/nx-X11/lib/X11/xlibi18n/om/generic/Imakefile
+--- nx-2.0.0-o/nx-X11/lib/X11/xlibi18n/om/generic/Imakefile 2001-11-15 17:52:30.000000000 -0700
++++ nx-2.0.0/nx-X11/lib/X11/xlibi18n/om/generic/Imakefile 2006-07-09 22:27:28.000000000 -0600
@@ -5,7 +5,7 @@
omTextEsc.c omTextExt.c omTextPer.c omXChar.c
@@ -348,9 +349,9 @@
LinkSourceFile(omDefault.c, ../../..)
LinkSourceFile(omGeneric.c, ../../..)
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/Xaw/Imakefile nx-X11/lib/Xaw/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/lib/Xaw/Imakefile 2001-01-17 20:42:28.000000000 +0100
-+++ nx-X11/lib/Xaw/Imakefile 2005-07-09 15:07:22.190306051 +0200
+diff -ur nx-2.0.0-o/nx-X11/lib/Xaw/Imakefile nx-2.0.0/nx-X11/lib/Xaw/Imakefile
+--- nx-2.0.0-o/nx-X11/lib/Xaw/Imakefile 2001-01-17 12:42:28.000000000 -0700
++++ nx-2.0.0/nx-X11/lib/Xaw/Imakefile 2006-07-09 22:27:28.000000000 -0600
@@ -194,6 +194,9 @@
XawI18n.o \
XawInit.o
@@ -361,9 +362,9 @@
#include <Library.tmpl>
#if DoSharedLib && SharedDataSeparation
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/Xaw6/Imakefile nx-X11/lib/Xaw6/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/lib/Xaw6/Imakefile 2002-05-31 20:45:44.000000000 +0200
-+++ nx-X11/lib/Xaw6/Imakefile 2005-07-09 15:07:22.190306051 +0200
+diff -ur nx-2.0.0-o/nx-X11/lib/Xaw6/Imakefile nx-2.0.0/nx-X11/lib/Xaw6/Imakefile
+--- nx-2.0.0-o/nx-X11/lib/Xaw6/Imakefile 2002-05-31 12:45:44.000000000 -0600
++++ nx-2.0.0/nx-X11/lib/Xaw6/Imakefile 2006-07-09 22:27:28.000000000 -0600
@@ -115,6 +115,9 @@
INCLUDES = -I$(AWIDGETSRC)
@@ -374,10 +375,10 @@
#include <Library.tmpl>
#if DoSharedLib && SharedDataSeparation
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/Xext/Imakefile nx-X11/lib/Xext/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/lib/Xext/Imakefile 2003-07-01 12:55:46.000000000 +0200
-+++ nx-X11/lib/Xext/Imakefile 2005-07-09 15:07:22.191306073 +0200
-@@ -30,16 +30,18 @@
+diff -ur nx-2.0.0-o/nx-X11/lib/Xext/Imakefile nx-2.0.0/nx-X11/lib/Xext/Imakefile
+--- nx-2.0.0-o/nx-X11/lib/Xext/Imakefile 2003-05-06 07:29:38.000000000 -0600
++++ nx-2.0.0/nx-X11/lib/Xext/Imakefile 2006-07-09 22:30:25.000000000 -0600
+@@ -10,14 +10,15 @@
#define DoExtraLib SharedLibXext
#define DoDebugLib DebugLibXext
#define DoProfileLib ProfileLibXext
@@ -389,18 +390,19 @@
#include <Threads.tmpl>
#ifdef SharedXextReqs
--REQUIREDLIBS = SharedXextReqs $(NX_REQUIREDLIBS)
+-REQUIREDLIBS = SharedXextReqs
+/* REQUIREDLIBS = SharedXextReqs $(NX_REQUIREDLIBS) */
+REQUIREDLIBS = -L../../exports/lib/ -lX11-nx $(NX_REQUIREDLIBS)
#endif
-+
#if HasShm
- SHMSRCS = XShm.c
- SHMOBJS = XShm.o
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/Xrender/Imakefile nx-X11/lib/Xrender/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/lib/Xrender/Imakefile 2002-11-14 22:01:18.000000000 +0100
-+++ nx-X11/lib/Xrender/Imakefile 2005-07-09 15:07:22.191306073 +0200
+Only in nx-2.0.0/nx-X11/lib/Xext: Imakefile~
+Only in nx-2.0.0/nx-X11/lib/Xext: Imakefile.orig
+Only in nx-2.0.0/nx-X11/lib/Xext: Imakefile.rej
+Only in nx-2.0.0/nx-X11/lib/Xext: Imakefile.rej~
+diff -ur nx-2.0.0-o/nx-X11/lib/Xrender/Imakefile nx-2.0.0/nx-X11/lib/Xrender/Imakefile
+--- nx-2.0.0-o/nx-X11/lib/Xrender/Imakefile 2002-11-14 14:01:18.000000000 -0700
++++ nx-2.0.0/nx-X11/lib/Xrender/Imakefile 2006-07-09 22:27:28.000000000 -0600
@@ -74,7 +74,7 @@
#define DoSharedLib SharedLibXrender
#define DoDebugLib DebugLibXrender
@@ -420,9 +422,9 @@
#endif
#if Malloc0ReturnsNull
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/Xt/Xtos.h nx-X11/lib/Xt/Xtos.h
---- /home/couriousous/nx-1.5/nx-X11/lib/Xt/Xtos.h 2002-04-04 16:05:36.000000000 +0200
-+++ nx-X11/lib/Xt/Xtos.h 2005-07-09 15:07:22.191306073 +0200
+diff -ur nx-2.0.0-o/nx-X11/lib/Xt/Xtos.h nx-2.0.0/nx-X11/lib/Xt/Xtos.h
+--- nx-2.0.0-o/nx-X11/lib/Xt/Xtos.h 2002-04-04 07:05:36.000000000 -0700
++++ nx-2.0.0/nx-X11/lib/Xt/Xtos.h 2006-07-09 22:27:28.000000000 -0600
@@ -66,7 +66,8 @@
defined(__sparc64__) || \
defined(__s390x__) || \
@@ -433,9 +435,9 @@
#define LONG64
#endif
-diff -Nru /home/couriousous/nx-1.5/nx-X11/lib/Xxf86dga/Imakefile nx-X11/lib/Xxf86dga/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/lib/Xxf86dga/Imakefile 2003-01-04 03:48:26.000000000 +0100
-+++ nx-X11/lib/Xxf86dga/Imakefile 2005-07-09 15:07:22.195306163 +0200
+diff -ur nx-2.0.0-o/nx-X11/lib/Xxf86dga/Imakefile nx-2.0.0/nx-X11/lib/Xxf86dga/Imakefile
+--- nx-2.0.0-o/nx-X11/lib/Xxf86dga/Imakefile 2003-01-03 19:48:26.000000000 -0700
++++ nx-2.0.0/nx-X11/lib/Xxf86dga/Imakefile 2006-07-09 22:27:28.000000000 -0600
@@ -28,6 +28,9 @@
#define IncludeSharedObjectInNormalLib
@@ -446,30 +448,22 @@
#include <Library.tmpl>
DependTarget()
-diff -Nru /home/couriousous/nx-1.5/nx-X11/programs/Xserver/Imakefile nx-X11/programs/Xserver/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/programs/Xserver/Imakefile 2005-05-01 18:23:52.000000000 +0200
-+++ nx-X11/programs/Xserver/Imakefile 2005-07-09 15:14:10.706526164 +0200
-@@ -1355,7 +1355,7 @@
- XPMLIB = -lXpm
- NXAGENT = hw/nxagent/LibraryTargetName(nxagent)
- NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI)
--NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB)
-+NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) -lX11-nx -lXext-nx -lXrender-nx $(SYSLIBS) $(XPMLIB)
- #if HasParallelMake
- MakeMutex($(NXAGENTDIRS) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS))
- #endif
-@@ -1371,7 +1371,7 @@
- #if defined(SunArchitecture)
- NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -lXcomp -lXcompext -lrt -L/usr/sfw/lib -lXrender
- #else
--NXAGENTNXLIBS = -Wl,-rpath-link,../../../nxcomp -Wl,-rpath-link,../../../nxcompext,-lXrender
-+NXAGENTNXLIBS = -Wl,-rpath-link,../../../nxcomp -Wl,-rpath-link,../../../nxcompext
- #endif
+diff -ur nx-2.0.0-o/nx-X11/programs/xedit/lisp/Imakefile nx-2.0.0/nx-X11/programs/xedit/lisp/Imakefile
+--- nx-2.0.0-o/nx-X11/programs/xedit/lisp/Imakefile 2002-12-13 21:41:14.000000000 -0700
++++ nx-2.0.0/nx-X11/programs/xedit/lisp/Imakefile 2006-07-09 22:27:28.000000000 -0600
+@@ -98,6 +98,9 @@
+ write.o \
+ xedit.o
- #endif
-diff -Nru /home/couriousous/nx-1.5/nx-X11/programs/Xserver/fb/fb.h nx-X11/programs/Xserver/fb/fb.h
---- /home/couriousous/nx-1.5/nx-X11/programs/Xserver/fb/fb.h 2003-01-30 22:46:30.000000000 +0100
-+++ nx-X11/programs/Xserver/fb/fb.h 2005-07-09 15:07:22.197306208 +0200
++#undef DefaultCCOptions
++#define DefaultCCOptions GccWarningOptions
++
+ #include <Library.tmpl>
+
+ AllTarget(ProgramTargetName($(SAMP)))
+diff -ur nx-2.0.0-o/nx-X11/programs/Xserver/fb/fb.h nx-2.0.0/nx-X11/programs/Xserver/fb/fb.h
+--- nx-2.0.0-o/nx-X11/programs/Xserver/fb/fb.h 2003-01-30 14:46:30.000000000 -0700
++++ nx-2.0.0/nx-X11/programs/Xserver/fb/fb.h 2006-07-09 22:27:28.000000000 -0600
@@ -105,7 +105,8 @@
defined(ia64) || defined(__ia64__) || \
defined(__sparc64__) || \
@@ -480,9 +474,9 @@
typedef unsigned long FbBits;
# else
typedef unsigned long long FbBits;
-diff -Nru /home/couriousous/nx-1.5/nx-X11/programs/Xserver/hw/xfree86/fbdevhw/Imakefile nx-X11/programs/Xserver/hw/xfree86/fbdevhw/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/programs/Xserver/hw/xfree86/fbdevhw/Imakefile 2002-11-22 23:56:04.000000000 +0100
-+++ nx-X11/programs/Xserver/hw/xfree86/fbdevhw/Imakefile 2005-07-09 15:07:22.197306208 +0200
+diff -ur nx-2.0.0-o/nx-X11/programs/Xserver/hw/xfree86/fbdevhw/Imakefile nx-2.0.0/nx-X11/programs/Xserver/hw/xfree86/fbdevhw/Imakefile
+--- nx-2.0.0-o/nx-X11/programs/Xserver/hw/xfree86/fbdevhw/Imakefile 2002-11-22 15:56:04.000000000 -0700
++++ nx-2.0.0/nx-X11/programs/Xserver/hw/xfree86/fbdevhw/Imakefile 2006-07-09 22:27:28.000000000 -0600
@@ -1,6 +1,8 @@
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/Imakefile,v 1.12 2002/11/22 22:56:03 tsi Exp $
@@ -492,9 +486,9 @@
#include <Server.tmpl>
#if defined(LinuxArchitecture) && LinuxFBDevSupport
-diff -Nru /home/couriousous/nx-1.5/nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Imakefile nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Imakefile
---- /home/couriousous/nx-1.5/nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Imakefile 2003-02-23 21:26:50.000000000 +0100
-+++ nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Imakefile 2005-07-09 15:07:22.198306230 +0200
+diff -ur nx-2.0.0-o/nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Imakefile nx-2.0.0/nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Imakefile
+--- nx-2.0.0-o/nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Imakefile 2003-02-23 13:26:50.000000000 -0700
++++ nx-2.0.0/nx-X11/programs/Xserver/hw/xfree86/os-support/bus/Imakefile 2006-07-09 22:27:28.000000000 -0600
@@ -34,6 +34,7 @@
#elif defined(LinuxArchitecture) && \
@@ -503,9 +497,9 @@
defined(MipsArchitecture) || \
defined(ia64Architecture) || \
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/nx-gcc-4.1.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/nxviewer.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/nx-X11-libs.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list