- patches from RH.

Changed files:
    Xaw3d-ia64.patch -> 1.1
    Xaw3d-shlib.patch -> 1.1
    Xaw3d-static.patch -> 1.1
    Xaw3d.patch -> 1.1

diff --git a/Xaw3d-ia64.patch b/Xaw3d-ia64.patch
new file mode 100644 (file)
index 0000000..18a2060
--- /dev/null
+++ b/Xaw3d-ia64.patch
@@ -0,0 +1,32 @@
+--- Xaw3d-1.5/xc/lib/Xaw3d/List.c~     Tue Oct 15 16:41:20 1996
++++ Xaw3d-1.5/xc/lib/Xaw3d/List.c      Mon Jul 24 16:55:29 2000
+@@ -37,6 +37,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ 
+ #include <X11/IntrinsicP.h>
+--- Xaw3d-1.5/xc/lib/Xaw3d/MultiSink.c~        Tue Oct 15 16:41:20 1996
++++ Xaw3d-1.5/xc/lib/Xaw3d/MultiSink.c Mon Jul 24 16:58:09 2000
+@@ -81,6 +81,7 @@
+ #include <X11/Xaw3d/TextP.h>
+ #include "XawI18n.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ 
+ #ifdef GETLASTPOS
+--- Xaw3d-1.5/xc/lib/Xaw3d/Text.c~     Thu May 14 21:03:24 1998
++++ Xaw3d-1.5/xc/lib/Xaw3d/Text.c      Mon Jul 24 17:00:54 2000
+@@ -71,6 +71,7 @@
+ 
+ #include <X11/Xfuncs.h>
+ #include <ctype.h>            /* for isprint() */
++#include <stdlib.h>           /* for abs() */
+ 
+ #ifndef MAX_LEN_CT
+ #define MAX_LEN_CT 6          /* for sequence: ESC $ ( A \xx \xx */
+
+

diff --git a/Xaw3d-shlib.patch b/Xaw3d-shlib.patch
new file mode 100644 (file)
index 0000000..6ff170e
--- /dev/null
+++ b/Xaw3d-shlib.patch
@@ -0,0 +1,31 @@
+diff -Nru Xaw3d-1.5/xc/lib/Xaw3d/Imakefile Xaw3d-1.5.new/xc/lib/Xaw3d/Imakefile
+--- Xaw3d-1.5/xc/lib/Xaw3d/Imakefile   Tue Oct 15 16:41:19 1996
++++ Xaw3d-1.5.new/xc/lib/Xaw3d/Imakefile       Sat Sep  9 03:49:45 2000
+@@ -10,27 +10,6 @@
+ #define IncSubdir X11
+ #define IncSubSubdir Xaw3d
+ 
+-#ifdef LinuxArchitecture
+-JUMP_ROOT_Xaw3d = $(AWIDGETSRC)3d
+-JUMP_IS_HOST_Xaw3d = YES
+-JUMP_STUBLIBS_Xaw3d = libXaw3d.sa
+-JUMP_SUBDIRS_Xaw3d = $(JUMP_ROOT_Xt)
+-JUMP_DIR_Xaw3d = $(JUMP_ROOT_Xaw3d)/shared
+-JUMP_VARS_Xaw3d = $(JUMP_ROOT_Xaw3d)/jump_vars
+-JUMP_FUNCS_Xaw3d = $(JUMP_ROOT_Xaw3d)/jump_funcs
+-JUMP_IGNORE_Xaw3d = $(JUMP_ROOT_Xaw3d)/jump_ignore
+-JUMP_EXPORT_Xaw3d = $(JUMP_DIR_Xaw3d)/jump.vars
+-JUMP_IMPORT_Xaw3d = $(JUMP_EXPORT_Xt) $(JUMP_EXPORT_X11)
+-JUMP_ADDRESS_Xaw3d = 0x60300000
+-JUMP_JUMPTABLESIZE_Xaw3d = 0x4000
+-JUMP_GOTSIZE_Xaw3d = 4096
+-JUMP_STUBNAMES_Xaw3d = libXaw3d
+-JUMP_STUBS_IMPORT_Xaw3d = $(JUMP_STUBS_IMPORT_X11)
+-JUMP_LDLIBS_Xaw3d = $(JUMP_ROOT_Xt)/libXt.sa $(JUMP_ROOT_Xt)/libXmu.sa \
+-        $(JUMP_ROOT_Xt)/libXext.sa $(JUMP_ROOT_X11)/libX11.sa \
+-        $(JUMP_LDLIBS_libc)
+-#endif
+-
+ #ifdef SharedXawReqs
+ REQUIREDLIBS = SharedXawReqs
+ #endif

diff --git a/Xaw3d-static.patch b/Xaw3d-static.patch
new file mode 100644 (file)
index 0000000..616a5e9
--- /dev/null
+++ b/Xaw3d-static.patch
@@ -0,0 +1,10 @@
+--- Xaw3d-1.5/xc/lib/Xaw3d/Imakefile.orig      Mon Jul  3 14:26:09 2000
++++ Xaw3d-1.5/xc/lib/Xaw3d/Imakefile   Mon Jul  3 14:26:36 2000
+@@ -1,5 +1,6 @@
+ XCOMM $XConsortium: Imakefile,v 1.78 91/09/18 14:28:23 rws Exp $
+-
++#undef ForceNormalLib
++#define ForceNormalLib YES
+ #define DoNormalLib NormalLibXaw
+ #define DoSharedLib SharedLibXaw
+ #define DoDebugLib DebugLibXaw 

diff --git a/Xaw3d.patch b/Xaw3d.patch
new file mode 100644 (file)
index 0000000..e78e812
--- /dev/null
+++ b/Xaw3d.patch
@@ -0,0 +1,30 @@
+--- Xaw3d-1.5/xc/lib/Xaw3d/Scrollbar.c Tue Oct 15 07:41:21 1996
++++ Xaw3d-1.5.ia64/xc/lib/Xaw3d/Scrollbar.c    Tue May  9 07:02:52 2000
+@@ -1178,7 +1178,11 @@
+     Cardinal *num_params;     /* unused */
+ {
+     register ScrollbarWidget sbw = (ScrollbarWidget) w;
+-    float top = sbw->scrollbar.top;
++    union {
++      XtPointer pt;
++      float     top;
++    } foo;
++    foo.top = sbw->scrollbar.top;
+ 
+ #ifndef ARROW_SCROLLBAR
+     if (sbw->scrollbar.direction == 0) return; /* if no StartScroll */
+@@ -1204,10 +1208,10 @@
+        there is no problem since in this case there is always a constant
+        integer number of pixels the thumb must be moved in order to scroll
+        to the next line/column. */
+-    top += 0.0001;
++    foo.top += 0.0001;
+ #endif
+-    XtCallCallbacks (w, XtNthumbProc, *(XtPointer*)&top);
+-    XtCallCallbacks (w, XtNjumpProc, (XtPointer)&top);
++    XtCallCallbacks (w, XtNthumbProc, foo.pt);
++    XtCallCallbacks (w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
+ }
+ 
+
+