- updated to work with 1.5E

Changed files:
    Xaw3d-static.patch -> 1.2
    Xaw3d.patch -> 1.2

diff --git a/Xaw3d-static.patch b/Xaw3d-static.patch
index 616a5e993e97ae8779dd144a21ef4b722941f461..bde25bd8ae68beb2bc286be9c33aad888c875ab9 100644 (file)
--- a/Xaw3d-static.patch
+++ b/Xaw3d-static.patch
@@ -1,8 +1,9 @@
---- 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 $
--
+--- Xaw3d-1.5E/xc/lib/Xaw3d/Imakefile.orig     Fri Apr 18 09:45:50 2003
++++ Xaw3d-1.5E/xc/lib/Xaw3d/Imakefile  Fri Apr 18 09:46:25 2003
+@@ -11,6 +11,8 @@
+ XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
+ #undef ARROW_SCROLLBARS
+ 
 +#undef ForceNormalLib
 +#define ForceNormalLib YES
  #define DoNormalLib NormalLibXaw

diff --git a/Xaw3d.patch b/Xaw3d.patch
index e78e812ad6a23312fd011063987e0b075b521323..0865fc7fa87433a0ab1df8cf62c35c94848c0479 100644 (file)
--- a/Xaw3d.patch
+++ b/Xaw3d.patch
@@ -1,30 +1,29 @@
---- 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 @@
+--- Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c.orig   Fri Apr 18 09:42:17 2003
++++ Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c        Fri Apr 18 09:44:12 2003
+@@ -1087,7 +1087,11 @@
      Cardinal *num_params;     /* unused */
  {
      register ScrollbarWidget sbw = (ScrollbarWidget) w;
 -    float top = sbw->scrollbar.top;
 +    union {
-+      XtPointer pt;
-+      float     top;
++       XtPointer pt;
++       float     top;
 +    } foo;
 +    foo.top = sbw->scrollbar.top;
  
- #ifndef ARROW_SCROLLBAR
+ #ifndef XAW_ARROW_SCROLLBARS
      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. */
+@@ -1116,10 +1120,10 @@
+     /* Removed the dependancy on scrollbar arrows. Xterm as distributed in
+        X11R6.6 by The XFree86 Project wants this correction, with or without
+        the arrows. */
 -    top += 0.0001;
 +    foo.top += 0.0001;
- #endif
+ /* #endif */
 -    XtCallCallbacks (w, XtNthumbProc, *(XtPointer*)&top);
 -    XtCallCallbacks (w, XtNjumpProc, (XtPointer)&top);
 +    XtCallCallbacks (w, XtNthumbProc, foo.pt);
 +    XtCallCallbacks (w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
  }
  
-
-
+