openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File Xaw3d-1.5E.dif of Package xaw3d (Revision 426454c25845f0eb15ce047a1e4dc874)

Currently displaying revision 426454c25845f0eb15ce047a1e4dc874 , Show latest

--- .pkgextract
+++ .pkgextract
@@ -0,0 +1,8 @@
+patch -p0 -s --suffix='.secure' < ../../../Xaw3d-1.5E-secure.patch
+patch -p0 -s --suffix='.thumb'  < ../../../Xaw3d-1.5E-thumb.patch
+patch -p0 -s --suffix='.hsbar'  < ../../../Xaw3d-1.5E-hsbar.patch
+patch -p0 -s --suffix='.compat' < ../../../Xaw3d-1.5E-compat.patch
+patch -p0 -s --suffix='.3Dlab'  < ../../../Xaw3d-1.5E-3Dlabel.patch
+patch -p0 -s --suffix='.gvI18N' < ../../../Xaw3d-1.5E-gvI18N.patch
+patch -p0 -s --suffix='.font'   < ../../../Xaw3d-1.5E-fontset.patch
+patch -p3 -s --suffix='.null'   < ../../../Xaw3d-1.5E-null.patch
--- Imakefile
+++ Imakefile
@@ -1,15 +1,11 @@
-#ifndef XCOMM
-#define XCOMM #
-#endif
-
 XCOMM Build options. Have you read the README.XAW3D file yet?
 XCOMM
 XCOMM For color pixmaps, define MULTIPLANE_PIXMAPS:
-#undef MULTIPLANE_PIXMAPS
+#define MULTIPLANE_PIXMAPS
 XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
 #define GRAY_BLKWHT_STIPPLES
 XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
-#undef ARROW_SCROLLBARS
+#define ARROW_SCROLLBARS
 
 #define DoNormalLib NormalLibXaw
 #define DoSharedLib SharedLibXaw
@@ -20,9 +16,15 @@
 #define SoRev SOXAWREV
 #define IncSubdir X11
 #define IncSubSubdir Xaw3d
+#define AvoidNullMakeCommand YES
+
+#if defined(LinuxArchitecture) && !defined(UseElfFormat)
+AWIDGET3DSRC = .
+JUMP_ROOT_Xaw3d = $(AWIDGET3DSRC)
+#endif
 
 XCOMM When building outside an X11 source tree:
-XCOMM EXTRA_INCLUDES = -I.
+EXTRA_INCLUDES = -I.
 
 #ifdef SharedXawReqs
 REQUIREDLIBS = SharedXawReqs
@@ -82,8 +84,18 @@
 OBJS = $(BASE_OBJS)
 #endif
 
+#undef  ForceNormalLib
+#define ForceNormalLib YES
 #include <Library.tmpl>
 
+XAWLIBNAME = Xaw8
+SharedLibraryTarget($(XAWLIBNAME),$(SoRev),$(OBJS),.,.)
+SharedLibraryDataTarget($(XAWLIBNAME),$(SoRev),$(UNSHAREDOBJS))
+InstallSharedLibrary($(XAWLIBNAME),$(SoRev),$(SHLIBDIR)/Xaw3d)
+InstallSharedLibraryData($(XAWLIBNAME),$(SoRev),$(SHLIBDIR)/Xaw3d)
+CDEBUGFLAGS = -O2 -pipe -Wall -fno-strict-aliasing
+_NULLCMD_   = @echo -n
+
 #if DoSharedLib && SharedDataSeparation
 SpecialCObjectRule(sharedlib.o,NullParameter,$(SHLIBDEF))
 #endif
--- List.c
+++ List.c
@@ -38,6 +38,7 @@
 
 #include "Xaw3dP.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
--- MultiSink.c
+++ MultiSink.c
@@ -81,6 +81,7 @@
 #include <X11/Xaw3d/TextP.h>
 #include "XawI18n.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #ifdef GETLASTPOS
--- NOTE
+++ NOTE
@@ -0,0 +1,25 @@
+Note:
+
+  This /usr/lib/Xaw3d/libXaw8.so.8.0 is a real
+  libXaw3d.so.8.0 linked with  `-soname libXaw8.so.8'.
+
+  Therfore do _NOT_ replace  /usr/lib/libXaw8.so.8.0.0
+  by /usr/lib/Xaw3d/libXaw.so.8.0
+
+  On any problem starting X11 programs please remove the
+  package xaw3dd.
+
+Achtung:
+
+  Die Bibliothek /usr/lib/Xaw3d/libXaw8.so.8.0 ist
+  in Wirklichkeit eine libXaw3d.so.8.0, die mit der
+  Option `-soname libXaw8.so.8' gelinkt wurde.
+
+  Darum ersetzten Sie auf KEINEN Fall /usr/lib/libXaw8.so.8.0.0
+  durch /usr/lib/Xaw3d/libXaw8.so.8.0.
+
+  Falls Sie irgendwelche Probleme mit X11-Programmen haben,
+  deinstallieren Sie das Paket xaw3dd.
+
+
+Werner Fink                  <feedback@suse.de>
--- Scrollbar.c
+++ Scrollbar.c
@@ -155,9 +155,8 @@
 
 #ifdef XAW_ARROW_SCROLLBARS
 static void HandleThumb();
-#else
-static void StartScroll();
 #endif
+static void StartScroll();
 static void MoveThumb();
 static void NotifyThumb();
 static void NotifyScroll();
@@ -166,9 +165,8 @@
 static XtActionsRec actions[] = {
 #ifdef XAW_ARROW_SCROLLBARS
     {"HandleThumb",	HandleThumb},
-#else
-    {"StartScroll",     StartScroll},
 #endif
+    {"StartScroll",     StartScroll},
     {"MoveThumb",	MoveThumb},
     {"NotifyThumb",	NotifyThumb},
     {"NotifyScroll",	NotifyScroll},
@@ -1071,6 +1069,13 @@
 		    client_data);
 }
 
+static void StartScroll (w, event, params, num_params )
+    Widget w;
+    XEvent *event;
+    String *params;		/* direction: Back|Forward|Smooth */
+    Cardinal *num_params;	/* we only support 1 */
+{
+}
 #else /* XAW_ARROW_SCROLLBARS */
 /* ARGSUSED */
 static void StartScroll (w, event, params, num_params )
--- SimpleMenu.c
+++ SimpleMenu.c
@@ -1352,7 +1352,7 @@
     SimpleMenuWidget smw = (SimpleMenuWidget)w;
     SmeObject *entry;
     SmeBSBObject bsb_entry;
-    Dimension l_mrgn, l_bmw, r_mrgn, r_bmw;
+    Dimension l_mrgn = 0, l_bmw, r_mrgn = 0, r_bmw;
 
     if (smw->simple_menu.left_whitespace || smw->simple_menu.right_whitespace)
     {
--- Text.c
+++ Text.c
@@ -58,6 +58,7 @@
 #include "XawI18n.h"
 #endif
 #include <stdio.h>
+#include <stdlib.h>
 #include <X11/Xmu/Atoms.h>
 #include <X11/Xmu/CharSet.h>
 #include <X11/Xmu/Converters.h>
@@ -572,7 +573,7 @@
       ctx->core.height += XawTextSinkMaxHeight(ctx->text.sink, 1);
   }
 
-  if (ctx->text.scroll_vert != XawtextScrollNever) 
+  if (ctx->text.scroll_vert != XawtextScrollNever) {
     if ( (ctx->text.resize == XawtextResizeHeight) ||
      	 (ctx->text.resize == XawtextResizeBoth) ) {
       char *err1 = "Xaw Text Widget ";
@@ -590,8 +591,9 @@
     }
     else if (ctx->text.scroll_vert == XawtextScrollAlways)
       CreateVScrollBar(ctx);
+  }
 
-  if (ctx->text.scroll_horiz != XawtextScrollNever) 
+  if (ctx->text.scroll_horiz != XawtextScrollNever) {
     if (ctx->text.wrap != XawtextWrapNever) {
       char *err1 = "Xaw Text Widget ";
       char *err2 = ":\nHorizontal scrolling not allowed with wrapping active.";
@@ -623,6 +625,7 @@
     }
     else if (ctx->text.scroll_horiz == XawtextScrollAlways)
       CreateHScrollBar(ctx);
+  } 
 }
 
 static void 
--- ThreeD.c
+++ ThreeD.c
@@ -38,6 +38,7 @@
 #include <X11/IntrinsicP.h>
 #include <X11/Xaw3d/XawInit.h>
 #include <X11/Xaw3d/ThreeDP.h>
+#include <X11/Xmu/CharSet.h>
 #include <X11/Xosdefs.h>
 
 /* Initialization of defaults */
--- Tip.c
+++ Tip.c
@@ -34,6 +34,7 @@
 
 /* $XFree86: xc/lib/Xaw/Tip.c,v 1.5 2000/05/18 16:29:53 dawes Exp $ */
 
+#include <stdlib.h>
 #include "Xaw3dP.h"
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
--- Xaw3dP.c
+++ Xaw3dP.c
@@ -78,7 +78,7 @@
     Display *dpy;
     XpmImage image;
     XpmAttributes attr;
-    XpmColor *src_table, *dst_table;
+    XpmColor *src_table = NULL, *dst_table;
     int i, j, index = -1;
 
     if (pm == None)
--- XawI18n.h
+++ XawI18n.h
@@ -27,6 +27,13 @@
 
 ********************************************************/
 
+#ifdef __linux__
+#define HAS_WCHAR_H	1
+#define HAS_WCTYPE_H	1
+#define HAS_ISW_FUNCS	1
+#define NO_WIDEC_H	1
+#endif
+
 #ifdef HAS_WCTYPE_H
 #include <wctype.h>
 #ifndef NO_WIDEC_H
--- laylex.l
+++ laylex.l
@@ -86,12 +86,14 @@
     return i;
 }
 
+void
 yysetsource(s)
     char    *s;
 {
     yysourcebase = yysource = s;
 }
 
+void
 yyerror(s)
     char    *s;
 {

Places

File Xaw3d-1.5E.dif of Package xaw3d (Revision 426454c25845f0eb15ce047a1e4dc874)

Places