Index: gnome1.2/gnumeric-0.54/ltconfig diff -c gnome1.2/gnumeric-0.54/ltconfig:1.1 gnome1.2/gnumeric-0.54/ltconfig:1.2 *** gnome1.2/gnumeric-0.54/ltconfig:1.1 Mon Jun 12 16:56:59 2000 --- gnome1.2/gnumeric-0.54/ltconfig Tue Aug 29 11:25:15 2000 *************** *** 696,702 **** else # PORTME Check for PIC flags for the system compiler. case "$host_os" in ! aix3* | aix4*) # All AIX code is PIC. link_static_flag='-bnso -bI:/lib/syscalls.exp' ;; --- 696,702 ---- else # PORTME Check for PIC flags for the system compiler. case "$host_os" in ! aix3* | aix4* | aix5*) # All AIX code is PIC. link_static_flag='-bnso -bI:/lib/syscalls.exp' ;; *************** *** 1115,1121 **** # See if GNU ld supports shared libraries. case "$host_os" in ! aix3* | aix4*) # On AIX, the GNU linker is very broken ld_shlibs=no cat <&2 --- 1115,1121 ---- # See if GNU ld supports shared libraries. case "$host_os" in ! aix3* | aix4* | aix5*) # On AIX, the GNU linker is very broken ld_shlibs=no cat <&2 *************** *** 1270,1308 **** fi ;; ! aix4*) ! hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib' ! hardcode_libdir_separator=':' ! if test "$with_gcc" = yes; then ! collect2name=`${CC} -print-prog-name=collect2` ! if test -f "$collect2name" && \ ! strings "$collect2name" | grep resolve_lib_name >/dev/null ! then ! # We have reworked collect2 ! hardcode_direct=yes else ! # We have old collect2 ! hardcode_direct=unsupported ! # It fails to find uninstalled libraries when the uninstalled ! # path is not listed in the libpath. Setting hardcode_minus_L ! # to unsupported forces relinking ! hardcode_minus_L=yes ! hardcode_libdir_flag_spec='-L$libdir' ! hardcode_libdir_separator= fi ! shared_flag='-shared' else ! shared_flag='${wl}-bM:SRE' ! hardcode_direct=yes fi ! allow_undefined_flag=' ${wl}-berok' ! archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' ! archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' ! case "$host_os" in aix4.[01]|aix4.[01].*) ! # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on ! always_export_symbols=yes ;; ! esac ! ;; amigaos*) archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)' --- 1270,1349 ---- fi ;; ! aix4* | aix5*) ! # First test if we are trying to use run time linking, or normal AIX style linking. ! # If -brtl is somewhere in LDFLAGS, we need to do run time linking. ! aix_use_runtimelinking=no ! for ld_flag in $LDFLAGS; do ! if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then ! aix_use_runtimelinking=yes ! break ! fi ! done ! if test "$aix_use_runtimelinking" = yes; then ! hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' ! hardcode_libdir_separator=':' ! if test "$with_gcc" = yes; then ! collect2name=`${CC} -print-prog-name=collect2` ! if test -f "$collect2name" && \ ! strings "$collect2name" | grep resolve_lib_name >/dev/null ! then ! # We have reworked collect2 ! hardcode_direct=yes ! else ! # We have old collect2 ! hardcode_direct=unsupported ! # It fails to find uninstalled libraries when the uninstalled ! # path is not listed in the libpath. Setting hardcode_minus_L ! # to unsupported forces relinking ! hardcode_minus_L=yes ! hardcode_libdir_flag_spec='-L$libdir' ! hardcode_libdir_separator= ! fi ! shared_flag='-shared' else ! shared_flag='${wl}-bM:SRE' ! hardcode_direct=yes fi ! allow_undefined_flag=' -Wl,-G' ! archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bnoentry${allow_undefined_flag}' ! # It seems that -bexpall can do strange things, so it is better to ! # generate a list of symbols to export. ! always_export_symbols=yes ! archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' else ! hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' ! hardcode_libdir_separator=':' ! if test "$with_gcc" = yes; then ! collect2name=`${CC} -print-prog-name=collect2` ! if test -f "$collect2name" && \ ! strings "$collect2name" | grep resolve_lib_name >/dev/null ! then ! # We have reworked collect2 ! hardcode_direct=yes ! else ! # We have old collect2 ! hardcode_direct=unsupported ! # It fails to find uninstalled libraries when the uninstalled ! # path is not listed in the libpath. Setting hardcode_minus_L ! # to unsupported forces relinking ! hardcode_minus_L=yes ! hardcode_libdir_flag_spec='-L$libdir' ! hardcode_libdir_separator= ! fi ! shared_flag='-shared' ! else ! shared_flag='${wl}-bM:SRE' ! hardcode_direct=yes ! fi ! # Warning - without using the other run time loading flags, -berok will ! # link without error, but may produce a broken library. ! allow_undefined_flag=' ${wl}-berok' ! archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' ! archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' ! always_export_symbols=yes fi ! ;; amigaos*) archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)' *************** *** 1800,1813 **** soname_spec='${libname}${release}.so$major' ;; ! aix4*) version_type=linux # AIX has no versioning support, so currently we can not hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. ! # We preserve .a as extension for shared libraries though AIX4.2 ! # and later linker supports .so ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a' shlibpath_var=LIBPATH deplibs_check_method=pass_all ;; --- 1841,1860 ---- soname_spec='${libname}${release}.so$major' ;; ! aix4* | aix5*) version_type=linux # AIX has no versioning support, so currently we can not hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. ! if test "$aix_use_runtimelinking" = yes; then ! # If using run time linking (on AIX 4.2 or later) use lib.so instead of ! # lib.a to let people know that these are not typical AIX shared libraries. ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' ! else ! # We preserve .a as extension for shared libraries though AIX4.2 ! # and later linker supports .so ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a' ! fi shlibpath_var=LIBPATH deplibs_check_method=pass_all ;; Index: gnome1.2/gnumeric-0.54/plugins/excel/ms-escher.c diff -c gnome1.2/gnumeric-0.54/plugins/excel/ms-escher.c:1.1 gnome1.2/gnumeric-0.54/plugins/excel/ms-escher.c:1.2 *** gnome1.2/gnumeric-0.54/plugins/excel/ms-escher.c:1.1 Mon Jun 12 16:57:07 2000 --- gnome1.2/gnumeric-0.54/plugins/excel/ms-escher.c Tue Aug 29 11:26:43 2000 *************** *** 782,788 **** shape_LinesClosed = 1, /* closed polygonal shape */ shape_Curves = 2, /* Bezier curve segments */ shape_CurvesClosed = 3, /* A closed shape with curved edges */ ! shape_Complex = 4, /* pSegmentInfo must be non-empty */ } ShapePath; typedef enum --- 782,788 ---- shape_LinesClosed = 1, /* closed polygonal shape */ shape_Curves = 2, /* Bezier curve segments */ shape_CurvesClosed = 3, /* A closed shape with curved edges */ ! shape_Complex = 4 /* pSegmentInfo must be non-empty */ } ShapePath; typedef enum *************** *** 791,797 **** wrap_ByPoints = 1, wrap_None = 2, wrap_TopBottom = 3, ! wrap_Through = 4, } WrapMode; typedef enum --- 791,797 ---- wrap_ByPoints = 1, wrap_None = 2, wrap_TopBottom = 3, ! wrap_Through = 4 } WrapMode; typedef enum *************** *** 806,812 **** bw_HighContrast = 7, /* pure black and white mode (no grays) */ bw_Black = 7, /* solid black */ bw_White = 8, /* solid white */ ! bw_DontShow = 9, /* object not drawn */ } BlackWhiteMode; typedef enum --- 806,812 ---- bw_HighContrast = 7, /* pure black and white mode (no grays) */ bw_Black = 7, /* solid black */ bw_White = 8, /* solid white */ ! bw_DontShow = 9 /* object not drawn */ } BlackWhiteMode; typedef enum *************** *** 846,859 **** flow_BtoT = 2, /* Bottom to Top non-@ */ flow_TtoBN = 3, /* Top to Bottom non-@ */ flow_HorzA = 4, /* Horizontal @-font */ ! flow_VertN = 5, /* Vertical, non-@ */ } TextFlow; typedef enum { textdir_LtoR = 0, textdir_RtoL = 1, ! textdir_Context = 2, /* depends on context */ } TextDirection; typedef enum --- 846,859 ---- flow_BtoT = 2, /* Bottom to Top non-@ */ flow_TtoBN = 3, /* Top to Bottom non-@ */ flow_HorzA = 4, /* Horizontal @-font */ ! flow_VertN = 5 /* Vertical, non-@ */ } TextFlow; typedef enum { textdir_LtoR = 0, textdir_RtoL = 1, ! textdir_Context = 2 /* depends on context */ } TextDirection; typedef enum *************** *** 861,867 **** callout_RightAngle = 1, callout_OneSegment = 2, callout_TwoSegment = 3, ! callout_ThreeSegment = 4, } CalloutType; typedef enum --- 861,867 ---- callout_RightAngle = 1, callout_OneSegment = 2, callout_TwoSegment = 3, ! callout_ThreeSegment = 4 } CalloutType; typedef enum *************** *** 879,885 **** callout_drop_Top = 0, callout_drop_Center = 1, callout_drop_Bottom = 2, ! callout_drop_Specified = 3, } CalloutDrop; /* Alignment - WordArt only */ --- 879,885 ---- callout_drop_Top = 0, callout_drop_Center = 1, callout_drop_Bottom = 2, ! callout_drop_Specified = 3 } CalloutDrop; /* Alignment - WordArt only */ *************** *** 898,904 **** { render_FullRender, render_Wireframe, ! render_BoundingCube, } RenderMode; typedef enum --- 898,904 ---- { render_FullRender, render_Wireframe, ! render_BoundingCube } RenderMode; typedef enum *************** *** 915,921 **** shadow_Rich, /* Rich perspective shadow (cast relative to shape) */ shadow_Shape, /* Rich perspective shadow (cast in shape space) */ shadow_Drawing, /* Perspective shadow cast in drawing space */ ! shadow_EmbossOrEngrave, } Shadow; /* LengthMeasure - the type of a (length) measurement */ --- 915,921 ---- shadow_Rich, /* Rich perspective shadow (cast relative to shape) */ shadow_Shape, /* Rich perspective shadow (cast in shape space) */ shadow_Drawing, /* Perspective shadow cast in drawing space */ ! shadow_EmbossOrEngrave } Shadow; /* LengthMeasure - the type of a (length) measurement */ *************** *** 932,938 **** measure_FixedAspectEnlarge = 8, /* Aspect ratio is fixed, favor larger size */ measure_AFixedBig = 9, /* EMUs, fixed aspect ratio */ measure_VFixedBig = 10, /* Pixels, fixed aspect ratio */ ! measure_ShapeFixedBig= 11, /* Proportion of shape, fixed aspect ratio */ } LengthMeasure; typedef enum --- 932,938 ---- measure_FixedAspectEnlarge = 8, /* Aspect ratio is fixed, favor larger size */ measure_AFixedBig = 9, /* EMUs, fixed aspect ratio */ measure_VFixedBig = 10, /* Pixels, fixed aspect ratio */ ! measure_ShapeFixedBig= 11 /* Proportion of shape, fixed aspect ratio */ } LengthMeasure; typedef enum *************** *** 964,970 **** * The Sigma shade style seems to hard code that to be 0x4000 ?? */ shade_ParamShift = 16, ! shade_ParamMask = 0xffff0000, shade_Default = (shade_Gamma|shade_Sigma|(0x4000<