diff --git a/0001-dx-rpm.patch b/0001-dx-rpm.patch new file mode 100644 index 0000000..b2eff91 --- /dev/null +++ b/0001-dx-rpm.patch @@ -0,0 +1,669 @@ +From 999dae915c9c84da77a65ee3f73ef9c03501ee8e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Wed, 17 Feb 2016 15:15:11 +0100 +Subject: [PATCH 1/9] dx-rpm + +--- + bin/Makefile.am | 2 +- + bin/dx.in | 34 ++++++++++++++++----------------- + bin/mdf2c.in | 2 +- + bin/url_handler.sh | 4 ++-- + configure.ac | 18 ++++++++++------- + doc/Makefile.am | 2 +- + fonts/Makefile.am | 2 +- + help/Makefile.am | 6 +++--- + html/Makefile.am | 2 +- + html/images/Makefile.am | 2 +- + html/pages/Makefile.am | 2 +- + include/Makefile.am | 2 +- + include/dx/Makefile.am | 2 +- + lib/Makefile.am | 2 +- + man/Makefile.am | 2 +- + man/manl/Makefile.am | 2 +- + src/exec/Makefile.am | 2 +- + src/exec/dxexec/Makefile.am | 2 +- + src/exec/dxmods/Makefile.am | 5 ++++- + src/exec/dxmods/local.mk.in | 18 ++++++++--------- + src/exec/libdx/Makefile.am | 2 +- + src/exec/libdx/memory.c | 1 - + src/misc/Makefile.am | 4 ++-- + src/uipp/dxl/Makefile.am | 2 +- + src/uipp/dxui/Makefile.am | 2 +- + src/uipp/java/Makefile.am | 6 +++--- + src/uipp/java/server/Makefile.am | 6 +++--- + src/uipp/java/server/macros/Makefile.am | 2 +- + src/uipp/mb/Makefile.am | 2 +- + src/uipp/prompter/Makefile.am | 2 +- + src/uipp/startup/Makefile.am | 2 +- + src/uipp/tutor/Makefile.am | 2 +- + src/uipp/ui/Makefile.am | 2 +- + 33 files changed, 77 insertions(+), 71 deletions(-) + +diff --git a/bin/Makefile.am b/bin/Makefile.am +index 2665806..07112d8 100644 +--- a/bin/Makefile.am ++++ b/bin/Makefile.am +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-dxbindir = $(prefix)/dx/bin ++dxbindir = $(libdir)/dx/bin + bindir = $(prefix)/bin + + EXTRA_SCRIPTS = mdf2c dx +diff --git a/bin/dx.in b/bin/dx.in +index d3c69f7..29c3f6e 100644 +--- a/bin/dx.in ++++ b/bin/dx.in +@@ -60,14 +60,7 @@ exit 1 + # + longhelp() { + +-if test -f "$dxroot/man/catl/dx.l" ; then +- more "$dxroot/man/catl/dx.l" +-else +- echo "cannot find $dxroot/man/catl/dx.l" +- echo "set the DXROOT environment variable to the root of the" +- echo "dx installation tree and try again." +-fi +-exit 1 ++man dx + + cat << EOFlonghelp + command line parameters: +@@ -286,7 +279,7 @@ fi + + + if [ -z "$DXROOT" ]; then +- prefix=@prefix@ ++ prefix=@datadir@ + DXROOT=$prefix/dx + fi + export DXROOT +@@ -298,6 +291,13 @@ if [ -z "$DXDATA" ]; then + fi + fi + ++if [ -z "$DXFONTS" ]; then ++ DXFONTS=$DXROOT/fonts ++ if [ -d "$DXFONTS" ]; then ++ export DXFONTS ++ fi ++fi ++ + # if DXMACROS not set, default it to the usual unless dir doesn't exist + if [ -z "$DXMACROS" ]; then + DXMACROS=$DXROOT/samples/macros +@@ -507,7 +507,7 @@ export DXARCH + + # default to running locally, from @prefix@/dx + exhost=$thishost +-dxroot=@prefix@/dx ++dxroot=@datadir@/dx + startup=1 # run the startup window by default + + +@@ -1469,8 +1469,8 @@ done + + # Now set some needed results + +-dxexroot=$dxroot +-dxuiroot=$dxroot ++dxexroot=@libdir@/dx ++dxuiroot=@libdir@/dx + dxexecdef="$dxexroot/bin_${exarch}/dxexec" + if test -z "$dxexec" ; then + dxexec=$dxexecdef +@@ -1600,7 +1600,7 @@ fi + # + if test $tutor -eq 1 ; then + +- cmd="$DXROOT/bin_${uiarch}/tutor" ++ cmd="$DXEXECROOT/bin_${uiarch}/tutor" + if test $seecomline -eq 1 ; then + set + echo "$echoparms exec $cmd $xparms" +@@ -1619,7 +1619,7 @@ if test $prompter -eq 1 ; then + prompterflags="$prompterflags -file \"$FileName\"" + fi + +- cmd="$DXROOT/bin_${uiarch}/prompter" ++ cmd="$DXEXECROOT/bin_${uiarch}/prompter" + if test $seecomline -eq 1 ; then + set + echo "$echoparms exec $cmd $prompterflags $xparms" +@@ -1635,7 +1635,7 @@ fi + if test $startup -eq 1 ; then + + +- cmd="$DXROOT/bin_${uiarch}/startupui" ++ cmd="$DXEXECROOT/bin_${uiarch}/startupui" + if test $seecomline -eq 1 ; then + set + echo "$echoparms exec $cmd $xparms $*" +@@ -1649,7 +1649,7 @@ fi + # + if test $builder -eq 1 ; then + +- cmd="$DXROOT/bin_${uiarch}/builder" ++ cmd="$DXEXECROOT/bin_${uiarch}/builder" + if test $seecomline -eq 1 ; then + set + echo "exec $cmd $xparms $motifcmd $motifbind $FileName" +@@ -1674,7 +1674,7 @@ if test $encoder -eq 1 ; then + EncodedBase="${Base}-e" + + echo "Creating encoded version of $FileName in ${EncodedBase}.net " +- cmd1="$DXROOT/bin_${uiarch}/dxencode" ++ cmd1="$DXEXECROOT/bin_${uiarch}/dxencode" + if test -f $CfgName ; then + echo "Copying $CfgName to ${EncodedBase}.cfg" + cmd2="cp $CfgName ${EncodedBase}.cfg" +diff --git a/bin/mdf2c.in b/bin/mdf2c.in +index d067a76..5a03397 100644 +--- a/bin/mdf2c.in ++++ b/bin/mdf2c.in +@@ -1,6 +1,6 @@ + #!/bin/sh + # Configure is looking for the following line +-prefix=@prefix@ ++prefix=@datadir@ + DFLTROOT=$prefix/dx + root=${DXROOT=${DXEXECROOT=$DFLTROOT}} + +diff --git a/bin/url_handler.sh b/bin/url_handler.sh +index 3487db3..e71a99a 100755 +--- a/bin/url_handler.sh ++++ b/bin/url_handler.sh +@@ -39,8 +39,8 @@ case $method in + if [ $use_xbrowser = n ]; then + lynx "$url" + else +- netscape -remote "openURL($url)" 2> /dev/null || \ +- (netscape "$url" &) ++ firefox -remote "openURL($url)" 2> /dev/null || \ ++ (firefox "$url" &) + fi + ;; + esac +diff --git a/configure.ac b/configure.ac +index 15ff3ff..abaa1b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -218,6 +218,7 @@ AC_DEFINE_UNQUOTED(BSH, "$bsh_path", [Path to the system's Bourne shell.]) + dnl End of command line options configuration + + dnl Start DX configuration ++AC_PROG_CXX + AC_LANG([C++]) + AC_CHECK_HEADERS(stdlib.h) + AC_LANG([C]) +@@ -677,7 +678,7 @@ if test "$ARCH" = "intelnt" ; then + fi + dnl -- check for unix + else +- AC_CHECK_LIB(df,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[ -lz -ljpeg ]) ++ AC_CHECK_LIB(df,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[ -lz -ljpeg -L$libdir/hdf ]) + AC_MSG_CHECKING(if HDF package is complete) + if test $passed -gt 0 + then +@@ -686,7 +687,7 @@ else + AC_MSG_RESULT(no -- some components failed test) + have_hdf='no (failed tests)' + else +- LIB_HDF='-ldf' ++ LIB_HDF="-ldf -L$libdir/hdf" + LIBS="$LIB_HDF $LIBS" + FMT_LIBS="$FMT_LIBS libdf.a" + AC_DEFINE(HAVE_LIBDF, 1, [Define to 1 if you have the HDF libraries]) +@@ -801,6 +802,9 @@ then + + failed=0; + passed=0; ++ CFLAGS="$CFLAGS -I/usr/include/ImageMagick" ++ CXXFLAGS="$CXXFLAGS -I/usr/include/ImageMagick" ++ CPPFLAGS="$CPPFLAGS -I/usr/include/ImageMagick" + AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) + if test "$ARCH" = "intelnt" ; then + AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) +@@ -835,8 +839,8 @@ dnl routine. This allows us to simplify the configuration of all the + dnl format configuration libraries. + + if test "$HAVE_MC" = "yes" ; then +- LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`" +- AC_CHECK_LIB( Magick,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ]) ++ LIB_MAGICK="`MagickCore-config --ldflags` `MagickCore-config --libs`" ++ AC_CHECK_LIB(MagickCore,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ]) + AC_MSG_CHECKING(if ImageMagick package is complete) + if test $passed -gt 0 + then +@@ -846,8 +850,8 @@ dnl format configuration libraries. + have_magick='no (failed tests)' + else + dnl CFLAGS="`Magick-config --cflags` $CFLAGS" +- CPPFLAGS="`Magick-config --cppflags` $CPPFLAGS" +- LIB_MAGICK="$LIBS `Magick-config --ldflags` `Magick-config --libs`" ++ CPPFLAGS="`MagickCore-config --cppflags` $CPPFLAGS" ++ LIB_MAGICK="$LIBS `MagickCore-config --ldflags` `MagickCore-config --libs`" + dnl UNIQUIFY will remove duplicate library tokens leaving the last instance. + AC_UTILS_UNIQUIFY($LIB_MAGICK, LIBS) + FMT_LIBS="$FMT_LIBS libMagick.a" +@@ -1011,7 +1015,7 @@ DX_CHECK_HEADERS( \ + Xm/ScrolledWP.h Xm/SelectioB.h Xm/SeparatoG.h Xm/SeparatoGP.h Xm/Separator.h \ + Xm/Text.h Xm/TextF.h Xm/ToggleB.h Xm/ToggleBG.h Xm/Xm.h Xm/XmP.h Xm/XmStrDefs.h \ + gl.h gl/device.h gl/gl.h invent.h iop/afb.h iop/mov.h iop/pfs.h license.h \ +- linux/kernel.h linux/sys.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \ ++ linux/kernel.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \ + os2.h setjmp.h starbase.c.h stddef.h stdio.h synch.h sys/access.h \ + sys/ipc.h sys/m88kbcs.h sys/mman.h sys/mode.h sys/pstat.h sys/resource.h \ + sys/svs.h sys/sysconfig.h sys/syslimits.h sys/sysmacros.h ulocks.h x11/xlibxtra.h \ +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 09838e8..31f3fe8 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-docdir = $(prefix)/dx/doc ++docdir = $(datadir)/dx/doc + + doc_DATA = \ + README README_SMP README_alphax README_aviion README_hp700 \ +diff --git a/fonts/Makefile.am b/fonts/Makefile.am +index 9055aa4..128cad4 100644 +--- a/fonts/Makefile.am ++++ b/fonts/Makefile.am +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-fontdir = $(prefix)/dx/fonts ++fontdir = $(datadir)/dx/fonts + + font_DATA = \ + README area.dx cyril_d.dx \ +diff --git a/help/Makefile.am b/help/Makefile.am +index 7feff54..3aae993 100644 +--- a/help/Makefile.am ++++ b/help/Makefile.am +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-helpdir = $(prefix)/dx/help ++helpdir = $(datadir)/dx/help + + EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5) \ + $(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10) \ +@@ -257,7 +257,7 @@ install-data-hook: + $(LN_S) hlpalhtl svsmstrh ; \ + $(LN_S) hlpalhtl ugidx ; \ + $(LN_S) hlpalhtl usrefidx ; \ +- $(LN_S) HelpDir GarHelpDir ; \ ++ $(LN_S) HelpDir GARHelpDir ; \ + $(LN_S) HelpDir MBHelpDir ; \ + echo "cd $(DESTDIR)$(helpdir)" ; \ + echo "$(LN_S) hlpalhtl mbidx" ; \ +@@ -265,6 +265,6 @@ install-data-hook: + echo "$(LN_S) hlpalhtl svsmstrh" ; \ + echo "$(LN_S) hlpalhtl ugidx" ; \ + echo "$(LN_S) hlpalhtl usrefidx" ; \ +- echo "$(LN_S) HelpDir GarHelpDir" ; \ ++ echo "$(LN_S) HelpDir GARHelpDir" ; \ + echo "$(LN_S) HelpDir MBHelpDir" ) \ + ' +diff --git a/html/Makefile.am b/html/Makefile.am +index 7e9b3e8..a2352e9 100644 +--- a/html/Makefile.am ++++ b/html/Makefile.am +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-htmldir = $(prefix)/dx/html ++htmldir = $(datadir)/dx/html + + SUBDIRS = pages images + +diff --git a/html/images/Makefile.am b/html/images/Makefile.am +index c34245f..9ad03e5 100644 +--- a/html/images/Makefile.am ++++ b/html/images/Makefile.am +@@ -1,5 +1,5 @@ + +-imagesdir = $(prefix)/dx/html/images ++imagesdir = $(datadir)/dx/html/images + + images1 = \ + 3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif \ +diff --git a/html/pages/Makefile.am b/html/pages/Makefile.am +index 4487d39..49b2bd3 100644 +--- a/html/pages/Makefile.am ++++ b/html/pages/Makefile.am +@@ -1,4 +1,4 @@ +-pagesdir = $(prefix)/dx/html/pages ++pagesdir = $(datadir)/dx/html/pages + + pages1 = \ + insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \ +diff --git a/include/Makefile.am b/include/Makefile.am +index ec87339..04771c3 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -1,4 +1,4 @@ +-dxincdir = $(prefix)/dx/include ++dxincdir = $(prefix)/include + SUBDIRS = dx + dxinc_HEADERS = dxl.h dxstereo.h + nodist_dxinc_HEADERS = dxconfig.h +diff --git a/include/dx/Makefile.am b/include/dx/Makefile.am +index 45ebd6a..fc93323 100644 +--- a/include/dx/Makefile.am ++++ b/include/dx/Makefile.am +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-dxincdir = $(prefix)/dx/include/dx ++dxincdir = $(prefix)/include/dx + + dxinc_HEADERS = \ + UserInteractors.h advanced.h arch.h array.h arrayhandles.h \ +diff --git a/lib/Makefile.am b/lib/Makefile.am +index fba0cd7..e34c871 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -1,4 +1,4 @@ +-libsdir = $(prefix)/dx/lib ++libsdir = $(datadir)/dx/lib + + libs_DATA = colors.txt dxexec.def dxexec.exp dxexec.imp dxexec.ifs \ + dxfSaveCurrentImage.net dxrc mdf2c.awk messages outboard.c +diff --git a/man/Makefile.am b/man/Makefile.am +index 3ec572e..08d8a83 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -1,4 +1,4 @@ + ## Process this file with automake to produce Makefile.in + +-SUBDIRS = manl catl ++SUBDIRS = manl + +diff --git a/man/manl/Makefile.am b/man/manl/Makefile.am +index b73bdb0..30cadc3 100644 +--- a/man/manl/Makefile.am ++++ b/man/manl/Makefile.am +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-mandir = $(prefix)/dx/man ++mandir = $(datadir)/man + + man_MANS = dx.l + EXTRA_DIST = $(man_MANS) +diff --git a/src/exec/Makefile.am b/src/exec/Makefile.am +index 26812d9..438a6fd 100644 +--- a/src/exec/Makefile.am ++++ b/src/exec/Makefile.am +@@ -1,6 +1,6 @@ + SUBDIRS = libdx dxmods hwrender dpexec dxexec + +-dxlibdir = $(prefix)/dx/lib_@ARCH@ ++dxlibdir = $(libdir) + + MAJOR_VERSION=@MAJOR_VERSION@ + MINOR_VERSION=@MINOR_VERSION@ +diff --git a/src/exec/dxexec/Makefile.am b/src/exec/dxexec/Makefile.am +index 17b7c4b..9bc4260 100644 +--- a/src/exec/dxexec/Makefile.am ++++ b/src/exec/dxexec/Makefile.am +@@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libDXEXEC.la + libDXEXEC_la_SOURCES = main.c + libDXEXEC_la_CFLAGS = $(AM_CFLAGS) + +-bindir = $(prefix)/dx/bin_@ARCH@ ++bindir = $(libdir)/dx/bin_@ARCH@ + bin_PROGRAMS = dxexec + + dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \ +diff --git a/src/exec/dxmods/Makefile.am b/src/exec/dxmods/Makefile.am +index bafde53..4296a2c 100644 +--- a/src/exec/dxmods/Makefile.am ++++ b/src/exec/dxmods/Makefile.am +@@ -1,8 +1,9 @@ + ## Process this file with automake to produce Makefile.in + + INCLUDES = -I${top_srcdir}/include -I${srcdir}/../dpexec -I$(BUILDBASE)/include -D@ARCH@ ++INCLUDES+= -I/usr/include/netcdf + +-dxmdfdir = $(prefix)/dx/lib ++dxmdfdir = $(datadir)/dx/lib + noinst_LTLIBRARIES = libDXMODS.la libusercm.la libuser.la libDXMODSN.la + SUFFIXES = .c .y .c .s .h .o + +@@ -13,6 +14,8 @@ DISTCLEANFILES = dx.mdf dxcm.mdf user.c usercm.c tmp.c + + dxmdf_DATA = dx.mdf + ++user.c: dx.mdf ++ + _complex.o: _compparse.h + + HEADERS1 = \ +diff --git a/src/exec/dxmods/local.mk.in b/src/exec/dxmods/local.mk.in +index 82da029..aa7b1a5 100644 +--- a/src/exec/dxmods/local.mk.in ++++ b/src/exec/dxmods/local.mk.in +@@ -14,23 +14,23 @@ user.c: dx.mdf + + dxcm.mdf: ${srcdir}/dxmdf.src + -rm -f dxcm.mdf +- cp ${srcdir}/dxmdf.src tmp.c +- $(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp.c > dxcm.mdf +- -rm -f tmp.c ++ cp ${srcdir}/dxmdf.src dxcm.tmp.c ++ $(CPP) $(INCLUDES) $(MDF) $(DEFS) dxcm.tmp.c > dxcm.mdf ++ -rm -f dxcm.tmp.c + + dx.mdf: ${srcdir}/dxmdf.src + echo MYINC: $(MYINC) + -rm -f dx.mdf +- cp ${srcdir}/dxmdf.src tmp.c +- $(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp.c > dx.mdf ++ cp ${srcdir}/dxmdf.src dx.tmp.c ++ $(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS dx.tmp.c > dx.mdf + @echo '/^ *$$/{' > stripl.sed + @echo 'N' >> stripl.sed + @echo '/^ *\\n *$$/D' >> stripl.sed + @echo '}' >> stripl.sed +- cat dx.mdf |sed '/^#/d' > tmp.mdf +- cat tmp.mdf |sed -f stripl.sed > dx.mdf +- @rm -f stripl.sed tmp.mdf +- -rm -f tmp.c ++ cat dx.mdf |sed '/^#/d' > dx.tmp.mdf ++ cat dx.tmp.mdf |sed -f stripl.sed > dx.mdf ++ @rm -f stripl.sed dx.tmp.mdf ++ -rm -f dx.tmp.c + + .y.h: + $(YACC) $(YFLAGS) -d ${srcdir}/$*.y +diff --git a/src/exec/libdx/Makefile.am b/src/exec/libdx/Makefile.am +index 354fb78..c38551d 100644 +--- a/src/exec/libdx/Makefile.am ++++ b/src/exec/libdx/Makefile.am +@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@ + #INCLUDES = -I../../../include -D@ARCH@ + INCLUDES = -I${top_srcdir}/include -D@ARCH@ + +-dxlibdir = $(prefix)/dx/lib_@ARCH@ ++dxlibdir = $(libdir) + + noinst_LTLIBRARIES = libLIBDX.la libcallm.la libmem.la + #dxlib_LIBRARIES = libDXlite.a +diff --git a/src/exec/libdx/memory.c b/src/exec/libdx/memory.c +index caa3281..918ad58 100644 +--- a/src/exec/libdx/memory.c ++++ b/src/exec/libdx/memory.c +@@ -66,7 +66,6 @@ + + #if linux + #include +-#include + #include + #endif + +diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am +index 5955165..6c12dac 100644 +--- a/src/misc/Makefile.am ++++ b/src/misc/Makefile.am +@@ -4,7 +4,7 @@ INCLUDES = -I${top_srcdir}/include -D@ARCH@ + + dxbindir = $(prefix)/bin + noinst_PROGRAMS = dxlocal +-archmakdir = $(prefix)/dx/lib_$(ARCH) ++archmakdir = $(libdir) + archmak_DATA = arch.mak + + dxlocal_SOURCES = dx.c utils.c +@@ -15,5 +15,5 @@ install-exec-local: + if test ! -z "@INSTALL_BIN_PROGRAM@" ; then \ + $(mkinstalldirs) $(prefix)/bin ; \ + $(INSTALL) dxlocal@EXEEXT@ \ +- $(prefix)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \ ++ $(libdir)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \ + fi +diff --git a/src/uipp/dxl/Makefile.am b/src/uipp/dxl/Makefile.am +index a8cf233..5dc1d35 100644 +--- a/src/uipp/dxl/Makefile.am ++++ b/src/uipp/dxl/Makefile.am +@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@ + + INCLUDES = -I${top_srcdir}/include -D@ARCH@ + +-dxlibdir = $(prefix)/dx/lib_@ARCH@ ++dxlibdir = $(libdir) + + noinst_HEADERS = \ + dxlP.h \ +diff --git a/src/uipp/dxui/Makefile.am b/src/uipp/dxui/Makefile.am +index 5247cb0..d4f3936 100644 +--- a/src/uipp/dxui/Makefile.am ++++ b/src/uipp/dxui/Makefile.am +@@ -2,7 +2,7 @@ + + INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D@ARCH@ + +-dxbindir = $(prefix)/dx/bin_@ARCH@ ++dxbindir = $(libdir)/dx/bin_@ARCH@ + dxbin_PROGRAMS = dxui + + +diff --git a/src/uipp/java/Makefile.am b/src/uipp/java/Makefile.am +index d4627d4..a6d039f 100644 +--- a/src/uipp/java/Makefile.am ++++ b/src/uipp/java/Makefile.am +@@ -27,12 +27,12 @@ + ## libtool and the -shrext flag to make this much more + ## portable. + +-javadxdir = $(prefix)/dx/java/htmlpages ++javadxdir = $(libdir)/dx/java/htmlpages + javadx_DATA = dx.jar +-javasrvdir = $(prefix)/dx/java/server/class ++javasrvdir = $(libdir)/dx/java/server/class + javasrv_DATA = server.jar + EXTRA_DIST = $(DX_SRCS) DXServer.java makeall.java makewrl.java exports.awk README +-javalibdir = $(prefix)/dx/java/server/lib_@ARCH@ ++javalibdir = $(libdir)/dx/java/server/lib_@ARCH@ + + javalib_DATA = @ANYDX@ + SUBDIRS = server dx layout +diff --git a/src/uipp/java/server/Makefile.am b/src/uipp/java/server/Makefile.am +index 24d5d67..6389206 100644 +--- a/src/uipp/java/server/Makefile.am ++++ b/src/uipp/java/server/Makefile.am +@@ -1,6 +1,6 @@ +-srvbindir = $(prefix)/dx/java/server/bin +-srvoutputdir = $(prefix)/dx/java/output +-userhtmldir = $(prefix)/dx/java/user ++srvbindir = $(libdir)/dx/java/server/bin ++srvoutputdir = $(libdir)/dx/java/output ++userhtmldir = $(libdir)/dx/java/user + # the server script (in srvbindir) will actually cd and run from the class subdir so that java will find the classes + # the server will expect to find a file dxserver.paths there to tell the exec where to find .net files + srvrundir = $(srvbindir)/../class +diff --git a/src/uipp/java/server/macros/Makefile.am b/src/uipp/java/server/macros/Makefile.am +index ac6f36e..829c18a 100644 +--- a/src/uipp/java/server/macros/Makefile.am ++++ b/src/uipp/java/server/macros/Makefile.am +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-serverdatadir = $(prefix)/dx/java/server/dxmacros ++serverdatadir = $(libdir)/dx/java/server/dxmacros + + serverdata_DATA = $(MACRO_FILES) + +diff --git a/src/uipp/mb/Makefile.am b/src/uipp/mb/Makefile.am +index d15de19..074908d 100644 +--- a/src/uipp/mb/Makefile.am ++++ b/src/uipp/mb/Makefile.am +@@ -2,7 +2,7 @@ + + INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D@ARCH@ + +-dxbindir = $(prefix)/dx/bin_@ARCH@ ++dxbindir = $(libdir)/dx/bin_@ARCH@ + + dxbin_PROGRAMS = builder + +diff --git a/src/uipp/prompter/Makefile.am b/src/uipp/prompter/Makefile.am +index aabbd69..b5aad8e 100644 +--- a/src/uipp/prompter/Makefile.am ++++ b/src/uipp/prompter/Makefile.am +@@ -2,7 +2,7 @@ + + INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -D@ARCH@ + +-dxbindir = $(prefix)/dx/bin_@ARCH@ ++dxbindir = $(libdir)/dx/bin_@ARCH@ + + dxbin_PROGRAMS = prompter + +diff --git a/src/uipp/startup/Makefile.am b/src/uipp/startup/Makefile.am +index b7c3a6a..e830dbd 100644 +--- a/src/uipp/startup/Makefile.am ++++ b/src/uipp/startup/Makefile.am +@@ -2,7 +2,7 @@ + + INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@ + +-dxbindir = $(prefix)/dx/bin_@ARCH@ ++dxbindir = $(libdir)/dx/bin_@ARCH@ + + dxbin_PROGRAMS = startupui + +diff --git a/src/uipp/tutor/Makefile.am b/src/uipp/tutor/Makefile.am +index 814de81..610462c 100644 +--- a/src/uipp/tutor/Makefile.am ++++ b/src/uipp/tutor/Makefile.am +@@ -2,7 +2,7 @@ + + INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@ + +-dxbindir = $(prefix)/dx/bin_@ARCH@ ++dxbindir = $(libdir)/dx/bin_@ARCH@ + + dxbin_PROGRAMS = tutor + +diff --git a/src/uipp/ui/Makefile.am b/src/uipp/ui/Makefile.am +index 7a8c0c1..2bf25e5 100644 +--- a/src/uipp/ui/Makefile.am ++++ b/src/uipp/ui/Makefile.am +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-uidatadir = $(prefix)/dx/ui ++uidatadir = $(datadir)/dx/ui + + DATA1 = \ + icon50.dat icon50.xpm logo.dat logo.xpm ui.mdf Basic2D.cfg Basic2D.net \ +-- +2.9.3 + diff --git a/0002-dx-open.patch b/0002-dx-open.patch new file mode 100644 index 0000000..2443d2c --- /dev/null +++ b/0002-dx-open.patch @@ -0,0 +1,49 @@ +From 9899fde036fe708a9e73fea144ec2828a6158d11 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Wed, 17 Feb 2016 15:15:34 +0100 +Subject: [PATCH 2/9] dx-open + +--- + src/exec/libdx/fileio.c | 2 +- + src/exec/libdx/plock.c | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/exec/libdx/fileio.c b/src/exec/libdx/fileio.c +index 36a4560..c83e8e2 100644 +--- a/src/exec/libdx/fileio.c ++++ b/src/exec/libdx/fileio.c +@@ -263,7 +263,7 @@ Error _dxffile_open(char *name, int rw) + case 2:/* read/write */ + fd = open(name, O_RDWR); + if (fd < 0) { +- fd = open(name, O_WRONLY | O_CREAT); ++ fd = open(name, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); + if (fd < 0) { + DXSetError(ERROR_DATA_INVALID, + "can't open/create file '%s'", name); +diff --git a/src/exec/libdx/plock.c b/src/exec/libdx/plock.c +index 90b6946..ee093f1 100644 +--- a/src/exec/libdx/plock.c ++++ b/src/exec/libdx/plock.c +@@ -37,7 +37,8 @@ struct seminfo *__buf; /* buffer for IPC_INFO */ + + #define SEM_FLAGS (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) + #define SHM_FLAGS (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) +-#define OPEN_FLAGS (O_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) ++#define OPEN_FLAGS (O_CREAT) ++#define OPEN_MODE (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) + #define IS_MINE(a) (locks->_owner[a] == getpid()) + #define SET_OWNER(a) (locks->_owner[a] = getpid()) + #define CLEAR_OWNER(a) (locks->_owner[a] = 0) +@@ -268,7 +269,7 @@ PLockInit() + + if (stat(LOCKFILE, &statbuf)) + { +- int fd = open(LOCKFILE, OPEN_FLAGS); ++ int fd = open(LOCKFILE, OPEN_FLAGS, OPEN_MODE); + if (fd < 0) + { + fprintf(stderr, "initLocks: error accessing locks shared block: open\n"); +-- +2.9.3 + diff --git a/0003-dx-gcc43.patch b/0003-dx-gcc43.patch new file mode 100644 index 0000000..a5d0552 --- /dev/null +++ b/0003-dx-gcc43.patch @@ -0,0 +1,366 @@ +From f68dee5c09b382ad1eeb32833a0e6ec1a5ec7b85 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Wed, 17 Feb 2016 15:15:48 +0100 +Subject: [PATCH 3/9] dx-gcc43 + +--- + src/uipp/base/Application.C | 8 ++++---- + src/uipp/base/Application.h | 8 ++++---- + src/uipp/base/IBMApplication.C | 4 ++-- + src/uipp/base/IBMApplication.h | 4 ++-- + src/uipp/dxui/Main.C | 2 +- + src/uipp/dxuilib/DXApplication.C | 2 +- + src/uipp/dxuilib/DXApplication.h | 2 +- + src/uipp/mb/MBApplication.C | 2 +- + src/uipp/mb/MBApplication.h | 2 +- + src/uipp/mb/Main.C | 2 +- + src/uipp/prompter/GARApplication.C | 2 +- + src/uipp/prompter/GARApplication.h | 2 +- + src/uipp/prompter/Main.C | 2 +- + src/uipp/startup/Main.C | 2 +- + src/uipp/startup/StartupApplication.C | 2 +- + src/uipp/startup/StartupApplication.h | 2 +- + src/uipp/tutor/Main.C | 2 +- + src/uipp/tutor/TutorApplication.C | 2 +- + src/uipp/tutor/TutorApplication.h | 2 +- + src/uipp/widgets/MultiText.h | 4 ++-- + 20 files changed, 29 insertions(+), 29 deletions(-) + +diff --git a/src/uipp/base/Application.C b/src/uipp/base/Application.C +index d103e55..6162890 100644 +--- a/src/uipp/base/Application.C ++++ b/src/uipp/base/Application.C +@@ -136,7 +136,7 @@ void Application::installDefaultResources(Widget baseWidget) + //this->setDefaultResources(baseWidget, Application::DefaultResources); + } + +-boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv) ++boolean Application::initializeWindowSystem(int *argcp, char **argv) + { + + // +@@ -149,7 +149,7 @@ boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv) + NULL, // command line options table + 0, // number of entries in options table + #if XtSpecificationRelease > 4 +- (int*)argcp, ++ argcp, + #else + argcp, + #endif +@@ -235,7 +235,7 @@ boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv) + return TRUE; + } + +-void Application::parseCommand(unsigned int* argcp, char** argv, ++void Application::parseCommand(int* argcp, char** argv, + XrmOptionDescList optlist, int optlistsize) + { + char res_file[256]; +@@ -280,7 +280,7 @@ void Application::parseCommand(unsigned int* argcp, char** argv, + // + } + +-boolean Application::initialize(unsigned int* argcp, char** argv) ++boolean Application::initialize(int* argcp, char** argv) + { + // + // Initialize the window system if not done already. +diff --git a/src/uipp/base/Application.h b/src/uipp/base/Application.h +index 527b2fc..328abef 100644 +--- a/src/uipp/base/Application.h ++++ b/src/uipp/base/Application.h +@@ -49,7 +49,7 @@ class Application : public UIComponent, public Server + // + // The main program needs to access protected member functions. + // +- friend int main(unsigned int argc, ++ friend int main( int argc, + char** argv); + + +@@ -71,9 +71,9 @@ class Application : public UIComponent, public Server + // + // Initialize the window system. + // +- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv); ++ virtual boolean initializeWindowSystem(int *argcp, char **argv); + +- virtual void parseCommand(unsigned int* argcp, char** argv, ++ virtual void parseCommand(int* argcp, char** argv, + XrmOptionDescList optlist, int optlistsize); + + // +@@ -145,7 +145,7 @@ class Application : public UIComponent, public Server + // Initializes any Application specfic state. This routine should + // be called by main() or subclasses only. + // +- virtual boolean initialize(unsigned int* argcp, char** argv); ++ virtual boolean initialize(int* argcp, char** argv); + + // + // Allow others to access our event processing mechanism +diff --git a/src/uipp/base/IBMApplication.C b/src/uipp/base/IBMApplication.C +index ddf1722..94b9528 100644 +--- a/src/uipp/base/IBMApplication.C ++++ b/src/uipp/base/IBMApplication.C +@@ -349,7 +349,7 @@ int status; + } + + +-boolean IBMApplication::initializeWindowSystem(unsigned int *argcp, char **argv) ++boolean IBMApplication::initializeWindowSystem(int *argcp, char **argv) + { + + if (!this->Application::initializeWindowSystem(argcp, argv)) +@@ -375,7 +375,7 @@ boolean IBMApplication::initializeWindowSystem(unsigned int *argcp, char **argv) + return TRUE; + } + +-boolean IBMApplication::initialize(unsigned int* argcp, ++boolean IBMApplication::initialize(int* argcp, + char** argv) + { + if (!this->Application::initialize(argcp,argv)) +diff --git a/src/uipp/base/IBMApplication.h b/src/uipp/base/IBMApplication.h +index d05f340..911f789 100644 +--- a/src/uipp/base/IBMApplication.h ++++ b/src/uipp/base/IBMApplication.h +@@ -77,7 +77,7 @@ class IBMApplication : public Application + // + // Initialize the window system. + // +- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv); ++ virtual boolean initializeWindowSystem(int *argcp, char **argv); + + // + // Protected member data: +@@ -88,7 +88,7 @@ class IBMApplication : public Application + + HelpWin *helpWindow; + +- boolean initialize(unsigned int* argcp, char** argv); ++ boolean initialize(int* argcp, char** argv); + + // + // Load application specific action routines +diff --git a/src/uipp/dxui/Main.C b/src/uipp/dxui/Main.C +index 2404ea1..87261df 100644 +--- a/src/uipp/dxui/Main.C ++++ b/src/uipp/dxui/Main.C +@@ -48,7 +48,7 @@ extern unsigned long _etext; + // + const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n"; + +-int main(unsigned int argc, ++int main( int argc, + char** argv) + { + #if defined(HAVE_HCLXMINIT) +diff --git a/src/uipp/dxuilib/DXApplication.C b/src/uipp/dxuilib/DXApplication.C +index 74b7e51..b853b77 100644 +--- a/src/uipp/dxuilib/DXApplication.C ++++ b/src/uipp/dxuilib/DXApplication.C +@@ -2248,7 +2248,7 @@ void DXApplication::installDefaultResources(Widget baseWidget) + this->setDefaultResources(baseWidget, _defaultDXResources); + this->IBMApplication::installDefaultResources(baseWidget); + } +-boolean DXApplication::initialize(unsigned int* argcp, ++boolean DXApplication::initialize(int* argcp, + char** argv) + { + boolean wasSetBusy = FALSE; +diff --git a/src/uipp/dxuilib/DXApplication.h b/src/uipp/dxuilib/DXApplication.h +index 8ded16a..45a3436 100644 +--- a/src/uipp/dxuilib/DXApplication.h ++++ b/src/uipp/dxuilib/DXApplication.h +@@ -372,7 +372,7 @@ class DXApplication : public IBMApplication + // Overrides the Application class version: + // Initializes Xt Intrinsics with option list (switches). + // +- virtual boolean initialize(unsigned int* argcp, ++ virtual boolean initialize(int* argcp, + char** argv); + + // +diff --git a/src/uipp/mb/MBApplication.C b/src/uipp/mb/MBApplication.C +index 3de3d6a..d94bda3 100644 +--- a/src/uipp/mb/MBApplication.C ++++ b/src/uipp/mb/MBApplication.C +@@ -117,7 +117,7 @@ InitializeSignals(void) + #endif + } + +-boolean MBApplication::initialize(unsigned int* argcp, ++boolean MBApplication::initialize(int* argcp, + char** argv) + { + ASSERT(argcp); +diff --git a/src/uipp/mb/MBApplication.h b/src/uipp/mb/MBApplication.h +index b058ff7..3565d8e 100644 +--- a/src/uipp/mb/MBApplication.h ++++ b/src/uipp/mb/MBApplication.h +@@ -51,7 +51,7 @@ class MBApplication : public IBMApplication + // Overrides the Application class version: + // Initializes Xt Intrinsics with option list (switches). + // +- virtual boolean initialize(unsigned int* argcp, ++ virtual boolean initialize(int* argcp, + char** argv); + + static MBResource resource; +diff --git a/src/uipp/mb/Main.C b/src/uipp/mb/Main.C +index 293050e..df03716 100644 +--- a/src/uipp/mb/Main.C ++++ b/src/uipp/mb/Main.C +@@ -22,7 +22,7 @@ extern "C" void HCLXmInit(); + // + const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n"; + +-int main(unsigned int argc, ++int main( int argc, + char** argv) + { + #if defined(HAVE_HCLXMINIT) +diff --git a/src/uipp/prompter/GARApplication.C b/src/uipp/prompter/GARApplication.C +index 7f1638a..93a7018 100644 +--- a/src/uipp/prompter/GARApplication.C ++++ b/src/uipp/prompter/GARApplication.C +@@ -198,7 +198,7 @@ InitializeSignals(void) + } + } + +-boolean GARApplication::initialize(unsigned int* argcp, ++boolean GARApplication::initialize(int* argcp, + char** argv) + { + ASSERT(argcp); +diff --git a/src/uipp/prompter/GARApplication.h b/src/uipp/prompter/GARApplication.h +index b2f835e..3d1e01e 100644 +--- a/src/uipp/prompter/GARApplication.h ++++ b/src/uipp/prompter/GARApplication.h +@@ -129,7 +129,7 @@ class GARApplication : public IBMApplication + // Overrides the Application class version: + // Initializes Xt Intrinsics with option list (switches). + // +- virtual boolean initialize(unsigned int* argcp, ++ virtual boolean initialize(int* argcp, + char** argv); + + CommandScope *commandScope; // command scope +diff --git a/src/uipp/prompter/Main.C b/src/uipp/prompter/Main.C +index fec2f65..12ca610 100644 +--- a/src/uipp/prompter/Main.C ++++ b/src/uipp/prompter/Main.C +@@ -17,7 +17,7 @@ extern "C" void HCLXmInit(); + #endif + + +-int main(unsigned int argc, ++int main( int argc, + char** argv) + { + #if defined(HAVE_HCLXMINIT) +diff --git a/src/uipp/startup/Main.C b/src/uipp/startup/Main.C +index abb00fb..f9903a5 100644 +--- a/src/uipp/startup/Main.C ++++ b/src/uipp/startup/Main.C +@@ -14,7 +14,7 @@ + extern "C" void HCLXmInit(); + #endif + +-int main(unsigned int argc, ++int main( int argc, + char** argv) + { + #if defined(HAVE_HCLXMINIT) +diff --git a/src/uipp/startup/StartupApplication.C b/src/uipp/startup/StartupApplication.C +index 66eef43..50cf0a0 100644 +--- a/src/uipp/startup/StartupApplication.C ++++ b/src/uipp/startup/StartupApplication.C +@@ -117,7 +117,7 @@ InitializeSignals(void) + #endif + } + +-boolean StartupApplication::initialize(unsigned int* argcp, ++boolean StartupApplication::initialize(int* argcp, + char** argv) + { + ASSERT(argcp); +diff --git a/src/uipp/startup/StartupApplication.h b/src/uipp/startup/StartupApplication.h +index 872b586..61f28b1 100644 +--- a/src/uipp/startup/StartupApplication.h ++++ b/src/uipp/startup/StartupApplication.h +@@ -84,7 +84,7 @@ class StartupApplication : public IBMApplication + // Overrides the Application class version: + // Initializes Xt Intrinsics with option list (switches). + // +- virtual boolean initialize(unsigned int* argcp, char**argv); ++ virtual boolean initialize(int* argcp, char**argv); + + CommandScope *commandScope; // command scope + +diff --git a/src/uipp/tutor/Main.C b/src/uipp/tutor/Main.C +index 6bcd8cd..c8c3663 100644 +--- a/src/uipp/tutor/Main.C ++++ b/src/uipp/tutor/Main.C +@@ -31,7 +31,7 @@ extern "C" void HCLXmInit(); + // + const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n"; + +-int main(unsigned int argc, ++int main( int argc, + char** argv) + { + #if defined(HAVE_HCLXMINIT) +diff --git a/src/uipp/tutor/TutorApplication.C b/src/uipp/tutor/TutorApplication.C +index a4509d6..c4aec5a 100644 +--- a/src/uipp/tutor/TutorApplication.C ++++ b/src/uipp/tutor/TutorApplication.C +@@ -196,7 +196,7 @@ InitializeSignals(void) + #endif + } + +-boolean TutorApplication::initialize(unsigned int* argcp, ++boolean TutorApplication::initialize(int* argcp, + char** argv) + { + ASSERT(argcp); +diff --git a/src/uipp/tutor/TutorApplication.h b/src/uipp/tutor/TutorApplication.h +index c3cf5ee..b6e6213 100644 +--- a/src/uipp/tutor/TutorApplication.h ++++ b/src/uipp/tutor/TutorApplication.h +@@ -69,7 +69,7 @@ class TutorApplication : public IBMApplication + // Overrides the Application class version: + // Initializes Xt Intrinsics with option list (switches). + // +- virtual boolean initialize(unsigned int* argcp, ++ virtual boolean initialize(int* argcp, + char** argv); + + // +diff --git a/src/uipp/widgets/MultiText.h b/src/uipp/widgets/MultiText.h +index 6d5ee2a..db77a76 100644 +--- a/src/uipp/widgets/MultiText.h ++++ b/src/uipp/widgets/MultiText.h +@@ -91,7 +91,7 @@ typedef struct _XmMultiTextClassRec* XmMultiTextWidgetClass; + #define XmNsmoothScroll "smoothScroll" + #define XmNwaitCursorCount "waitCursorCount" + +-#if !(defined(_Xm_h) || defined(XM_H)) ++#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H)) + #define XmNmarginHeight "marginHeight" + #define XmNmarginWidth "marginWidth" + #define XmNwordWrap "wordWrap" +@@ -109,7 +109,7 @@ typedef struct _XmMultiTextClassRec* XmMultiTextWidgetClass; + #define XmCSmoothScroll "SmoothScroll" + #define XmCWaitCursorCount "WaitCursorCount" + +-#if !(defined(_Xm_h) || defined(XM_H)) ++#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H)) + #define XmCMarginHeight "MarginHeight" + #define XmCMarginWidth "MarginWidth" + #define XmCWordWrap "WordWrap" +-- +2.9.3 + diff --git a/0004-dx-errno.patch b/0004-dx-errno.patch new file mode 100644 index 0000000..ff60ee4 --- /dev/null +++ b/0004-dx-errno.patch @@ -0,0 +1,24 @@ +From a258e060e074bfdd10e3d866b9eb1db96e0df73b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Wed, 17 Feb 2016 15:16:08 +0100 +Subject: [PATCH 4/9] dx-errno + +--- + src/exec/dpexec/lex.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/exec/dpexec/lex.c b/src/exec/dpexec/lex.c +index b421c57..37032e1 100644 +--- a/src/exec/dpexec/lex.c ++++ b/src/exec/dpexec/lex.c +@@ -504,6 +504,7 @@ int yylex(YYSTYPE *lvalp) + for (;;) + { + yyleng = 0; ++ errno = 0; + + c = input(); + +-- +2.9.3 + diff --git a/0005-dx-null.patch b/0005-dx-null.patch new file mode 100644 index 0000000..d847b65 --- /dev/null +++ b/0005-dx-null.patch @@ -0,0 +1,27 @@ +From d3f3bf105b64a47a995c5e4c1bd4f18761250702 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Wed, 17 Feb 2016 15:16:29 +0100 +Subject: [PATCH 5/9] dx-null + +--- + src/exec/libdx/xwindow.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/exec/libdx/xwindow.c b/src/exec/libdx/xwindow.c +index ab25786..48e195c 100644 +--- a/src/exec/libdx/xwindow.c ++++ b/src/exec/libdx/xwindow.c +@@ -29,7 +29,9 @@ Error + DXRegisterWindowHandlerWithCheckProc(Error (*proc) (int, Pointer), + int (*check)(int, Pointer), Display *d, Pointer arg) + { +- int fd = ConnectionNumber(d); ++ int fd; ++ if (d) fd = ConnectionNumber(d); ++ else return ERROR; + + if (! DXRegisterInputHandlerWithCheckProc(proc, check, fd, arg)) + return ERROR; +-- +2.9.3 + diff --git a/0006-dx-magick.patch b/0006-dx-magick.patch new file mode 100644 index 0000000..e5b5b6f --- /dev/null +++ b/0006-dx-magick.patch @@ -0,0 +1,56 @@ +From d0a5356ba751a715d85223494a58260d474a5981 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Wed, 17 Feb 2016 15:16:42 +0100 +Subject: [PATCH 6/9] dx-magick + +--- + src/exec/dxmods/_im_image.c | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/src/exec/dxmods/_im_image.c b/src/exec/dxmods/_im_image.c +index b7ca6df..f439859 100644 +--- a/src/exec/dxmods/_im_image.c ++++ b/src/exec/dxmods/_im_image.c +@@ -328,9 +328,6 @@ static Error write_im(RWImageArgs *iargs) { + DestroyImage(image); + DestroyImageInfo(new_frame_info); + DestroyImageInfo(image_info); +-#if MagickLibVersion > 0x0537 +- DestroyConstitute(); +-#endif + DXSetError(ERROR_INTERNAL, "reason = %s, description = %s", + image->exception.reason, + image->exception.description); +@@ -345,9 +342,6 @@ static Error write_im(RWImageArgs *iargs) { + DestroyImage(image); + DestroyImageInfo(new_frame_info); + DestroyImageInfo(image_info); +-#if MagickLibVersion > 0x0537 +- DestroyConstitute(); +-#endif + DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c"); + } + +@@ -374,9 +368,6 @@ static Error write_im(RWImageArgs *iargs) { + DestroyImage(image); + DestroyImageInfo(image_info); + DestroyImageInfo(new_frame_info); +-#if MagickLibVersion > 0x0537 +- DestroyConstitute(); +-#endif + + DEBUGMESSAGE("back from DestroyImage"); + +@@ -490,9 +481,6 @@ static Error write_im(RWImageArgs *iargs) { + DXFree(copycolors); + DestroyImage(image); + DestroyImageInfo(image_info); +-#if MagickLibVersion > 0x0537 +- DestroyConstitute(); +-#endif + } + return (OK); + #else /* ndef HAVE_LIBMAGICK */ +-- +2.9.3 + diff --git a/0007-dx-format-security.patch b/0007-dx-format-security.patch new file mode 100644 index 0000000..4a677b5 --- /dev/null +++ b/0007-dx-format-security.patch @@ -0,0 +1,269 @@ +From 1d5308d08220927e7ec881c99d50930a00175331 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Wed, 17 Feb 2016 15:17:00 +0100 +Subject: [PATCH 7/9] dx-format-security + +--- + src/exec/dpexec/dxmain.c | 4 ++-- + src/exec/dpexec/lex.c | 2 +- + src/exec/dxmods/colormap.c | 4 ++-- + src/exec/dxmods/exp_gai.c | 24 ++++++++++++------------ + src/uipp/dxl/conn.c | 2 +- + src/uipp/dxui/SelectionNode.C | 2 +- + src/uipp/dxuilib/DXApplication.C | 12 ++++++------ + 7 files changed, 25 insertions(+), 25 deletions(-) + +diff --git a/src/exec/dpexec/dxmain.c b/src/exec/dpexec/dxmain.c +index ce42d2c..7bb4982 100644 +--- a/src/exec/dpexec/dxmain.c ++++ b/src/exec/dpexec/dxmain.c +@@ -2129,7 +2129,7 @@ int ExCheckInput () + if ((SFILEisatty(yyin) || (_dxd_exRshInput && yyin == _dxd_exBaseFD)) && + !prompted && _dxf_ExGQAllDone() && !SFILECharReady(yyin)) { + prompt = _dxf_ExPromptGet(PROMPT_ID_PROMPT); +- printf (prompt? prompt: EX_PROMPT); ++ printf ("%s", prompt? prompt: EX_PROMPT); + fflush (stdout); + prompted = TRUE; + } +@@ -2305,7 +2305,7 @@ static int ExInputAvailable (SFILE *fp) + _dxf_ExGQAllDone ())\ + {\ + prompt = _dxf_ExPromptGet (PROMPT_ID_PROMPT);\ +- printf (prompt ? prompt : EX_PROMPT);\ ++ printf ("%s", prompt ? prompt : EX_PROMPT);\ + fflush (stdout);\ + prompted = TRUE;\ + }\ +diff --git a/src/exec/dpexec/lex.c b/src/exec/dpexec/lex.c +index 37032e1..867d11f 100644 +--- a/src/exec/dpexec/lex.c ++++ b/src/exec/dpexec/lex.c +@@ -649,7 +649,7 @@ int yylex(YYSTYPE *lvalp) + if ((_dxd_exIsatty || _dxd_exRshInput) && !SFILECharReady(yyin)) + { + prompt = _dxf_ExPromptGet(PROMPT_ID_CPROMPT); +- printf (prompt? prompt: EX_CPROMPT); ++ printf ("%s",prompt? prompt: EX_CPROMPT); + fflush (stdout); + } + break; +diff --git a/src/exec/dxmods/colormap.c b/src/exec/dxmods/colormap.c +index 28b31ab..0c81f37 100644 +--- a/src/exec/dxmods/colormap.c ++++ b/src/exec/dxmods/colormap.c +@@ -1167,7 +1167,7 @@ Error print_map(Field f,char *component,char *name, char *id) + if (!ei.msgbuf) + return ERROR; + ei.mp = ei.msgbuf; +- sprintf(ei.mp,name); while(*ei.mp) ei.mp++; ++ sprintf("%s",ei.mp,name); while(*ei.mp) ei.mp++; + sprintf(ei.mp, "NULL"); + DXUIMessage(id,ei.msgbuf); + DXFree(ei.msgbuf); +@@ -1186,7 +1186,7 @@ Error print_map(Field f,char *component,char *name, char *id) + ei.mp = ei.msgbuf; + shape[0]=2; + strcpy(ei.mp,""); +- sprintf(ei.mp,name); while(*ei.mp) ei.mp++; ++ sprintf("%s",ei.mp,name); while(*ei.mp) ei.mp++; + if (num==1){ + sprintf(ei.mp,"{"); ei.mp++; + } +diff --git a/src/exec/dxmods/exp_gai.c b/src/exec/dxmods/exp_gai.c +index 3701f58..16705b3 100644 +--- a/src/exec/dxmods/exp_gai.c ++++ b/src/exec/dxmods/exp_gai.c +@@ -422,7 +422,7 @@ static Error pvalue(struct array_info *arinfo,struct how *h,int item,int blank,i + if (first == ON) + first = OFF; + else +- fprintf(h->dfp,del); ++ fprintf(h->dfp,"%s",del); + if (blank == ON) + pblank(arinfo,h); + else +@@ -439,7 +439,7 @@ static Error pvalue(struct array_info *arinfo,struct how *h,int item,int blank,i + if (first == ON) + first = OFF; + else +- fprintf(h->dfp,del); ++ fprintf(h->dfp,"%s",del); + if (blank == ON) + pblank(arinfo,h); + else +@@ -456,7 +456,7 @@ static Error pvalue(struct array_info *arinfo,struct how *h,int item,int blank,i + if (first == ON) + first = OFF; + else +- fprintf(h->dfp,del); ++ fprintf(h->dfp,"%s",del); + if (blank == ON) + pblank(arinfo,h); + else +@@ -473,7 +473,7 @@ static Error pvalue(struct array_info *arinfo,struct how *h,int item,int blank,i + if (first == ON) + first = OFF; + else +- fprintf(h->dfp,del); ++ fprintf(h->dfp,"%s",del); + if (blank == ON) + pblank(arinfo,h); + else +@@ -490,7 +490,7 @@ static Error pvalue(struct array_info *arinfo,struct how *h,int item,int blank,i + if (first == ON) + first = OFF; + else +- fprintf(h->dfp,del); ++ fprintf(h->dfp,"%s",del); + if (blank == ON) + pblank(arinfo,h); + else +@@ -507,7 +507,7 @@ static Error pvalue(struct array_info *arinfo,struct how *h,int item,int blank,i + if (first == ON) + first = OFF; + else +- fprintf(h->dfp,del); ++ fprintf(h->dfp,"%s",del); + if (blank == ON) + pblank(arinfo,h); + else +@@ -524,7 +524,7 @@ static Error pvalue(struct array_info *arinfo,struct how *h,int item,int blank,i + if (first == ON) + first = OFF; + else +- fprintf(h->dfp,del); ++ fprintf(h->dfp,"%s",del); + if (blank == ON) + pblank(arinfo,h); + else +@@ -541,7 +541,7 @@ static Error pvalue(struct array_info *arinfo,struct how *h,int item,int blank,i + if (first == ON) + first = OFF; + else +- fprintf(h->dfp,del); ++ fprintf(h->dfp,"%s",del); + if (blank == ON) + pblank(arinfo,h); + else +@@ -554,7 +554,7 @@ static Error pvalue(struct array_info *arinfo,struct how *h,int item,int blank,i + arinfo->last,scratch); + arinfo->last = (Pointer)nextstr; + if (first == OFF) +- fprintf(h->dfp,del); ++ fprintf(h->dfp,"%s",del); + if (blank == ON) + pblank(arinfo,h); + else { +@@ -830,7 +830,7 @@ static void field_header(Field f,struct how *h) + if (rank > 0) { + for (i=0; i 0) +- fprintf(h->dfp,del); ++ fprintf(h->dfp,"%s",del); + fprintf(h->dfp,"positions_cmp%d",i); + } + } +@@ -845,13 +845,13 @@ static void field_header(Field f,struct how *h) + !strcmp("positions",depon) && strcmp("invalid positions",name) + && strcmp("positions",name) ) { + if (first == OFF) +- fprintf(h->dfp,del); ++ fprintf(h->dfp,"%s",del); + DXGetArrayInfo((Array)a,NULL,&type,NULL,&rank,shape); + /* dim = (rank < 1) ? 1 : shape[0]; */ + if (type != TYPE_STRING && rank > 0 && shape[0] > 1) { + cmp = (char *)DXAllocate(strlen(name)+6); + for (j=0; j 0) fprintf(h->dfp, del); ++ if (j > 0) fprintf(h->dfp, "%s", del); + sprintf(cmp,"%s_cmp%d",name,j); + pstring(h->dfp,0,0,0,cmp); + } +diff --git a/src/uipp/dxl/conn.c b/src/uipp/dxl/conn.c +index e885c6a..571834a 100644 +--- a/src/uipp/dxl/conn.c ++++ b/src/uipp/dxl/conn.c +@@ -389,7 +389,7 @@ DXLStartChild(const char *string, const char *host, int* inp, int* outp, int* er + char buf[2048]; + int n = read(err,buf,2048); + buf[n] = '\0'; +- fprintf(stderr,buf); ++ fprintf(stderr,"%s",buf); + } + #if defined(intelnt) || defined(WIN32) + TerminateProcess(child, -1); +diff --git a/src/uipp/dxui/SelectionNode.C b/src/uipp/dxui/SelectionNode.C +index fbe9fa8..2dcf172 100644 +--- a/src/uipp/dxui/SelectionNode.C ++++ b/src/uipp/dxui/SelectionNode.C +@@ -960,7 +960,7 @@ boolean SelectionNode::printJavaValue (FILE* jf) + ListIterator it(selection_stmts); + char* cp; + while ( (cp = (char*)it.getNext()) ) { +- fprintf (jf, cp); ++ fprintf (jf, "%s", cp); + delete cp; + } + } +diff --git a/src/uipp/dxuilib/DXApplication.C b/src/uipp/dxuilib/DXApplication.C +index b853b77..6be6f72 100644 +--- a/src/uipp/dxuilib/DXApplication.C ++++ b/src/uipp/dxuilib/DXApplication.C +@@ -2553,7 +2553,7 @@ boolean DXApplication::initialize(int* argcp, + const char* errmsg = + GraphLayout::SetHeightPerLevel (DXApplication::resource.autoLayoutHeight); + if (errmsg) { +- fprintf (stderr, errmsg); ++ fprintf (stderr, "%s", errmsg); + return FALSE; + } + } +@@ -2561,7 +2561,7 @@ boolean DXApplication::initialize(int* argcp, + const char* errmsg = + GraphLayout::SetGroupSpacing (DXApplication::resource.autoLayoutGroupSpacing); + if (errmsg) { +- fprintf (stderr, errmsg); ++ fprintf (stderr, "%s", errmsg); + return FALSE; + } + } +@@ -2569,7 +2569,7 @@ boolean DXApplication::initialize(int* argcp, + const char* errmsg = + GraphLayout::SetNodeSpacing (DXApplication::resource.autoLayoutNodeSpacing); + if (errmsg) { +- fprintf (stderr, errmsg); ++ fprintf (stderr, "%s", errmsg); + return FALSE; + } + } +@@ -3787,7 +3787,7 @@ error: + if (this->anchor) + InfoMessage(msg); + else +- fprintf(stderr,msg); ++ fprintf(stderr,"%s",msg); + + return NULL; + } +@@ -5019,7 +5019,7 @@ DXApplication_HandleCoreDump(int dummy) + fprintf (stderr, "Attempting to save any modified files.\n" + "Please check saved files for integrity by reloading them.\n"); + theDXApplication->emergencySave (msg); +- fprintf (stderr, msg); ++ fprintf (stderr, "%s", msg); + } + + fprintf(stderr,"The application will now abort.\n"); +@@ -5035,7 +5035,7 @@ void DXApplication::abortApplication() + if (theDXApplication) { + char msg[4096]; + this->emergencySave(msg); +- fprintf(stderr, msg); ++ fprintf(stderr, "%s", msg); + } + + this->IBMApplication::abortApplication(); +-- +2.9.3 + diff --git a/0008-dx-narrowing.patch b/0008-dx-narrowing.patch new file mode 100644 index 0000000..73e7aef --- /dev/null +++ b/0008-dx-narrowing.patch @@ -0,0 +1,499 @@ +From dbb15f15d3dc03748780f642a4b3e0882d2a1b2c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Wed, 17 Feb 2016 15:20:27 +0100 +Subject: [PATCH 8/9] dx-narrowing + +--- + src/uipp/base/TreeView.C | 4 ++-- + src/uipp/base/minus.bm | 2 +- + src/uipp/base/plus.bm | 2 +- + src/uipp/dxuilib/AutoAxesDialog.C | 8 ++++---- + src/uipp/dxuilib/DXWindow.C | 2 +- + src/uipp/dxuilib/PageTab.C | 4 ++-- + src/uipp/dxuilib/VPEPostIt.C | 2 +- + src/uipp/dxuilib/anchor.bm | 2 +- + src/uipp/dxuilib/anim_mask.bm | 2 +- + src/uipp/dxuilib/animation.bm | 2 +- + src/uipp/dxuilib/pagedrag.bm | 2 +- + src/uipp/dxuilib/pagedragmask.bm | 2 +- + src/uipp/dxuilib/postit.bm | 2 +- + src/uipp/dxuilib/ticks_in.bm | 2 +- + src/uipp/dxuilib/ticks_in_ins.bm | 2 +- + src/uipp/dxuilib/ticks_out.bm | 2 +- + src/uipp/dxuilib/ticks_out_ins.bm | 2 +- + src/uipp/prompter/col_insens.bm | 2 +- + src/uipp/prompter/col_sens.bm | 2 +- + src/uipp/prompter/grid1.bm | 2 +- + src/uipp/prompter/grid2.bm | 2 +- + src/uipp/prompter/grid3.bm | 2 +- + src/uipp/prompter/grid4.bm | 2 +- + src/uipp/prompter/row_insens.bm | 2 +- + src/uipp/prompter/row_sens.bm | 2 +- + src/uipp/widgets/backward.bm | 2 +- + src/uipp/widgets/forward.bm | 2 +- + src/uipp/widgets/frame.bm | 2 +- + src/uipp/widgets/loop.bm | 2 +- + src/uipp/widgets/palim.bm | 2 +- + src/uipp/widgets/pause.bm | 2 +- + src/uipp/widgets/step.bm | 2 +- + src/uipp/widgets/stepb.bm | 2 +- + src/uipp/widgets/stepf.bm | 2 +- + src/uipp/widgets/stop.bm | 2 +- + 35 files changed, 40 insertions(+), 40 deletions(-) + +diff --git a/src/uipp/base/TreeView.C b/src/uipp/base/TreeView.C +index 8538be5..b7377c5 100644 +--- a/src/uipp/base/TreeView.C ++++ b/src/uipp/base/TreeView.C +@@ -316,9 +316,9 @@ void TreeView::paint() + } + + if (TreeView::Plus == XmUNSPECIFIED_PIXMAP) { +- TreeView::Plus = XCreatePixmapFromBitmapData(d,win,plus_bits,plus_width, ++ TreeView::Plus = XCreatePixmapFromBitmapData(d,win,(char*)plus_bits,plus_width, + plus_height,this->line_color,bg,depth); +- TreeView::Minus = XCreatePixmapFromBitmapData(d,win,minus_bits,minus_width, ++ TreeView::Minus = XCreatePixmapFromBitmapData(d,win,(char*)minus_bits,minus_width, + minus_height,this->line_color,bg,depth); + } + +diff --git a/src/uipp/base/minus.bm b/src/uipp/base/minus.bm +index 3312035..96d04fe 100644 +--- a/src/uipp/base/minus.bm ++++ b/src/uipp/base/minus.bm +@@ -1,6 +1,6 @@ + #define minus_width 12 + #define minus_height 14 +-static char minus_bits[] = { ++static unsigned char minus_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xfe, 0x0f, 0x02, 0x08, 0x02, 0x08, 0x02, 0x08, + 0x02, 0x08, 0xfa, 0x0b, 0x02, 0x08, 0x02, 0x08, 0x02, 0x08, 0x02, 0x08, + 0xfe, 0x0f, 0x00, 0x00}; +diff --git a/src/uipp/base/plus.bm b/src/uipp/base/plus.bm +index cb3a87b..0af5f3d 100644 +--- a/src/uipp/base/plus.bm ++++ b/src/uipp/base/plus.bm +@@ -1,6 +1,6 @@ + #define plus_width 12 + #define plus_height 14 +-static char plus_bits[] = { ++static unsigned char plus_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xfe, 0x0f, 0x02, 0x08, 0x42, 0x08, 0x42, 0x08, + 0x42, 0x08, 0xfa, 0x0b, 0x42, 0x08, 0x42, 0x08, 0x42, 0x08, 0x02, 0x08, + 0xfe, 0x0f, 0x00, 0x00}; +diff --git a/src/uipp/dxuilib/AutoAxesDialog.C b/src/uipp/dxuilib/AutoAxesDialog.C +index 0d5f1f4..95097a0 100644 +--- a/src/uipp/dxuilib/AutoAxesDialog.C ++++ b/src/uipp/dxuilib/AutoAxesDialog.C +@@ -1791,16 +1791,16 @@ AutoAxesDialog::AutoAxesDialog(ImageWindow* image) : + XmNdepth, &depth, XmNscreen, &scr, NULL); + Pixel fg = BlackPixelOfScreen(scr); + AutoAxesDialog::TicksIn = XCreatePixmapFromBitmapData (XtDisplay(root), +- XtWindow(root), ticks_in_bits, ticks_in_width, ticks_in_height, ++ XtWindow(root), (char*) ticks_in_bits, ticks_in_width, ticks_in_height, + fg, bg, depth); + AutoAxesDialog::TicksOut = XCreatePixmapFromBitmapData (XtDisplay(root), +- XtWindow(root), ticks_out_bits, ticks_out_width, ticks_out_height, ++ XtWindow(root), (char*) ticks_out_bits, ticks_out_width, ticks_out_height, + fg, bg, depth); + AutoAxesDialog::TicksInGrey = XCreatePixmapFromBitmapData (XtDisplay(root), +- XtWindow(root), ticks_in_ins_bits, ticks_in_ins_width, ticks_in_ins_height, ++ XtWindow(root), (char*) ticks_in_ins_bits, ticks_in_ins_width, ticks_in_ins_height, + fg, bg, depth); + AutoAxesDialog::TicksOutGrey = XCreatePixmapFromBitmapData (XtDisplay(root), +- XtWindow(root),ticks_out_ins_bits, ticks_out_ins_width, ticks_out_ins_height, ++ XtWindow(root), (char*) ticks_out_ins_bits, ticks_out_ins_width, ticks_out_ins_height, + fg, bg, depth); + + +diff --git a/src/uipp/dxuilib/DXWindow.C b/src/uipp/dxuilib/DXWindow.C +index a5e6bcb..cbee6df 100644 +--- a/src/uipp/dxuilib/DXWindow.C ++++ b/src/uipp/dxuilib/DXWindow.C +@@ -245,7 +245,7 @@ void DXWindow::createAnchor(boolean addPixmap) + XCreatePixmapFromBitmapData + (XtDisplay(this->menuBar), + wind, +- anchor_bits, ++ (char*) anchor_bits, + anchor_width, + anchor_height, + foreground, +diff --git a/src/uipp/dxuilib/PageTab.C b/src/uipp/dxuilib/PageTab.C +index 3561991..5e717e4 100644 +--- a/src/uipp/dxuilib/PageTab.C ++++ b/src/uipp/dxuilib/PageTab.C +@@ -96,9 +96,9 @@ void PageTab::createButton (Widget p) + PageTab::DragIcon = this->createDragIcon(pagedrag_width, pagedrag_height, + (char *)pagedrag_bits, (char *)pagedragmask_bits); + PageTab::AnimationPixmap = XCreateBitmapFromData(XtDisplay(p), +- XtWindow(p), animation_bits, animation_width, animation_height); ++ XtWindow(p), (char*)animation_bits, animation_width, animation_height); + PageTab::AnimationMaskPixmap = XCreateBitmapFromData(XtDisplay(p), +- XtWindow(p), anim_mask_bits, anim_mask_width, anim_mask_height); ++ XtWindow(p), (char*)anim_mask_bits, anim_mask_width, anim_mask_height); + PageTab::ClassInitialized = TRUE; + } + +diff --git a/src/uipp/dxuilib/VPEPostIt.C b/src/uipp/dxuilib/VPEPostIt.C +index 9881688..7377e8d 100644 +--- a/src/uipp/dxuilib/VPEPostIt.C ++++ b/src/uipp/dxuilib/VPEPostIt.C +@@ -213,7 +213,7 @@ void VPEPostIt::makePixmap() + XFreePixmap(d, this->bg_pixmap); + this->bg_pixmap = NUL(Pixmap); + } +- this->bg_pixmap = XCreatePixmapFromBitmapData(d, w, postit_bits, ++ this->bg_pixmap = XCreatePixmapFromBitmapData(d, w, (char*)postit_bits, + postit_width, postit_height, fg, bg, depth); + XtVaSetValues (this->customPart, + XmNlabelType, XmPIXMAP, +diff --git a/src/uipp/dxuilib/anchor.bm b/src/uipp/dxuilib/anchor.bm +index 1379314..69c2bf5 100644 +--- a/src/uipp/dxuilib/anchor.bm ++++ b/src/uipp/dxuilib/anchor.bm +@@ -2,7 +2,7 @@ + #define anchor_height 17 + #define anchor_x_hot -1 + #define anchor_y_hot -1 +-static char anchor_bits[] = { ++static unsigned char anchor_bits[] = { + 0x80, 0x03, 0x00, 0x40, 0x05, 0x00, 0xc0, 0x02, 0x00, 0x40, 0x05, 0x00, + 0x80, 0x02, 0x00, 0x10, 0x11, 0x00, 0x30, 0x09, 0x00, 0x50, 0x15, 0x00, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x83, 0x82, 0x00, 0x85, 0x41, 0x01, +diff --git a/src/uipp/dxuilib/anim_mask.bm b/src/uipp/dxuilib/anim_mask.bm +index 617d365..cb08c61 100644 +--- a/src/uipp/dxuilib/anim_mask.bm ++++ b/src/uipp/dxuilib/anim_mask.bm +@@ -1,6 +1,6 @@ + #define anim_mask_width 90 + #define anim_mask_height 23 +-static char anim_mask_bits[] = { ++static unsigned char anim_mask_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, +diff --git a/src/uipp/dxuilib/animation.bm b/src/uipp/dxuilib/animation.bm +index 1cf5798..3404b19 100644 +--- a/src/uipp/dxuilib/animation.bm ++++ b/src/uipp/dxuilib/animation.bm +@@ -1,6 +1,6 @@ + #define animation_width 90 + #define animation_height 23 +-static char animation_bits[] = { ++static unsigned char animation_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +diff --git a/src/uipp/dxuilib/pagedrag.bm b/src/uipp/dxuilib/pagedrag.bm +index 5c9a2d0..8c8745d 100644 +--- a/src/uipp/dxuilib/pagedrag.bm ++++ b/src/uipp/dxuilib/pagedrag.bm +@@ -1,6 +1,6 @@ + #define pagedrag_width 32 + #define pagedrag_height 32 +-static char pagedrag_bits[] = { ++static unsigned char pagedrag_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0x04, 0x30, 0x00, 0x00, + 0x04, 0xf0, 0x01, 0x00, 0x04, 0xb0, 0x01, 0x00, 0x07, 0xf0, 0xff, 0x0f, + 0x01, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x7c, +diff --git a/src/uipp/dxuilib/pagedragmask.bm b/src/uipp/dxuilib/pagedragmask.bm +index 8c5c420..f5ddb4c 100644 +--- a/src/uipp/dxuilib/pagedragmask.bm ++++ b/src/uipp/dxuilib/pagedragmask.bm +@@ -1,6 +1,6 @@ + #define pagedragmask_width 32 + #define pagedragmask_height 32 +-static char pagedragmask_bits[] = { ++static unsigned char pagedragmask_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, + 0x5c, 0xf5, 0x01, 0x00, 0xac, 0xfa, 0x01, 0x00, 0x5f, 0xf5, 0xff, 0x0f, + 0xaf, 0xfa, 0xff, 0x0f, 0x57, 0x55, 0x55, 0x0d, 0xab, 0xaa, 0xaa, 0x7e, +diff --git a/src/uipp/dxuilib/postit.bm b/src/uipp/dxuilib/postit.bm +index a67e1bf..aed0a05 100644 +--- a/src/uipp/dxuilib/postit.bm ++++ b/src/uipp/dxuilib/postit.bm +@@ -2,7 +2,7 @@ + #define postit_height 24 + #define postit_x_hot 11 + #define postit_y_hot 0 +-static char postit_bits[] = { ++static unsigned char postit_bits[] = { + 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x54, 0x55, 0xd5, 0xaa, 0xaa, 0xaa, + 0x54, 0x41, 0xd5, 0xaa, 0xa8, 0xaa, 0x54, 0x75, 0xd5, 0xaa, 0xbc, 0xaa, + 0x54, 0x55, 0xd5, 0xaa, 0xaa, 0xaa, 0x54, 0x41, 0xd5, 0xaa, 0xa8, 0xaa, +diff --git a/src/uipp/dxuilib/ticks_in.bm b/src/uipp/dxuilib/ticks_in.bm +index 5e4d6a3..dd2ac91 100644 +--- a/src/uipp/dxuilib/ticks_in.bm ++++ b/src/uipp/dxuilib/ticks_in.bm +@@ -1,6 +1,6 @@ + #define ticks_in_width 18 + #define ticks_in_height 16 +-static char ticks_in_bits[] = { ++static unsigned char ticks_in_bits[] = { + 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x82, 0x20, 0x00, + 0x82, 0x20, 0x00, 0x92, 0x24, 0x01, 0x92, 0x24, 0x01, 0x92, 0x24, 0x01, +diff --git a/src/uipp/dxuilib/ticks_in_ins.bm b/src/uipp/dxuilib/ticks_in_ins.bm +index 890fae0..70ac5d9 100644 +--- a/src/uipp/dxuilib/ticks_in_ins.bm ++++ b/src/uipp/dxuilib/ticks_in_ins.bm +@@ -1,6 +1,6 @@ + #define ticks_in_ins_width 18 + #define ticks_in_ins_height 16 +-static char ticks_in_ins_bits[] = { ++static unsigned char ticks_in_ins_bits[] = { + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x82, 0x20, 0x00, 0x10, 0x04, 0x01, 0x82, 0x20, 0x00, 0x10, 0x04, 0x01, +diff --git a/src/uipp/dxuilib/ticks_out.bm b/src/uipp/dxuilib/ticks_out.bm +index 718b5fc..f078a27 100644 +--- a/src/uipp/dxuilib/ticks_out.bm ++++ b/src/uipp/dxuilib/ticks_out.bm +@@ -1,6 +1,6 @@ + #define ticks_out_width 18 + #define ticks_out_height 16 +-static char ticks_out_bits[] = { ++static unsigned char ticks_out_bits[] = { + 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0xfe, 0xff, 0x03, 0x24, 0x49, 0x02, +diff --git a/src/uipp/dxuilib/ticks_out_ins.bm b/src/uipp/dxuilib/ticks_out_ins.bm +index 9f85654..793f843 100644 +--- a/src/uipp/dxuilib/ticks_out_ins.bm ++++ b/src/uipp/dxuilib/ticks_out_ins.bm +@@ -1,6 +1,6 @@ + #define ticks_out_ins_width 18 + #define ticks_out_ins_height 16 +-static char ticks_out_ins_bits[] = { ++static unsigned char ticks_out_ins_bits[] = { + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0x02, 0x04, 0x41, 0x00, +diff --git a/src/uipp/prompter/col_insens.bm b/src/uipp/prompter/col_insens.bm +index 785de01..f52ceb8 100644 +--- a/src/uipp/prompter/col_insens.bm ++++ b/src/uipp/prompter/col_insens.bm +@@ -1,6 +1,6 @@ + #define col_insens_width 20 + #define col_insens_height 20 +-static char col_insens_bits[] = { ++static unsigned char col_insens_bits[] = { + 0x00, 0x00, 0x00, 0x55, 0x55, 0x05, 0x00, 0x00, 0x08, 0x00, 0x80, 0x02, + 0x00, 0x28, 0x00, 0x80, 0x02, 0x00, 0x28, 0x00, 0x00, 0x02, 0x00, 0x00, + 0x55, 0x55, 0x05, 0x00, 0x00, 0x08, 0x00, 0x80, 0x02, 0x00, 0x28, 0x00, +diff --git a/src/uipp/prompter/col_sens.bm b/src/uipp/prompter/col_sens.bm +index fb0dfff..666fb37 100644 +--- a/src/uipp/prompter/col_sens.bm ++++ b/src/uipp/prompter/col_sens.bm +@@ -1,6 +1,6 @@ + #define col_sens_width 20 + #define col_sens_height 20 +-static char col_sens_bits[] = { ++static unsigned char col_sens_bits[] = { + 0x00, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x0c, 0x00, 0xc0, 0x03, + 0x00, 0x3c, 0x00, 0xc0, 0x03, 0x00, 0x3c, 0x00, 0x00, 0x03, 0x00, 0x00, + 0xff, 0xff, 0x0f, 0x00, 0x00, 0x0c, 0x00, 0xc0, 0x03, 0x00, 0x3c, 0x00, +diff --git a/src/uipp/prompter/grid1.bm b/src/uipp/prompter/grid1.bm +index c4b02d1..3dca8d5 100644 +--- a/src/uipp/prompter/grid1.bm ++++ b/src/uipp/prompter/grid1.bm +@@ -1,6 +1,6 @@ + #define grid1_width 37 + #define grid1_height 37 +-static char grid1_bits[] = { ++static unsigned char grid1_bits[] = { + 0xff, 0xff, 0xff, 0xff, 0x1f, 0x41, 0x10, 0x04, 0x41, 0x10, 0x41, 0x10, + 0x04, 0x41, 0x10, 0x41, 0x10, 0x04, 0x41, 0x10, 0x41, 0x10, 0x04, 0x41, + 0x10, 0x41, 0x10, 0x04, 0x41, 0x10, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x41, +diff --git a/src/uipp/prompter/grid2.bm b/src/uipp/prompter/grid2.bm +index fec0808..7e78d44 100644 +--- a/src/uipp/prompter/grid2.bm ++++ b/src/uipp/prompter/grid2.bm +@@ -1,6 +1,6 @@ + #define grid2_width 37 + #define grid2_height 37 +-static char grid2_bits[] = { ++static unsigned char grid2_bits[] = { + 0xff, 0xff, 0xff, 0xff, 0x1f, 0x41, 0x0a, 0x40, 0x02, 0x10, 0x41, 0x0a, + 0x40, 0x02, 0x10, 0x41, 0x0a, 0x40, 0x02, 0x10, 0xff, 0xff, 0xff, 0xff, + 0x1f, 0x41, 0x0a, 0x40, 0x02, 0x10, 0x41, 0x0a, 0x40, 0x02, 0x10, 0xff, +diff --git a/src/uipp/prompter/grid3.bm b/src/uipp/prompter/grid3.bm +index ba8737b..6597dca 100644 +--- a/src/uipp/prompter/grid3.bm ++++ b/src/uipp/prompter/grid3.bm +@@ -1,6 +1,6 @@ + #define grid3_width 37 + #define grid3_height 37 +-static char grid3_bits[] = { ++static unsigned char grid3_bits[] = { + 0x00, 0xf0, 0xff, 0x01, 0x00, 0x00, 0x0f, 0x04, 0x1e, 0x00, 0xe0, 0x00, + 0x04, 0xe0, 0x00, 0x98, 0x00, 0x04, 0x20, 0x03, 0x86, 0x00, 0x04, 0x20, + 0x0c, 0x01, 0x01, 0x04, 0x10, 0x10, 0x01, 0x01, 0x04, 0x10, 0x10, 0x02, +diff --git a/src/uipp/prompter/grid4.bm b/src/uipp/prompter/grid4.bm +index 8227875..2b48a36 100644 +--- a/src/uipp/prompter/grid4.bm ++++ b/src/uipp/prompter/grid4.bm +@@ -1,6 +1,6 @@ + #define grid4_width 37 + #define grid4_height 37 +-static char grid4_bits[] = { ++static unsigned char grid4_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x06, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, + 0x00, 0x00, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, +diff --git a/src/uipp/prompter/row_insens.bm b/src/uipp/prompter/row_insens.bm +index 9da9b69..72287a3 100644 +--- a/src/uipp/prompter/row_insens.bm ++++ b/src/uipp/prompter/row_insens.bm +@@ -1,6 +1,6 @@ + #define row_insens_width 20 + #define row_insens_height 20 +-static char row_insens_bits[] = { ++static unsigned char row_insens_bits[] = { + 0x02, 0x81, 0x00, 0x80, 0x40, 0x00, 0x02, 0x81, 0x00, 0x40, 0x20, 0x00, + 0x02, 0x81, 0x00, 0x40, 0x20, 0x00, 0x02, 0x81, 0x00, 0x20, 0x10, 0x00, + 0x02, 0x81, 0x00, 0x20, 0x10, 0x00, 0x02, 0x81, 0x00, 0x10, 0x08, 0x00, +diff --git a/src/uipp/prompter/row_sens.bm b/src/uipp/prompter/row_sens.bm +index b51f400..9c0b278 100644 +--- a/src/uipp/prompter/row_sens.bm ++++ b/src/uipp/prompter/row_sens.bm +@@ -1,6 +1,6 @@ + #define row_sens_width 20 + #define row_sens_height 20 +-static char row_sens_bits[] = { ++static unsigned char row_sens_bits[] = { + 0x82, 0xc1, 0x00, 0x82, 0xc1, 0x00, 0x42, 0xa1, 0x00, 0x42, 0xa1, 0x00, + 0x42, 0xa1, 0x00, 0x42, 0xa1, 0x00, 0x22, 0x91, 0x00, 0x22, 0x91, 0x00, + 0x22, 0x91, 0x00, 0x22, 0x91, 0x00, 0x12, 0x89, 0x00, 0x12, 0x89, 0x00, +diff --git a/src/uipp/widgets/backward.bm b/src/uipp/widgets/backward.bm +index a968c46..a687095 100644 +--- a/src/uipp/widgets/backward.bm ++++ b/src/uipp/widgets/backward.bm +@@ -33,7 +33,7 @@ Initial revision + + #define backward_width 12 + #define backward_height 15 +-static char backward_bits[] = { ++static unsigned char backward_bits[] = { + 0x00, 0x08, 0x00, 0x0e, 0x00, 0x0f, 0xc0, 0x0f, 0xf0, 0x0f, 0xf8, 0x0f, + 0xfe, 0x0f, 0xff, 0x0f, 0xfe, 0x0f, 0xf8, 0x0f, 0xf0, 0x0f, 0xc0, 0x0f, + 0x00, 0x0f, 0x00, 0x0e, 0x00, 0x08 }; +diff --git a/src/uipp/widgets/forward.bm b/src/uipp/widgets/forward.bm +index 40f0626..ae7b5b1 100644 +--- a/src/uipp/widgets/forward.bm ++++ b/src/uipp/widgets/forward.bm +@@ -33,7 +33,7 @@ Initial revision + + #define forward_width 12 + #define forward_height 15 +-static char forward_bits[] = { ++static unsigned char forward_bits[] = { + 0x01, 0x00, 0x07, 0x00, 0x0f, 0x00, 0x3f, 0x00, 0xff, 0x00, 0xff, 0x01, + 0xff, 0x07, 0xff, 0x0f, 0xff, 0x07, 0xff, 0x01, 0xff, 0x00, 0x3f, 0x00, + 0x0f, 0x00, 0x07, 0x00, 0x01, 0x00 }; +diff --git a/src/uipp/widgets/frame.bm b/src/uipp/widgets/frame.bm +index 40dfed3..85e3986 100644 +--- a/src/uipp/widgets/frame.bm ++++ b/src/uipp/widgets/frame.bm +@@ -33,7 +33,7 @@ Initial revision + + #define frame_width 22 + #define frame_height 16 +-static char frame_bits[] = { ++static unsigned char frame_bits[] = { + 0xff, 0xff, 0xff, 0xcc, 0xcc, 0xcc, 0xff, 0xff, 0xff, 0x81, 0x40, 0xe0, + 0x81, 0x40, 0xe0, 0x81, 0x40, 0xe0, 0x81, 0x40, 0xe0, 0x81, 0x40, 0xe0, + 0x81, 0x40, 0xe0, 0x81, 0x40, 0xe0, 0x81, 0x40, 0xe0, 0x81, 0x40, 0xe0, +diff --git a/src/uipp/widgets/loop.bm b/src/uipp/widgets/loop.bm +index 9ffd07c..d28878c 100644 +--- a/src/uipp/widgets/loop.bm ++++ b/src/uipp/widgets/loop.bm +@@ -33,7 +33,7 @@ Initial revision + + #define loop_width 24 + #define loop_height 16 +-static char loop_bits[] = { ++static unsigned char loop_bits[] = { + 0x00, 0x00, 0x00, 0xf0, 0xff, 0x0f, 0xfc, 0xff, 0x3f, 0x1e, 0x00, 0x78, + 0x06, 0x00, 0x60, 0x07, 0x00, 0xe0, 0x03, 0x00, 0xc0, 0x03, 0x00, 0xc0, + 0x03, 0x00, 0xc0, 0x07, 0x00, 0xe0, 0xc6, 0x00, 0x60, 0x9e, 0x03, 0x78, +diff --git a/src/uipp/widgets/palim.bm b/src/uipp/widgets/palim.bm +index 1f7c4a9..1f572c6 100644 +--- a/src/uipp/widgets/palim.bm ++++ b/src/uipp/widgets/palim.bm +@@ -33,7 +33,7 @@ Initial revision + + #define palim_width 24 + #define palim_height 15 +-static char palim_bits[] = { ++static unsigned char palim_bits[] = { + 0x00, 0x00, 0x00, 0xff, 0x03, 0x02, 0xff, 0x07, 0x01, 0x00, 0x8e, 0x00, + 0x18, 0x4c, 0x00, 0x0e, 0x2e, 0x00, 0xff, 0xd7, 0xff, 0xff, 0xeb, 0xff, + 0x0e, 0x74, 0x00, 0x18, 0x32, 0x18, 0x00, 0x71, 0x70, 0x80, 0xe0, 0xff, +diff --git a/src/uipp/widgets/pause.bm b/src/uipp/widgets/pause.bm +index 884183a..b7f41b9 100644 +--- a/src/uipp/widgets/pause.bm ++++ b/src/uipp/widgets/pause.bm +@@ -33,6 +33,6 @@ Initial revision + + #define pause_width 8 + #define pause_height 15 +-static char pause_bits[] = { ++static unsigned char pause_bits[] = { + 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, + 0xe7, 0xe7, 0xe7, 0x00}; +diff --git a/src/uipp/widgets/step.bm b/src/uipp/widgets/step.bm +index 08208f3..ed1d02e 100644 +--- a/src/uipp/widgets/step.bm ++++ b/src/uipp/widgets/step.bm +@@ -33,7 +33,7 @@ Initial revision + + #define step_width 24 + #define step_height 10 +-static char step_bits[] = { ++static unsigned char step_bits[] = { + 0x40, 0x66, 0x02, 0x70, 0x66, 0x0e, 0x78, 0x66, 0x1e, 0x7e, 0x66, 0x7e, + 0x7f, 0x66, 0xfe, 0x7f, 0x66, 0xfe, 0x7e, 0x66, 0x7e, 0x78, 0x66, 0x1e, + 0x70, 0x66, 0x0e, 0x40, 0x66, 0x02}; +diff --git a/src/uipp/widgets/stepb.bm b/src/uipp/widgets/stepb.bm +index 1bd3aac..1cce934 100644 +--- a/src/uipp/widgets/stepb.bm ++++ b/src/uipp/widgets/stepb.bm +@@ -33,7 +33,7 @@ Initial revision + + #define stepb_width 20 + #define stepb_height 15 +-static char stepb_bits[] = { ++static unsigned char stepb_bits[] = { + 0x00, 0xc8, 0x0c, 0x00, 0xce, 0x0c, 0x00, 0xcf, 0x0c, 0xc0, 0xcf, 0x0c, + 0xf0, 0xcf, 0x0c, 0xf8, 0xcf, 0x0c, 0xfe, 0xcf, 0x0c, 0xff, 0xcf, 0x0c, + 0xfe, 0xcf, 0x0c, 0xf8, 0xcf, 0x0c, 0xf0, 0xcf, 0x0c, 0xc0, 0xcf, 0x0c, +diff --git a/src/uipp/widgets/stepf.bm b/src/uipp/widgets/stepf.bm +index 6bd05b6..07cef57 100644 +--- a/src/uipp/widgets/stepf.bm ++++ b/src/uipp/widgets/stepf.bm +@@ -33,7 +33,7 @@ Initial revision + + #define stepf_width 20 + #define stepf_height 15 +-static char stepf_bits[] = { ++static unsigned char stepf_bits[] = { + 0x33, 0x01, 0x00, 0x33, 0x07, 0x00, 0x33, 0x0f, 0x00, 0x33, 0x3f, 0x00, + 0x33, 0xff, 0x00, 0x33, 0xff, 0x01, 0x33, 0xff, 0x07, 0x33, 0xff, 0x0f, + 0x33, 0xff, 0x07, 0x33, 0xff, 0x01, 0x33, 0xff, 0x00, 0x33, 0x3f, 0x00, +diff --git a/src/uipp/widgets/stop.bm b/src/uipp/widgets/stop.bm +index 12e7a6b..7a9f4b1 100644 +--- a/src/uipp/widgets/stop.bm ++++ b/src/uipp/widgets/stop.bm +@@ -33,6 +33,6 @@ Initial revision + + #define stop_width 10 + #define stop_height 10 +-static char stop_bits[] = { ++static unsigned char stop_bits[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; +-- +2.9.3 + diff --git a/0009-gcc7.0-compatibility.patch b/0009-gcc7.0-compatibility.patch new file mode 100644 index 0000000..80950fc --- /dev/null +++ b/0009-gcc7.0-compatibility.patch @@ -0,0 +1,25 @@ +From 02f24798d0f51ffae3e3d75522a4d5924f0b2309 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Wed, 15 Feb 2017 10:17:20 +0100 +Subject: [PATCH 9/9] gcc7.0 compatibility + +--- + src/uipp/dxuilib/EditorWindow.C | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/uipp/dxuilib/EditorWindow.C b/src/uipp/dxuilib/EditorWindow.C +index c406cc1..35c4682 100644 +--- a/src/uipp/dxuilib/EditorWindow.C ++++ b/src/uipp/dxuilib/EditorWindow.C +@@ -5997,7 +5997,7 @@ char msg[128]; + // + const char *tmpdir = theDXApplication->getTmpDirectory(); + int tmpdirlen = STRLEN(tmpdir); +- if (!tmpdirlen) return FALSE; ++ if (!tmpdirlen) return 0; + if (tmpdir[tmpdirlen-1] == '/') { + sprintf(netfilename, "%sdx%d.net", tmpdir, getpid()); + sprintf(cfgfilename, "%sdx%d.cfg", tmpdir, getpid()); +-- +2.9.3 + diff --git a/dx-errno.patch b/dx-errno.patch deleted file mode 100644 index 70c1b28..0000000 --- a/dx-errno.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up dx-4.4.4/src/exec/dpexec/lex.c.errno dx-4.4.4/src/exec/dpexec/lex.c ---- dx-4.4.4/src/exec/dpexec/lex.c.errno 2006-01-09 23:57:34.000000000 +0100 -+++ dx-4.4.4/src/exec/dpexec/lex.c 2009-01-26 19:16:20.000000000 +0100 -@@ -504,6 +504,7 @@ int yylex(YYSTYPE *lvalp) - for (;;) - { - yyleng = 0; -+ errno = 0; - - c = input(); - diff --git a/dx-format-security.patch b/dx-format-security.patch deleted file mode 100644 index 322a9bb..0000000 --- a/dx-format-security.patch +++ /dev/null @@ -1,244 +0,0 @@ -diff -up dx-4.4.4/src/exec/dpexec/dxmain.c.format-security dx-4.4.4/src/exec/dpexec/dxmain.c ---- dx-4.4.4/src/exec/dpexec/dxmain.c.format-security 2006-05-08 18:20:03.000000000 +0200 -+++ dx-4.4.4/src/exec/dpexec/dxmain.c 2014-02-27 16:15:07.355502827 +0100 -@@ -2129,7 +2129,7 @@ int ExCheckInput () - if ((SFILEisatty(yyin) || (_dxd_exRshInput && yyin == _dxd_exBaseFD)) && - !prompted && _dxf_ExGQAllDone() && !SFILECharReady(yyin)) { - prompt = _dxf_ExPromptGet(PROMPT_ID_PROMPT); -- printf (prompt? prompt: EX_PROMPT); -+ printf ("%s", prompt? prompt: EX_PROMPT); - fflush (stdout); - prompted = TRUE; - } -@@ -2305,7 +2305,7 @@ static int ExInputAvailable (SFILE *fp) - _dxf_ExGQAllDone ())\ - {\ - prompt = _dxf_ExPromptGet (PROMPT_ID_PROMPT);\ -- printf (prompt ? prompt : EX_PROMPT);\ -+ printf ("%s", prompt ? prompt : EX_PROMPT);\ - fflush (stdout);\ - prompted = TRUE;\ - }\ -diff -up dx-4.4.4/src/exec/dpexec/lex.c.format-security dx-4.4.4/src/exec/dpexec/lex.c ---- dx-4.4.4/src/exec/dpexec/lex.c.format-security 2014-02-27 16:15:07.352502818 +0100 -+++ dx-4.4.4/src/exec/dpexec/lex.c 2014-02-27 16:15:07.355502827 +0100 -@@ -649,7 +649,7 @@ int yylex(YYSTYPE *lvalp) - if ((_dxd_exIsatty || _dxd_exRshInput) && !SFILECharReady(yyin)) - { - prompt = _dxf_ExPromptGet(PROMPT_ID_CPROMPT); -- printf (prompt? prompt: EX_CPROMPT); -+ printf ("%s",prompt? prompt: EX_CPROMPT); - fflush (stdout); - } - break; -diff -up dx-4.4.4/src/exec/dxmods/colormap.c.format-security dx-4.4.4/src/exec/dxmods/colormap.c ---- dx-4.4.4/src/exec/dxmods/colormap.c.format-security 2002-03-21 18:09:58.000000000 +0100 -+++ dx-4.4.4/src/exec/dxmods/colormap.c 2014-02-27 16:15:07.356502830 +0100 -@@ -1167,7 +1167,7 @@ Error print_map(Field f,char *component, - if (!ei.msgbuf) - return ERROR; - ei.mp = ei.msgbuf; -- sprintf(ei.mp,name); while(*ei.mp) ei.mp++; -+ sprintf("%s",ei.mp,name); while(*ei.mp) ei.mp++; - sprintf(ei.mp, "NULL"); - DXUIMessage(id,ei.msgbuf); - DXFree(ei.msgbuf); -@@ -1186,7 +1186,7 @@ Error print_map(Field f,char *component, - ei.mp = ei.msgbuf; - shape[0]=2; - strcpy(ei.mp,""); -- sprintf(ei.mp,name); while(*ei.mp) ei.mp++; -+ sprintf("%s",ei.mp,name); while(*ei.mp) ei.mp++; - if (num==1){ - sprintf(ei.mp,"{"); ei.mp++; - } -diff -up dx-4.4.4/src/exec/dxmods/exp_gai.c.format-security dx-4.4.4/src/exec/dxmods/exp_gai.c ---- dx-4.4.4/src/exec/dxmods/exp_gai.c.format-security 2000-08-24 22:04:29.000000000 +0200 -+++ dx-4.4.4/src/exec/dxmods/exp_gai.c 2014-02-27 16:15:07.356502830 +0100 -@@ -422,7 +422,7 @@ static Error pvalue(struct array_info *a - if (first == ON) - first = OFF; - else -- fprintf(h->dfp,del); -+ fprintf(h->dfp,"%s",del); - if (blank == ON) - pblank(arinfo,h); - else -@@ -439,7 +439,7 @@ static Error pvalue(struct array_info *a - if (first == ON) - first = OFF; - else -- fprintf(h->dfp,del); -+ fprintf(h->dfp,"%s",del); - if (blank == ON) - pblank(arinfo,h); - else -@@ -456,7 +456,7 @@ static Error pvalue(struct array_info *a - if (first == ON) - first = OFF; - else -- fprintf(h->dfp,del); -+ fprintf(h->dfp,"%s",del); - if (blank == ON) - pblank(arinfo,h); - else -@@ -473,7 +473,7 @@ static Error pvalue(struct array_info *a - if (first == ON) - first = OFF; - else -- fprintf(h->dfp,del); -+ fprintf(h->dfp,"%s",del); - if (blank == ON) - pblank(arinfo,h); - else -@@ -490,7 +490,7 @@ static Error pvalue(struct array_info *a - if (first == ON) - first = OFF; - else -- fprintf(h->dfp,del); -+ fprintf(h->dfp,"%s",del); - if (blank == ON) - pblank(arinfo,h); - else -@@ -507,7 +507,7 @@ static Error pvalue(struct array_info *a - if (first == ON) - first = OFF; - else -- fprintf(h->dfp,del); -+ fprintf(h->dfp,"%s",del); - if (blank == ON) - pblank(arinfo,h); - else -@@ -524,7 +524,7 @@ static Error pvalue(struct array_info *a - if (first == ON) - first = OFF; - else -- fprintf(h->dfp,del); -+ fprintf(h->dfp,"%s",del); - if (blank == ON) - pblank(arinfo,h); - else -@@ -541,7 +541,7 @@ static Error pvalue(struct array_info *a - if (first == ON) - first = OFF; - else -- fprintf(h->dfp,del); -+ fprintf(h->dfp,"%s",del); - if (blank == ON) - pblank(arinfo,h); - else -@@ -554,7 +554,7 @@ static Error pvalue(struct array_info *a - arinfo->last,scratch); - arinfo->last = (Pointer)nextstr; - if (first == OFF) -- fprintf(h->dfp,del); -+ fprintf(h->dfp,"%s",del); - if (blank == ON) - pblank(arinfo,h); - else { -@@ -830,7 +830,7 @@ static void field_header(Field f,struct - if (rank > 0) { - for (i=0; i 0) -- fprintf(h->dfp,del); -+ fprintf(h->dfp,"%s",del); - fprintf(h->dfp,"positions_cmp%d",i); - } - } -@@ -845,13 +845,13 @@ static void field_header(Field f,struct - !strcmp("positions",depon) && strcmp("invalid positions",name) - && strcmp("positions",name) ) { - if (first == OFF) -- fprintf(h->dfp,del); -+ fprintf(h->dfp,"%s",del); - DXGetArrayInfo((Array)a,NULL,&type,NULL,&rank,shape); - /* dim = (rank < 1) ? 1 : shape[0]; */ - if (type != TYPE_STRING && rank > 0 && shape[0] > 1) { - cmp = (char *)DXAllocate(strlen(name)+6); - for (j=0; j 0) fprintf(h->dfp, del); -+ if (j > 0) fprintf(h->dfp, "%s", del); - sprintf(cmp,"%s_cmp%d",name,j); - pstring(h->dfp,0,0,0,cmp); - } -diff -up dx-4.4.4/src/uipp/dxl/conn.c.format-security dx-4.4.4/src/uipp/dxl/conn.c ---- dx-4.4.4/src/uipp/dxl/conn.c.format-security 2006-05-08 18:20:08.000000000 +0200 -+++ dx-4.4.4/src/uipp/dxl/conn.c 2014-02-27 16:17:28.677913252 +0100 -@@ -389,7 +389,7 @@ DXLStartChild(const char *string, const - char buf[2048]; - int n = read(err,buf,2048); - buf[n] = '\0'; -- fprintf(stderr,buf); -+ fprintf(stderr,"%s",buf); - } - #if defined(intelnt) || defined(WIN32) - TerminateProcess(child, -1); -diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.C.format-security dx-4.4.4/src/uipp/dxuilib/DXApplication.C ---- dx-4.4.4/src/uipp/dxuilib/DXApplication.C.format-security 2014-02-27 16:15:07.350502812 +0100 -+++ dx-4.4.4/src/uipp/dxuilib/DXApplication.C 2014-02-27 16:15:07.356502830 +0100 -@@ -2553,7 +2553,7 @@ boolean DXApplication::initialize(int* a - const char* errmsg = - GraphLayout::SetHeightPerLevel (DXApplication::resource.autoLayoutHeight); - if (errmsg) { -- fprintf (stderr, errmsg); -+ fprintf (stderr, "%s", errmsg); - return FALSE; - } - } -@@ -2561,7 +2561,7 @@ boolean DXApplication::initialize(int* a - const char* errmsg = - GraphLayout::SetGroupSpacing (DXApplication::resource.autoLayoutGroupSpacing); - if (errmsg) { -- fprintf (stderr, errmsg); -+ fprintf (stderr, "%s", errmsg); - return FALSE; - } - } -@@ -2569,7 +2569,7 @@ boolean DXApplication::initialize(int* a - const char* errmsg = - GraphLayout::SetNodeSpacing (DXApplication::resource.autoLayoutNodeSpacing); - if (errmsg) { -- fprintf (stderr, errmsg); -+ fprintf (stderr, "%s", errmsg); - return FALSE; - } - } -@@ -3787,7 +3787,7 @@ error: - if (this->anchor) - InfoMessage(msg); - else -- fprintf(stderr,msg); -+ fprintf(stderr,"%s",msg); - - return NULL; - } -@@ -5019,7 +5019,7 @@ DXApplication_HandleCoreDump(int dummy) - fprintf (stderr, "Attempting to save any modified files.\n" - "Please check saved files for integrity by reloading them.\n"); - theDXApplication->emergencySave (msg); -- fprintf (stderr, msg); -+ fprintf (stderr, "%s", msg); - } - - fprintf(stderr,"The application will now abort.\n"); -@@ -5035,7 +5035,7 @@ void DXApplication::abortApplication() - if (theDXApplication) { - char msg[4096]; - this->emergencySave(msg); -- fprintf(stderr, msg); -+ fprintf(stderr, "%s", msg); - } - - this->IBMApplication::abortApplication(); -diff -up dx-4.4.4/src/uipp/dxui/SelectionNode.C.format-security dx-4.4.4/src/uipp/dxui/SelectionNode.C ---- dx-4.4.4/src/uipp/dxui/SelectionNode.C.format-security 2002-03-25 17:42:08.000000000 +0100 -+++ dx-4.4.4/src/uipp/dxui/SelectionNode.C 2014-02-27 16:18:57.348170781 +0100 -@@ -960,7 +960,7 @@ boolean SelectionNode::printJavaValue (F - ListIterator it(selection_stmts); - char* cp; - while ( (cp = (char*)it.getNext()) ) { -- fprintf (jf, cp); -+ fprintf (jf, "%s", cp); - delete cp; - } - } diff --git a/dx-gcc43.patch b/dx-gcc43.patch deleted file mode 100644 index 64a3d91..0000000 --- a/dx-gcc43.patch +++ /dev/null @@ -1,315 +0,0 @@ -diff -up dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.C ---- dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43 2005-11-10 20:48:22.000000000 +0100 -+++ dx-4.4.4/src/uipp/startup/StartupApplication.C 2008-01-07 21:55:03.000000000 +0100 -@@ -117,7 +117,7 @@ InitializeSignals(void) - #endif - } - --boolean StartupApplication::initialize(unsigned int* argcp, -+boolean StartupApplication::initialize(int* argcp, - char** argv) - { - ASSERT(argcp); -diff -up dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.h ---- dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43 2003-09-20 07:33:56.000000000 +0200 -+++ dx-4.4.4/src/uipp/startup/StartupApplication.h 2008-01-07 21:50:47.000000000 +0100 -@@ -84,7 +84,7 @@ class StartupApplication : public IBMApp - // Overrides the Application class version: - // Initializes Xt Intrinsics with option list (switches). - // -- virtual boolean initialize(unsigned int* argcp, char**argv); -+ virtual boolean initialize(int* argcp, char**argv); - - CommandScope *commandScope; // command scope - -diff -up dx-4.4.4/src/uipp/startup/Main.C.gcc43 dx-4.4.4/src/uipp/startup/Main.C ---- dx-4.4.4/src/uipp/startup/Main.C.gcc43 2000-05-16 20:53:07.000000000 +0200 -+++ dx-4.4.4/src/uipp/startup/Main.C 2008-01-07 19:57:58.000000000 +0100 -@@ -14,7 +14,7 @@ - extern "C" void HCLXmInit(); - #endif - --int main(unsigned int argc, -+int main( int argc, - char** argv) - { - #if defined(HAVE_HCLXMINIT) -diff -up dx-4.4.4/src/uipp/base/Application.C.gcc43 dx-4.4.4/src/uipp/base/Application.C ---- dx-4.4.4/src/uipp/base/Application.C.gcc43 2005-11-09 19:56:17.000000000 +0100 -+++ dx-4.4.4/src/uipp/base/Application.C 2008-01-07 22:39:15.000000000 +0100 -@@ -136,7 +136,7 @@ void Application::installDefaultResource - //this->setDefaultResources(baseWidget, Application::DefaultResources); - } - --boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv) -+boolean Application::initializeWindowSystem(int *argcp, char **argv) - { - - // -@@ -149,7 +149,7 @@ boolean Application::initializeWindowSys - NULL, // command line options table - 0, // number of entries in options table - #if XtSpecificationRelease > 4 -- (int*)argcp, -+ argcp, - #else - argcp, - #endif -@@ -235,7 +235,7 @@ boolean Application::initializeWindowSys - return TRUE; - } - --void Application::parseCommand(unsigned int* argcp, char** argv, -+void Application::parseCommand(int* argcp, char** argv, - XrmOptionDescList optlist, int optlistsize) - { - char res_file[256]; -@@ -280,7 +280,7 @@ void Application::parseCommand(unsigned - // - } - --boolean Application::initialize(unsigned int* argcp, char** argv) -+boolean Application::initialize(int* argcp, char** argv) - { - // - // Initialize the window system if not done already. -diff -up dx-4.4.4/src/uipp/base/Application.h.gcc43 dx-4.4.4/src/uipp/base/Application.h ---- dx-4.4.4/src/uipp/base/Application.h.gcc43 2005-11-09 19:26:29.000000000 +0100 -+++ dx-4.4.4/src/uipp/base/Application.h 2008-01-07 21:49:49.000000000 +0100 -@@ -49,7 +49,7 @@ class Application : public UIComponent, - // - // The main program needs to access protected member functions. - // -- friend int main(unsigned int argc, -+ friend int main( int argc, - char** argv); - - -@@ -71,9 +71,9 @@ class Application : public UIComponent, - // - // Initialize the window system. - // -- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv); -+ virtual boolean initializeWindowSystem(int *argcp, char **argv); - -- virtual void parseCommand(unsigned int* argcp, char** argv, -+ virtual void parseCommand(int* argcp, char** argv, - XrmOptionDescList optlist, int optlistsize); - - // -@@ -145,7 +145,7 @@ class Application : public UIComponent, - // Initializes any Application specfic state. This routine should - // be called by main() or subclasses only. - // -- virtual boolean initialize(unsigned int* argcp, char** argv); -+ virtual boolean initialize(int* argcp, char** argv); - - // - // Allow others to access our event processing mechanism -diff -up dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.C ---- dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43 2004-04-02 22:32:43.000000000 +0200 -+++ dx-4.4.4/src/uipp/base/IBMApplication.C 2008-01-07 21:53:29.000000000 +0100 -@@ -349,7 +349,7 @@ int status; - } - - --boolean IBMApplication::initializeWindowSystem(unsigned int *argcp, char **argv) -+boolean IBMApplication::initializeWindowSystem(int *argcp, char **argv) - { - - if (!this->Application::initializeWindowSystem(argcp, argv)) -@@ -375,7 +375,7 @@ boolean IBMApplication::initializeWindow - return TRUE; - } - --boolean IBMApplication::initialize(unsigned int* argcp, -+boolean IBMApplication::initialize(int* argcp, - char** argv) - { - if (!this->Application::initialize(argcp,argv)) -diff -up dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.h ---- dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43 2003-09-20 07:35:22.000000000 +0200 -+++ dx-4.4.4/src/uipp/base/IBMApplication.h 2008-01-07 21:50:19.000000000 +0100 -@@ -77,7 +77,7 @@ class IBMApplication : public Applicatio - // - // Initialize the window system. - // -- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv); -+ virtual boolean initializeWindowSystem(int *argcp, char **argv); - - // - // Protected member data: -@@ -88,7 +88,7 @@ class IBMApplication : public Applicatio - - HelpWin *helpWindow; - -- boolean initialize(unsigned int* argcp, char** argv); -+ boolean initialize(int* argcp, char** argv); - - // - // Load application specific action routines -diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.h ---- dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43 1999-05-10 17:46:30.000000000 +0200 -+++ dx-4.4.4/src/uipp/tutor/TutorApplication.h 2008-01-07 21:49:29.000000000 +0100 -@@ -69,7 +69,7 @@ class TutorApplication : public IBMAppli - // Overrides the Application class version: - // Initializes Xt Intrinsics with option list (switches). - // -- virtual boolean initialize(unsigned int* argcp, -+ virtual boolean initialize(int* argcp, - char** argv); - - // -diff -up dx-4.4.4/src/uipp/tutor/Main.C.gcc43 dx-4.4.4/src/uipp/tutor/Main.C ---- dx-4.4.4/src/uipp/tutor/Main.C.gcc43 2000-05-16 20:53:15.000000000 +0200 -+++ dx-4.4.4/src/uipp/tutor/Main.C 2008-01-07 19:57:39.000000000 +0100 -@@ -31,7 +31,7 @@ extern "C" void HCLXmInit(); - // - const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n"; - --int main(unsigned int argc, -+int main( int argc, - char** argv) - { - #if defined(HAVE_HCLXMINIT) -diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.C ---- dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43 2006-05-08 18:20:14.000000000 +0200 -+++ dx-4.4.4/src/uipp/tutor/TutorApplication.C 2008-01-07 21:56:09.000000000 +0100 -@@ -196,7 +196,7 @@ InitializeSignals(void) - #endif - } - --boolean TutorApplication::initialize(unsigned int* argcp, -+boolean TutorApplication::initialize(int* argcp, - char** argv) - { - ASSERT(argcp); -diff -up dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 dx-4.4.4/src/uipp/widgets/MultiText.h ---- dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 2006-01-03 01:12:34.000000000 +0100 -+++ dx-4.4.4/src/uipp/widgets/MultiText.h 2008-01-07 19:06:27.000000000 +0100 -@@ -91,7 +91,7 @@ typedef struct _XmMultiTextClassRec* XmM - #define XmNsmoothScroll "smoothScroll" - #define XmNwaitCursorCount "waitCursorCount" - --#if !(defined(_Xm_h) || defined(XM_H)) -+#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H)) - #define XmNmarginHeight "marginHeight" - #define XmNmarginWidth "marginWidth" - #define XmNwordWrap "wordWrap" -@@ -109,7 +109,7 @@ typedef struct _XmMultiTextClassRec* XmM - #define XmCSmoothScroll "SmoothScroll" - #define XmCWaitCursorCount "WaitCursorCount" - --#if !(defined(_Xm_h) || defined(XM_H)) -+#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H)) - #define XmCMarginHeight "MarginHeight" - #define XmCMarginWidth "MarginWidth" - #define XmCWordWrap "WordWrap" -diff -up dx-4.4.4/src/uipp/dxui/Main.C.gcc43 dx-4.4.4/src/uipp/dxui/Main.C ---- dx-4.4.4/src/uipp/dxui/Main.C.gcc43 2005-12-07 18:50:53.000000000 +0100 -+++ dx-4.4.4/src/uipp/dxui/Main.C 2008-01-07 19:57:21.000000000 +0100 -@@ -48,7 +48,7 @@ extern unsigned long _etext; - // - const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n"; - --int main(unsigned int argc, -+int main( int argc, - char** argv) - { - #if defined(HAVE_HCLXMINIT) -diff -up dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.h ---- dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43 2003-09-20 07:33:21.000000000 +0200 -+++ dx-4.4.4/src/uipp/prompter/GARApplication.h 2008-01-07 21:49:05.000000000 +0100 -@@ -129,7 +129,7 @@ class GARApplication : public IBMApplica - // Overrides the Application class version: - // Initializes Xt Intrinsics with option list (switches). - // -- virtual boolean initialize(unsigned int* argcp, -+ virtual boolean initialize(int* argcp, - char** argv); - - CommandScope *commandScope; // command scope -diff -up dx-4.4.4/src/uipp/prompter/Main.C.gcc43 dx-4.4.4/src/uipp/prompter/Main.C ---- dx-4.4.4/src/uipp/prompter/Main.C.gcc43 2000-05-16 20:52:59.000000000 +0200 -+++ dx-4.4.4/src/uipp/prompter/Main.C 2008-01-07 19:57:01.000000000 +0100 -@@ -17,7 +17,7 @@ extern "C" void HCLXmInit(); - #endif - - --int main(unsigned int argc, -+int main( int argc, - char** argv) - { - #if defined(HAVE_HCLXMINIT) -diff -up dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.C ---- dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43 2006-05-08 18:20:13.000000000 +0200 -+++ dx-4.4.4/src/uipp/prompter/GARApplication.C 2008-01-07 21:54:28.000000000 +0100 -@@ -198,7 +198,7 @@ InitializeSignals(void) - } - } - --boolean GARApplication::initialize(unsigned int* argcp, -+boolean GARApplication::initialize(int* argcp, - char** argv) - { - ASSERT(argcp); -diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.h ---- dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43 2006-05-08 18:20:10.000000000 +0200 -+++ dx-4.4.4/src/uipp/dxuilib/DXApplication.h 2008-01-07 21:14:12.000000000 +0100 -@@ -372,7 +372,7 @@ class DXApplication : public IBMApplicat - // Overrides the Application class version: - // Initializes Xt Intrinsics with option list (switches). - // -- virtual boolean initialize(unsigned int* argcp, -+ virtual boolean initialize(int* argcp, - char** argv); - - // -diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.C ---- dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43 2006-06-22 21:45:34.000000000 +0200 -+++ dx-4.4.4/src/uipp/dxuilib/DXApplication.C 2008-01-07 21:32:56.000000000 +0100 -@@ -2248,7 +2248,7 @@ void DXApplication::installDefaultResour - this->setDefaultResources(baseWidget, _defaultDXResources); - this->IBMApplication::installDefaultResources(baseWidget); - } --boolean DXApplication::initialize(unsigned int* argcp, -+boolean DXApplication::initialize(int* argcp, - char** argv) - { - boolean wasSetBusy = FALSE; -diff -up dx-4.4.4/src/uipp/mb/Main.C.gcc43 dx-4.4.4/src/uipp/mb/Main.C ---- dx-4.4.4/src/uipp/mb/Main.C.gcc43 2000-05-20 19:49:40.000000000 +0200 -+++ dx-4.4.4/src/uipp/mb/Main.C 2008-01-07 19:56:41.000000000 +0100 -@@ -22,7 +22,7 @@ extern "C" void HCLXmInit(); - // - const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n"; - --int main(unsigned int argc, -+int main( int argc, - char** argv) - { - #if defined(HAVE_HCLXMINIT) -diff -up dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.C ---- dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43 2006-05-08 18:20:13.000000000 +0200 -+++ dx-4.4.4/src/uipp/mb/MBApplication.C 2008-01-07 21:51:15.000000000 +0100 -@@ -117,7 +117,7 @@ InitializeSignals(void) - #endif - } - --boolean MBApplication::initialize(unsigned int* argcp, -+boolean MBApplication::initialize(int* argcp, - char** argv) - { - ASSERT(argcp); -diff -up dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.h ---- dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43 1999-05-10 17:46:25.000000000 +0200 -+++ dx-4.4.4/src/uipp/mb/MBApplication.h 2008-01-07 21:48:38.000000000 +0100 -@@ -51,7 +51,7 @@ class MBApplication : public IBMApplicat - // Overrides the Application class version: - // Initializes Xt Intrinsics with option list (switches). - // -- virtual boolean initialize(unsigned int* argcp, -+ virtual boolean initialize(int* argcp, - char** argv); - - static MBResource resource; diff --git a/dx-magick.patch b/dx-magick.patch deleted file mode 100644 index f65671e..0000000 --- a/dx-magick.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up dx-4.4.4/src/exec/dxmods/_im_image.c.link dx-4.4.4/src/exec/dxmods/_im_image.c ---- dx-4.4.4/src/exec/dxmods/_im_image.c.link 2006-01-05 23:55:43.000000000 +0100 -+++ dx-4.4.4/src/exec/dxmods/_im_image.c 2010-02-26 21:48:27.000000000 +0100 -@@ -328,9 +328,6 @@ static Error write_im(RWImageArgs *iargs - DestroyImage(image); - DestroyImageInfo(new_frame_info); - DestroyImageInfo(image_info); --#if MagickLibVersion > 0x0537 -- DestroyConstitute(); --#endif - DXSetError(ERROR_INTERNAL, "reason = %s, description = %s", - image->exception.reason, - image->exception.description); -@@ -345,9 +342,6 @@ static Error write_im(RWImageArgs *iargs - DestroyImage(image); - DestroyImageInfo(new_frame_info); - DestroyImageInfo(image_info); --#if MagickLibVersion > 0x0537 -- DestroyConstitute(); --#endif - DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c"); - } - -@@ -374,9 +368,6 @@ static Error write_im(RWImageArgs *iargs - DestroyImage(image); - DestroyImageInfo(image_info); - DestroyImageInfo(new_frame_info); --#if MagickLibVersion > 0x0537 -- DestroyConstitute(); --#endif - - DEBUGMESSAGE("back from DestroyImage"); - -@@ -490,9 +481,6 @@ static Error write_im(RWImageArgs *iargs - DXFree(copycolors); - DestroyImage(image); - DestroyImageInfo(image_info); --#if MagickLibVersion > 0x0537 -- DestroyConstitute(); --#endif - } - return (OK); - #else /* ndef HAVE_LIBMAGICK */ diff --git a/dx-narrowing.patch b/dx-narrowing.patch deleted file mode 100644 index d3f4070..0000000 --- a/dx-narrowing.patch +++ /dev/null @@ -1,499 +0,0 @@ -From dbb15f15d3dc03748780f642a4b3e0882d2a1b2c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Wed, 17 Feb 2016 15:20:27 +0100 -Subject: [PATCH] dx-narrowing - ---- - src/uipp/base/TreeView.C | 4 ++-- - src/uipp/base/minus.bm | 2 +- - src/uipp/base/plus.bm | 2 +- - src/uipp/dxuilib/AutoAxesDialog.C | 8 ++++---- - src/uipp/dxuilib/DXWindow.C | 2 +- - src/uipp/dxuilib/PageTab.C | 4 ++-- - src/uipp/dxuilib/VPEPostIt.C | 2 +- - src/uipp/dxuilib/anchor.bm | 2 +- - src/uipp/dxuilib/anim_mask.bm | 2 +- - src/uipp/dxuilib/animation.bm | 2 +- - src/uipp/dxuilib/pagedrag.bm | 2 +- - src/uipp/dxuilib/pagedragmask.bm | 2 +- - src/uipp/dxuilib/postit.bm | 2 +- - src/uipp/dxuilib/ticks_in.bm | 2 +- - src/uipp/dxuilib/ticks_in_ins.bm | 2 +- - src/uipp/dxuilib/ticks_out.bm | 2 +- - src/uipp/dxuilib/ticks_out_ins.bm | 2 +- - src/uipp/prompter/col_insens.bm | 2 +- - src/uipp/prompter/col_sens.bm | 2 +- - src/uipp/prompter/grid1.bm | 2 +- - src/uipp/prompter/grid2.bm | 2 +- - src/uipp/prompter/grid3.bm | 2 +- - src/uipp/prompter/grid4.bm | 2 +- - src/uipp/prompter/row_insens.bm | 2 +- - src/uipp/prompter/row_sens.bm | 2 +- - src/uipp/widgets/backward.bm | 2 +- - src/uipp/widgets/forward.bm | 2 +- - src/uipp/widgets/frame.bm | 2 +- - src/uipp/widgets/loop.bm | 2 +- - src/uipp/widgets/palim.bm | 2 +- - src/uipp/widgets/pause.bm | 2 +- - src/uipp/widgets/step.bm | 2 +- - src/uipp/widgets/stepb.bm | 2 +- - src/uipp/widgets/stepf.bm | 2 +- - src/uipp/widgets/stop.bm | 2 +- - 35 files changed, 40 insertions(+), 40 deletions(-) - -diff --git a/src/uipp/base/TreeView.C b/src/uipp/base/TreeView.C -index 8538be5..b7377c5 100644 ---- a/src/uipp/base/TreeView.C -+++ b/src/uipp/base/TreeView.C -@@ -316,9 +316,9 @@ void TreeView::paint() - } - - if (TreeView::Plus == XmUNSPECIFIED_PIXMAP) { -- TreeView::Plus = XCreatePixmapFromBitmapData(d,win,plus_bits,plus_width, -+ TreeView::Plus = XCreatePixmapFromBitmapData(d,win,(char*)plus_bits,plus_width, - plus_height,this->line_color,bg,depth); -- TreeView::Minus = XCreatePixmapFromBitmapData(d,win,minus_bits,minus_width, -+ TreeView::Minus = XCreatePixmapFromBitmapData(d,win,(char*)minus_bits,minus_width, - minus_height,this->line_color,bg,depth); - } - -diff --git a/src/uipp/base/minus.bm b/src/uipp/base/minus.bm -index 3312035..96d04fe 100644 ---- a/src/uipp/base/minus.bm -+++ b/src/uipp/base/minus.bm -@@ -1,6 +1,6 @@ - #define minus_width 12 - #define minus_height 14 --static char minus_bits[] = { -+static unsigned char minus_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0xfe, 0x0f, 0x02, 0x08, 0x02, 0x08, 0x02, 0x08, - 0x02, 0x08, 0xfa, 0x0b, 0x02, 0x08, 0x02, 0x08, 0x02, 0x08, 0x02, 0x08, - 0xfe, 0x0f, 0x00, 0x00}; -diff --git a/src/uipp/base/plus.bm b/src/uipp/base/plus.bm -index cb3a87b..0af5f3d 100644 ---- a/src/uipp/base/plus.bm -+++ b/src/uipp/base/plus.bm -@@ -1,6 +1,6 @@ - #define plus_width 12 - #define plus_height 14 --static char plus_bits[] = { -+static unsigned char plus_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0xfe, 0x0f, 0x02, 0x08, 0x42, 0x08, 0x42, 0x08, - 0x42, 0x08, 0xfa, 0x0b, 0x42, 0x08, 0x42, 0x08, 0x42, 0x08, 0x02, 0x08, - 0xfe, 0x0f, 0x00, 0x00}; -diff --git a/src/uipp/dxuilib/AutoAxesDialog.C b/src/uipp/dxuilib/AutoAxesDialog.C -index 0d5f1f4..95097a0 100644 ---- a/src/uipp/dxuilib/AutoAxesDialog.C -+++ b/src/uipp/dxuilib/AutoAxesDialog.C -@@ -1791,16 +1791,16 @@ AutoAxesDialog::AutoAxesDialog(ImageWindow* image) : - XmNdepth, &depth, XmNscreen, &scr, NULL); - Pixel fg = BlackPixelOfScreen(scr); - AutoAxesDialog::TicksIn = XCreatePixmapFromBitmapData (XtDisplay(root), -- XtWindow(root), ticks_in_bits, ticks_in_width, ticks_in_height, -+ XtWindow(root), (char*) ticks_in_bits, ticks_in_width, ticks_in_height, - fg, bg, depth); - AutoAxesDialog::TicksOut = XCreatePixmapFromBitmapData (XtDisplay(root), -- XtWindow(root), ticks_out_bits, ticks_out_width, ticks_out_height, -+ XtWindow(root), (char*) ticks_out_bits, ticks_out_width, ticks_out_height, - fg, bg, depth); - AutoAxesDialog::TicksInGrey = XCreatePixmapFromBitmapData (XtDisplay(root), -- XtWindow(root), ticks_in_ins_bits, ticks_in_ins_width, ticks_in_ins_height, -+ XtWindow(root), (char*) ticks_in_ins_bits, ticks_in_ins_width, ticks_in_ins_height, - fg, bg, depth); - AutoAxesDialog::TicksOutGrey = XCreatePixmapFromBitmapData (XtDisplay(root), -- XtWindow(root),ticks_out_ins_bits, ticks_out_ins_width, ticks_out_ins_height, -+ XtWindow(root), (char*) ticks_out_ins_bits, ticks_out_ins_width, ticks_out_ins_height, - fg, bg, depth); - - -diff --git a/src/uipp/dxuilib/DXWindow.C b/src/uipp/dxuilib/DXWindow.C -index a5e6bcb..cbee6df 100644 ---- a/src/uipp/dxuilib/DXWindow.C -+++ b/src/uipp/dxuilib/DXWindow.C -@@ -245,7 +245,7 @@ void DXWindow::createAnchor(boolean addPixmap) - XCreatePixmapFromBitmapData - (XtDisplay(this->menuBar), - wind, -- anchor_bits, -+ (char*) anchor_bits, - anchor_width, - anchor_height, - foreground, -diff --git a/src/uipp/dxuilib/PageTab.C b/src/uipp/dxuilib/PageTab.C -index 3561991..5e717e4 100644 ---- a/src/uipp/dxuilib/PageTab.C -+++ b/src/uipp/dxuilib/PageTab.C -@@ -96,9 +96,9 @@ void PageTab::createButton (Widget p) - PageTab::DragIcon = this->createDragIcon(pagedrag_width, pagedrag_height, - (char *)pagedrag_bits, (char *)pagedragmask_bits); - PageTab::AnimationPixmap = XCreateBitmapFromData(XtDisplay(p), -- XtWindow(p), animation_bits, animation_width, animation_height); -+ XtWindow(p), (char*)animation_bits, animation_width, animation_height); - PageTab::AnimationMaskPixmap = XCreateBitmapFromData(XtDisplay(p), -- XtWindow(p), anim_mask_bits, anim_mask_width, anim_mask_height); -+ XtWindow(p), (char*)anim_mask_bits, anim_mask_width, anim_mask_height); - PageTab::ClassInitialized = TRUE; - } - -diff --git a/src/uipp/dxuilib/VPEPostIt.C b/src/uipp/dxuilib/VPEPostIt.C -index 9881688..7377e8d 100644 ---- a/src/uipp/dxuilib/VPEPostIt.C -+++ b/src/uipp/dxuilib/VPEPostIt.C -@@ -213,7 +213,7 @@ void VPEPostIt::makePixmap() - XFreePixmap(d, this->bg_pixmap); - this->bg_pixmap = NUL(Pixmap); - } -- this->bg_pixmap = XCreatePixmapFromBitmapData(d, w, postit_bits, -+ this->bg_pixmap = XCreatePixmapFromBitmapData(d, w, (char*)postit_bits, - postit_width, postit_height, fg, bg, depth); - XtVaSetValues (this->customPart, - XmNlabelType, XmPIXMAP, -diff --git a/src/uipp/dxuilib/anchor.bm b/src/uipp/dxuilib/anchor.bm -index 1379314..69c2bf5 100644 ---- a/src/uipp/dxuilib/anchor.bm -+++ b/src/uipp/dxuilib/anchor.bm -@@ -2,7 +2,7 @@ - #define anchor_height 17 - #define anchor_x_hot -1 - #define anchor_y_hot -1 --static char anchor_bits[] = { -+static unsigned char anchor_bits[] = { - 0x80, 0x03, 0x00, 0x40, 0x05, 0x00, 0xc0, 0x02, 0x00, 0x40, 0x05, 0x00, - 0x80, 0x02, 0x00, 0x10, 0x11, 0x00, 0x30, 0x09, 0x00, 0x50, 0x15, 0x00, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x83, 0x82, 0x00, 0x85, 0x41, 0x01, -diff --git a/src/uipp/dxuilib/anim_mask.bm b/src/uipp/dxuilib/anim_mask.bm -index 617d365..cb08c61 100644 ---- a/src/uipp/dxuilib/anim_mask.bm -+++ b/src/uipp/dxuilib/anim_mask.bm -@@ -1,6 +1,6 @@ - #define anim_mask_width 90 - #define anim_mask_height 23 --static char anim_mask_bits[] = { -+static unsigned char anim_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, -diff --git a/src/uipp/dxuilib/animation.bm b/src/uipp/dxuilib/animation.bm -index 1cf5798..3404b19 100644 ---- a/src/uipp/dxuilib/animation.bm -+++ b/src/uipp/dxuilib/animation.bm -@@ -1,6 +1,6 @@ - #define animation_width 90 - #define animation_height 23 --static char animation_bits[] = { -+static unsigned char animation_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -diff --git a/src/uipp/dxuilib/pagedrag.bm b/src/uipp/dxuilib/pagedrag.bm -index 5c9a2d0..8c8745d 100644 ---- a/src/uipp/dxuilib/pagedrag.bm -+++ b/src/uipp/dxuilib/pagedrag.bm -@@ -1,6 +1,6 @@ - #define pagedrag_width 32 - #define pagedrag_height 32 --static char pagedrag_bits[] = { -+static unsigned char pagedrag_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0x04, 0x30, 0x00, 0x00, - 0x04, 0xf0, 0x01, 0x00, 0x04, 0xb0, 0x01, 0x00, 0x07, 0xf0, 0xff, 0x0f, - 0x01, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x7c, -diff --git a/src/uipp/dxuilib/pagedragmask.bm b/src/uipp/dxuilib/pagedragmask.bm -index 8c5c420..f5ddb4c 100644 ---- a/src/uipp/dxuilib/pagedragmask.bm -+++ b/src/uipp/dxuilib/pagedragmask.bm -@@ -1,6 +1,6 @@ - #define pagedragmask_width 32 - #define pagedragmask_height 32 --static char pagedragmask_bits[] = { -+static unsigned char pagedragmask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, - 0x5c, 0xf5, 0x01, 0x00, 0xac, 0xfa, 0x01, 0x00, 0x5f, 0xf5, 0xff, 0x0f, - 0xaf, 0xfa, 0xff, 0x0f, 0x57, 0x55, 0x55, 0x0d, 0xab, 0xaa, 0xaa, 0x7e, -diff --git a/src/uipp/dxuilib/postit.bm b/src/uipp/dxuilib/postit.bm -index a67e1bf..aed0a05 100644 ---- a/src/uipp/dxuilib/postit.bm -+++ b/src/uipp/dxuilib/postit.bm -@@ -2,7 +2,7 @@ - #define postit_height 24 - #define postit_x_hot 11 - #define postit_y_hot 0 --static char postit_bits[] = { -+static unsigned char postit_bits[] = { - 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x54, 0x55, 0xd5, 0xaa, 0xaa, 0xaa, - 0x54, 0x41, 0xd5, 0xaa, 0xa8, 0xaa, 0x54, 0x75, 0xd5, 0xaa, 0xbc, 0xaa, - 0x54, 0x55, 0xd5, 0xaa, 0xaa, 0xaa, 0x54, 0x41, 0xd5, 0xaa, 0xa8, 0xaa, -diff --git a/src/uipp/dxuilib/ticks_in.bm b/src/uipp/dxuilib/ticks_in.bm -index 5e4d6a3..dd2ac91 100644 ---- a/src/uipp/dxuilib/ticks_in.bm -+++ b/src/uipp/dxuilib/ticks_in.bm -@@ -1,6 +1,6 @@ - #define ticks_in_width 18 - #define ticks_in_height 16 --static char ticks_in_bits[] = { -+static unsigned char ticks_in_bits[] = { - 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x82, 0x20, 0x00, - 0x82, 0x20, 0x00, 0x92, 0x24, 0x01, 0x92, 0x24, 0x01, 0x92, 0x24, 0x01, -diff --git a/src/uipp/dxuilib/ticks_in_ins.bm b/src/uipp/dxuilib/ticks_in_ins.bm -index 890fae0..70ac5d9 100644 ---- a/src/uipp/dxuilib/ticks_in_ins.bm -+++ b/src/uipp/dxuilib/ticks_in_ins.bm -@@ -1,6 +1,6 @@ - #define ticks_in_ins_width 18 - #define ticks_in_ins_height 16 --static char ticks_in_ins_bits[] = { -+static unsigned char ticks_in_ins_bits[] = { - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x82, 0x20, 0x00, 0x10, 0x04, 0x01, 0x82, 0x20, 0x00, 0x10, 0x04, 0x01, -diff --git a/src/uipp/dxuilib/ticks_out.bm b/src/uipp/dxuilib/ticks_out.bm -index 718b5fc..f078a27 100644 ---- a/src/uipp/dxuilib/ticks_out.bm -+++ b/src/uipp/dxuilib/ticks_out.bm -@@ -1,6 +1,6 @@ - #define ticks_out_width 18 - #define ticks_out_height 16 --static char ticks_out_bits[] = { -+static unsigned char ticks_out_bits[] = { - 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0xfe, 0xff, 0x03, 0x24, 0x49, 0x02, -diff --git a/src/uipp/dxuilib/ticks_out_ins.bm b/src/uipp/dxuilib/ticks_out_ins.bm -index 9f85654..793f843 100644 ---- a/src/uipp/dxuilib/ticks_out_ins.bm -+++ b/src/uipp/dxuilib/ticks_out_ins.bm -@@ -1,6 +1,6 @@ - #define ticks_out_ins_width 18 - #define ticks_out_ins_height 16 --static char ticks_out_ins_bits[] = { -+static unsigned char ticks_out_ins_bits[] = { - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0x02, 0x04, 0x41, 0x00, -diff --git a/src/uipp/prompter/col_insens.bm b/src/uipp/prompter/col_insens.bm -index 785de01..f52ceb8 100644 ---- a/src/uipp/prompter/col_insens.bm -+++ b/src/uipp/prompter/col_insens.bm -@@ -1,6 +1,6 @@ - #define col_insens_width 20 - #define col_insens_height 20 --static char col_insens_bits[] = { -+static unsigned char col_insens_bits[] = { - 0x00, 0x00, 0x00, 0x55, 0x55, 0x05, 0x00, 0x00, 0x08, 0x00, 0x80, 0x02, - 0x00, 0x28, 0x00, 0x80, 0x02, 0x00, 0x28, 0x00, 0x00, 0x02, 0x00, 0x00, - 0x55, 0x55, 0x05, 0x00, 0x00, 0x08, 0x00, 0x80, 0x02, 0x00, 0x28, 0x00, -diff --git a/src/uipp/prompter/col_sens.bm b/src/uipp/prompter/col_sens.bm -index fb0dfff..666fb37 100644 ---- a/src/uipp/prompter/col_sens.bm -+++ b/src/uipp/prompter/col_sens.bm -@@ -1,6 +1,6 @@ - #define col_sens_width 20 - #define col_sens_height 20 --static char col_sens_bits[] = { -+static unsigned char col_sens_bits[] = { - 0x00, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x0c, 0x00, 0xc0, 0x03, - 0x00, 0x3c, 0x00, 0xc0, 0x03, 0x00, 0x3c, 0x00, 0x00, 0x03, 0x00, 0x00, - 0xff, 0xff, 0x0f, 0x00, 0x00, 0x0c, 0x00, 0xc0, 0x03, 0x00, 0x3c, 0x00, -diff --git a/src/uipp/prompter/grid1.bm b/src/uipp/prompter/grid1.bm -index c4b02d1..3dca8d5 100644 ---- a/src/uipp/prompter/grid1.bm -+++ b/src/uipp/prompter/grid1.bm -@@ -1,6 +1,6 @@ - #define grid1_width 37 - #define grid1_height 37 --static char grid1_bits[] = { -+static unsigned char grid1_bits[] = { - 0xff, 0xff, 0xff, 0xff, 0x1f, 0x41, 0x10, 0x04, 0x41, 0x10, 0x41, 0x10, - 0x04, 0x41, 0x10, 0x41, 0x10, 0x04, 0x41, 0x10, 0x41, 0x10, 0x04, 0x41, - 0x10, 0x41, 0x10, 0x04, 0x41, 0x10, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x41, -diff --git a/src/uipp/prompter/grid2.bm b/src/uipp/prompter/grid2.bm -index fec0808..7e78d44 100644 ---- a/src/uipp/prompter/grid2.bm -+++ b/src/uipp/prompter/grid2.bm -@@ -1,6 +1,6 @@ - #define grid2_width 37 - #define grid2_height 37 --static char grid2_bits[] = { -+static unsigned char grid2_bits[] = { - 0xff, 0xff, 0xff, 0xff, 0x1f, 0x41, 0x0a, 0x40, 0x02, 0x10, 0x41, 0x0a, - 0x40, 0x02, 0x10, 0x41, 0x0a, 0x40, 0x02, 0x10, 0xff, 0xff, 0xff, 0xff, - 0x1f, 0x41, 0x0a, 0x40, 0x02, 0x10, 0x41, 0x0a, 0x40, 0x02, 0x10, 0xff, -diff --git a/src/uipp/prompter/grid3.bm b/src/uipp/prompter/grid3.bm -index ba8737b..6597dca 100644 ---- a/src/uipp/prompter/grid3.bm -+++ b/src/uipp/prompter/grid3.bm -@@ -1,6 +1,6 @@ - #define grid3_width 37 - #define grid3_height 37 --static char grid3_bits[] = { -+static unsigned char grid3_bits[] = { - 0x00, 0xf0, 0xff, 0x01, 0x00, 0x00, 0x0f, 0x04, 0x1e, 0x00, 0xe0, 0x00, - 0x04, 0xe0, 0x00, 0x98, 0x00, 0x04, 0x20, 0x03, 0x86, 0x00, 0x04, 0x20, - 0x0c, 0x01, 0x01, 0x04, 0x10, 0x10, 0x01, 0x01, 0x04, 0x10, 0x10, 0x02, -diff --git a/src/uipp/prompter/grid4.bm b/src/uipp/prompter/grid4.bm -index 8227875..2b48a36 100644 ---- a/src/uipp/prompter/grid4.bm -+++ b/src/uipp/prompter/grid4.bm -@@ -1,6 +1,6 @@ - #define grid4_width 37 - #define grid4_height 37 --static char grid4_bits[] = { -+static unsigned char grid4_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x06, 0x18, 0x00, - 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, - 0x00, 0x00, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, -diff --git a/src/uipp/prompter/row_insens.bm b/src/uipp/prompter/row_insens.bm -index 9da9b69..72287a3 100644 ---- a/src/uipp/prompter/row_insens.bm -+++ b/src/uipp/prompter/row_insens.bm -@@ -1,6 +1,6 @@ - #define row_insens_width 20 - #define row_insens_height 20 --static char row_insens_bits[] = { -+static unsigned char row_insens_bits[] = { - 0x02, 0x81, 0x00, 0x80, 0x40, 0x00, 0x02, 0x81, 0x00, 0x40, 0x20, 0x00, - 0x02, 0x81, 0x00, 0x40, 0x20, 0x00, 0x02, 0x81, 0x00, 0x20, 0x10, 0x00, - 0x02, 0x81, 0x00, 0x20, 0x10, 0x00, 0x02, 0x81, 0x00, 0x10, 0x08, 0x00, -diff --git a/src/uipp/prompter/row_sens.bm b/src/uipp/prompter/row_sens.bm -index b51f400..9c0b278 100644 ---- a/src/uipp/prompter/row_sens.bm -+++ b/src/uipp/prompter/row_sens.bm -@@ -1,6 +1,6 @@ - #define row_sens_width 20 - #define row_sens_height 20 --static char row_sens_bits[] = { -+static unsigned char row_sens_bits[] = { - 0x82, 0xc1, 0x00, 0x82, 0xc1, 0x00, 0x42, 0xa1, 0x00, 0x42, 0xa1, 0x00, - 0x42, 0xa1, 0x00, 0x42, 0xa1, 0x00, 0x22, 0x91, 0x00, 0x22, 0x91, 0x00, - 0x22, 0x91, 0x00, 0x22, 0x91, 0x00, 0x12, 0x89, 0x00, 0x12, 0x89, 0x00, -diff --git a/src/uipp/widgets/backward.bm b/src/uipp/widgets/backward.bm -index a968c46..a687095 100644 ---- a/src/uipp/widgets/backward.bm -+++ b/src/uipp/widgets/backward.bm -@@ -33,7 +33,7 @@ Initial revision - - #define backward_width 12 - #define backward_height 15 --static char backward_bits[] = { -+static unsigned char backward_bits[] = { - 0x00, 0x08, 0x00, 0x0e, 0x00, 0x0f, 0xc0, 0x0f, 0xf0, 0x0f, 0xf8, 0x0f, - 0xfe, 0x0f, 0xff, 0x0f, 0xfe, 0x0f, 0xf8, 0x0f, 0xf0, 0x0f, 0xc0, 0x0f, - 0x00, 0x0f, 0x00, 0x0e, 0x00, 0x08 }; -diff --git a/src/uipp/widgets/forward.bm b/src/uipp/widgets/forward.bm -index 40f0626..ae7b5b1 100644 ---- a/src/uipp/widgets/forward.bm -+++ b/src/uipp/widgets/forward.bm -@@ -33,7 +33,7 @@ Initial revision - - #define forward_width 12 - #define forward_height 15 --static char forward_bits[] = { -+static unsigned char forward_bits[] = { - 0x01, 0x00, 0x07, 0x00, 0x0f, 0x00, 0x3f, 0x00, 0xff, 0x00, 0xff, 0x01, - 0xff, 0x07, 0xff, 0x0f, 0xff, 0x07, 0xff, 0x01, 0xff, 0x00, 0x3f, 0x00, - 0x0f, 0x00, 0x07, 0x00, 0x01, 0x00 }; -diff --git a/src/uipp/widgets/frame.bm b/src/uipp/widgets/frame.bm -index 40dfed3..85e3986 100644 ---- a/src/uipp/widgets/frame.bm -+++ b/src/uipp/widgets/frame.bm -@@ -33,7 +33,7 @@ Initial revision - - #define frame_width 22 - #define frame_height 16 --static char frame_bits[] = { -+static unsigned char frame_bits[] = { - 0xff, 0xff, 0xff, 0xcc, 0xcc, 0xcc, 0xff, 0xff, 0xff, 0x81, 0x40, 0xe0, - 0x81, 0x40, 0xe0, 0x81, 0x40, 0xe0, 0x81, 0x40, 0xe0, 0x81, 0x40, 0xe0, - 0x81, 0x40, 0xe0, 0x81, 0x40, 0xe0, 0x81, 0x40, 0xe0, 0x81, 0x40, 0xe0, -diff --git a/src/uipp/widgets/loop.bm b/src/uipp/widgets/loop.bm -index 9ffd07c..d28878c 100644 ---- a/src/uipp/widgets/loop.bm -+++ b/src/uipp/widgets/loop.bm -@@ -33,7 +33,7 @@ Initial revision - - #define loop_width 24 - #define loop_height 16 --static char loop_bits[] = { -+static unsigned char loop_bits[] = { - 0x00, 0x00, 0x00, 0xf0, 0xff, 0x0f, 0xfc, 0xff, 0x3f, 0x1e, 0x00, 0x78, - 0x06, 0x00, 0x60, 0x07, 0x00, 0xe0, 0x03, 0x00, 0xc0, 0x03, 0x00, 0xc0, - 0x03, 0x00, 0xc0, 0x07, 0x00, 0xe0, 0xc6, 0x00, 0x60, 0x9e, 0x03, 0x78, -diff --git a/src/uipp/widgets/palim.bm b/src/uipp/widgets/palim.bm -index 1f7c4a9..1f572c6 100644 ---- a/src/uipp/widgets/palim.bm -+++ b/src/uipp/widgets/palim.bm -@@ -33,7 +33,7 @@ Initial revision - - #define palim_width 24 - #define palim_height 15 --static char palim_bits[] = { -+static unsigned char palim_bits[] = { - 0x00, 0x00, 0x00, 0xff, 0x03, 0x02, 0xff, 0x07, 0x01, 0x00, 0x8e, 0x00, - 0x18, 0x4c, 0x00, 0x0e, 0x2e, 0x00, 0xff, 0xd7, 0xff, 0xff, 0xeb, 0xff, - 0x0e, 0x74, 0x00, 0x18, 0x32, 0x18, 0x00, 0x71, 0x70, 0x80, 0xe0, 0xff, -diff --git a/src/uipp/widgets/pause.bm b/src/uipp/widgets/pause.bm -index 884183a..b7f41b9 100644 ---- a/src/uipp/widgets/pause.bm -+++ b/src/uipp/widgets/pause.bm -@@ -33,6 +33,6 @@ Initial revision - - #define pause_width 8 - #define pause_height 15 --static char pause_bits[] = { -+static unsigned char pause_bits[] = { - 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, - 0xe7, 0xe7, 0xe7, 0x00}; -diff --git a/src/uipp/widgets/step.bm b/src/uipp/widgets/step.bm -index 08208f3..ed1d02e 100644 ---- a/src/uipp/widgets/step.bm -+++ b/src/uipp/widgets/step.bm -@@ -33,7 +33,7 @@ Initial revision - - #define step_width 24 - #define step_height 10 --static char step_bits[] = { -+static unsigned char step_bits[] = { - 0x40, 0x66, 0x02, 0x70, 0x66, 0x0e, 0x78, 0x66, 0x1e, 0x7e, 0x66, 0x7e, - 0x7f, 0x66, 0xfe, 0x7f, 0x66, 0xfe, 0x7e, 0x66, 0x7e, 0x78, 0x66, 0x1e, - 0x70, 0x66, 0x0e, 0x40, 0x66, 0x02}; -diff --git a/src/uipp/widgets/stepb.bm b/src/uipp/widgets/stepb.bm -index 1bd3aac..1cce934 100644 ---- a/src/uipp/widgets/stepb.bm -+++ b/src/uipp/widgets/stepb.bm -@@ -33,7 +33,7 @@ Initial revision - - #define stepb_width 20 - #define stepb_height 15 --static char stepb_bits[] = { -+static unsigned char stepb_bits[] = { - 0x00, 0xc8, 0x0c, 0x00, 0xce, 0x0c, 0x00, 0xcf, 0x0c, 0xc0, 0xcf, 0x0c, - 0xf0, 0xcf, 0x0c, 0xf8, 0xcf, 0x0c, 0xfe, 0xcf, 0x0c, 0xff, 0xcf, 0x0c, - 0xfe, 0xcf, 0x0c, 0xf8, 0xcf, 0x0c, 0xf0, 0xcf, 0x0c, 0xc0, 0xcf, 0x0c, -diff --git a/src/uipp/widgets/stepf.bm b/src/uipp/widgets/stepf.bm -index 6bd05b6..07cef57 100644 ---- a/src/uipp/widgets/stepf.bm -+++ b/src/uipp/widgets/stepf.bm -@@ -33,7 +33,7 @@ Initial revision - - #define stepf_width 20 - #define stepf_height 15 --static char stepf_bits[] = { -+static unsigned char stepf_bits[] = { - 0x33, 0x01, 0x00, 0x33, 0x07, 0x00, 0x33, 0x0f, 0x00, 0x33, 0x3f, 0x00, - 0x33, 0xff, 0x00, 0x33, 0xff, 0x01, 0x33, 0xff, 0x07, 0x33, 0xff, 0x0f, - 0x33, 0xff, 0x07, 0x33, 0xff, 0x01, 0x33, 0xff, 0x00, 0x33, 0x3f, 0x00, -diff --git a/src/uipp/widgets/stop.bm b/src/uipp/widgets/stop.bm -index 12e7a6b..7a9f4b1 100644 ---- a/src/uipp/widgets/stop.bm -+++ b/src/uipp/widgets/stop.bm -@@ -33,6 +33,6 @@ Initial revision - - #define stop_width 10 - #define stop_height 10 --static char stop_bits[] = { -+static unsigned char stop_bits[] = { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; --- -2.5.0 - diff --git a/dx-null.patch b/dx-null.patch deleted file mode 100644 index 5d3022a..0000000 --- a/dx-null.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up dx-4.4.4/src/exec/libdx/xwindow.c.null dx-4.4.4/src/exec/libdx/xwindow.c ---- dx-4.4.4/src/exec/libdx/xwindow.c.null 2000-06-12 07:45:40.000000000 +0200 -+++ dx-4.4.4/src/exec/libdx/xwindow.c 2009-11-08 15:10:13.000000000 +0100 -@@ -29,7 +29,9 @@ Error - DXRegisterWindowHandlerWithCheckProc(Error (*proc) (int, Pointer), - int (*check)(int, Pointer), Display *d, Pointer arg) - { -- int fd = ConnectionNumber(d); -+ int fd; -+ if (d) fd = ConnectionNumber(d); -+ else return ERROR; - - if (! DXRegisterInputHandlerWithCheckProc(proc, check, fd, arg)) - return ERROR; diff --git a/dx-open.patch b/dx-open.patch deleted file mode 100644 index a7bda4a..0000000 --- a/dx-open.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- dx-4.4.4/src/exec/libdx/fileio.c.open 2006-01-05 23:55:47.000000000 +0100 -+++ dx-4.4.4/src/exec/libdx/fileio.c 2007-08-17 18:43:14.000000000 +0200 -@@ -263,7 +263,7 @@ Error _dxffile_open(char *name, int rw) - case 2:/* read/write */ - fd = open(name, O_RDWR); - if (fd < 0) { -- fd = open(name, O_WRONLY | O_CREAT); -+ fd = open(name, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); - if (fd < 0) { - DXSetError(ERROR_DATA_INVALID, - "can't open/create file '%s'", name); ---- dx-4.4.4/src/exec/libdx/plock.c.open 2002-07-17 06:48:18.000000000 +0200 -+++ dx-4.4.4/src/exec/libdx/plock.c 2007-08-17 19:05:14.000000000 +0200 -@@ -37,7 +37,8 @@ struct seminfo *__buf; /* buffer fo - - #define SEM_FLAGS (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) - #define SHM_FLAGS (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) --#define OPEN_FLAGS (O_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) -+#define OPEN_FLAGS (O_CREAT) -+#define OPEN_MODE (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) - #define IS_MINE(a) (locks->_owner[a] == getpid()) - #define SET_OWNER(a) (locks->_owner[a] = getpid()) - #define CLEAR_OWNER(a) (locks->_owner[a] = 0) -@@ -268,7 +269,7 @@ PLockInit() - - if (stat(LOCKFILE, &statbuf)) - { -- int fd = open(LOCKFILE, OPEN_FLAGS); -+ int fd = open(LOCKFILE, OPEN_FLAGS, OPEN_MODE); - if (fd < 0) - { - fprintf(stderr, "initLocks: error accessing locks shared block: open\n"); diff --git a/dx-rpm.patch b/dx-rpm.patch deleted file mode 100644 index 1befc22..0000000 --- a/dx-rpm.patch +++ /dev/null @@ -1,592 +0,0 @@ -diff -up dx-4.4.4/bin/dx.in.r dx-4.4.4/bin/dx.in ---- dx-4.4.4/bin/dx.in.r 2004-05-31 18:12:05.000000000 +0200 -+++ dx-4.4.4/bin/dx.in 2009-11-06 11:47:32.190944177 +0100 -@@ -60,14 +60,7 @@ exit 1 - # - longhelp() { - --if test -f "$dxroot/man/catl/dx.l" ; then -- more "$dxroot/man/catl/dx.l" --else -- echo "cannot find $dxroot/man/catl/dx.l" -- echo "set the DXROOT environment variable to the root of the" -- echo "dx installation tree and try again." --fi --exit 1 -+man dx - - cat << EOFlonghelp - command line parameters: -@@ -286,7 +279,7 @@ fi - - - if [ -z "$DXROOT" ]; then -- prefix=@prefix@ -+ prefix=@datadir@ - DXROOT=$prefix/dx - fi - export DXROOT -@@ -298,6 +291,13 @@ if [ -z "$DXDATA" ]; then - fi - fi - -+if [ -z "$DXFONTS" ]; then -+ DXFONTS=$DXROOT/fonts -+ if [ -d "$DXFONTS" ]; then -+ export DXFONTS -+ fi -+fi -+ - # if DXMACROS not set, default it to the usual unless dir doesn't exist - if [ -z "$DXMACROS" ]; then - DXMACROS=$DXROOT/samples/macros -@@ -507,7 +507,7 @@ export DXARCH - - # default to running locally, from @prefix@/dx - exhost=$thishost --dxroot=@prefix@/dx -+dxroot=@datadir@/dx - startup=1 # run the startup window by default - - -@@ -1469,8 +1469,8 @@ done - - # Now set some needed results - --dxexroot=$dxroot --dxuiroot=$dxroot -+dxexroot=@libdir@/dx -+dxuiroot=@libdir@/dx - dxexecdef="$dxexroot/bin_${exarch}/dxexec" - if test -z "$dxexec" ; then - dxexec=$dxexecdef -@@ -1600,7 +1600,7 @@ fi - # - if test $tutor -eq 1 ; then - -- cmd="$DXROOT/bin_${uiarch}/tutor" -+ cmd="$DXEXECROOT/bin_${uiarch}/tutor" - if test $seecomline -eq 1 ; then - set - echo "$echoparms exec $cmd $xparms" -@@ -1619,7 +1619,7 @@ if test $prompter -eq 1 ; then - prompterflags="$prompterflags -file \"$FileName\"" - fi - -- cmd="$DXROOT/bin_${uiarch}/prompter" -+ cmd="$DXEXECROOT/bin_${uiarch}/prompter" - if test $seecomline -eq 1 ; then - set - echo "$echoparms exec $cmd $prompterflags $xparms" -@@ -1635,7 +1635,7 @@ fi - if test $startup -eq 1 ; then - - -- cmd="$DXROOT/bin_${uiarch}/startupui" -+ cmd="$DXEXECROOT/bin_${uiarch}/startupui" - if test $seecomline -eq 1 ; then - set - echo "$echoparms exec $cmd $xparms $*" -@@ -1649,7 +1649,7 @@ fi - # - if test $builder -eq 1 ; then - -- cmd="$DXROOT/bin_${uiarch}/builder" -+ cmd="$DXEXECROOT/bin_${uiarch}/builder" - if test $seecomline -eq 1 ; then - set - echo "exec $cmd $xparms $motifcmd $motifbind $FileName" -@@ -1674,7 +1674,7 @@ if test $encoder -eq 1 ; then - EncodedBase="${Base}-e" - - echo "Creating encoded version of $FileName in ${EncodedBase}.net " -- cmd1="$DXROOT/bin_${uiarch}/dxencode" -+ cmd1="$DXEXECROOT/bin_${uiarch}/dxencode" - if test -f $CfgName ; then - echo "Copying $CfgName to ${EncodedBase}.cfg" - cmd2="cp $CfgName ${EncodedBase}.cfg" -diff -up dx-4.4.4/bin/Makefile.am.r dx-4.4.4/bin/Makefile.am ---- dx-4.4.4/bin/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200 -+++ dx-4.4.4/bin/Makefile.am 2009-11-06 11:47:32.192943219 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --dxbindir = $(prefix)/dx/bin -+dxbindir = $(libdir)/dx/bin - bindir = $(prefix)/bin - - EXTRA_SCRIPTS = mdf2c dx -diff -up dx-4.4.4/bin/mdf2c.in.r dx-4.4.4/bin/mdf2c.in ---- dx-4.4.4/bin/mdf2c.in.r 1999-12-14 05:13:04.000000000 +0100 -+++ dx-4.4.4/bin/mdf2c.in 2009-11-06 11:47:32.194943239 +0100 -@@ -1,6 +1,6 @@ - #!/bin/sh - # Configure is looking for the following line --prefix=@prefix@ -+prefix=@datadir@ - DFLTROOT=$prefix/dx - root=${DXROOT=${DXEXECROOT=$DFLTROOT}} - -diff -up dx-4.4.4/bin/url_handler.sh.r dx-4.4.4/bin/url_handler.sh ---- dx-4.4.4/bin/url_handler.sh.r 2002-04-11 01:32:54.000000000 +0200 -+++ dx-4.4.4/bin/url_handler.sh 2009-11-06 11:47:32.195942515 +0100 -@@ -39,8 +39,8 @@ case $method in - if [ $use_xbrowser = n ]; then - lynx "$url" - else -- netscape -remote "openURL($url)" 2> /dev/null || \ -- (netscape "$url" &) -+ firefox -remote "openURL($url)" 2> /dev/null || \ -+ (firefox "$url" &) - fi - ;; - esac -diff -up dx-4.4.4/configure.ac.r dx-4.4.4/configure.ac ---- dx-4.4.4/configure.ac.r 2006-08-21 23:56:08.000000000 +0200 -+++ dx-4.4.4/configure.ac 2009-11-06 12:00:44.912941875 +0100 -@@ -218,6 +218,7 @@ AC_DEFINE_UNQUOTED(BSH, "$bsh_path", [Pa - dnl End of command line options configuration - - dnl Start DX configuration -+AC_PROG_CXX - AC_LANG([C++]) - AC_CHECK_HEADERS(stdlib.h) - AC_LANG([C]) -@@ -677,7 +678,7 @@ if test "$ARCH" = "intelnt" ; then - fi - dnl -- check for unix - else -- AC_CHECK_LIB(df,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[ -lz -ljpeg ]) -+ AC_CHECK_LIB(df,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[ -lz -ljpeg -L$libdir/hdf ]) - AC_MSG_CHECKING(if HDF package is complete) - if test $passed -gt 0 - then -@@ -686,7 +687,7 @@ else - AC_MSG_RESULT(no -- some components failed test) - have_hdf='no (failed tests)' - else -- LIB_HDF='-ldf' -+ LIB_HDF="-ldf -L$libdir/hdf" - LIBS="$LIB_HDF $LIBS" - FMT_LIBS="$FMT_LIBS libdf.a" - AC_DEFINE(HAVE_LIBDF, 1, [Define to 1 if you have the HDF libraries]) -@@ -801,6 +802,9 @@ then - - failed=0; - passed=0; -+ CFLAGS="$CFLAGS -I/usr/include/ImageMagick" -+ CXXFLAGS="$CXXFLAGS -I/usr/include/ImageMagick" -+ CPPFLAGS="$CPPFLAGS -I/usr/include/ImageMagick" - AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) - if test "$ARCH" = "intelnt" ; then - AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) -@@ -835,8 +839,8 @@ dnl routine. This allows us to simplify - dnl format configuration libraries. - - if test "$HAVE_MC" = "yes" ; then -- LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`" -- AC_CHECK_LIB( Magick,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ]) -+ LIB_MAGICK="`MagickCore-config --ldflags` `MagickCore-config --libs`" -+ AC_CHECK_LIB(MagickCore,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ]) - AC_MSG_CHECKING(if ImageMagick package is complete) - if test $passed -gt 0 - then -@@ -846,8 +850,8 @@ dnl format configuration libraries. - have_magick='no (failed tests)' - else - dnl CFLAGS="`Magick-config --cflags` $CFLAGS" -- CPPFLAGS="`Magick-config --cppflags` $CPPFLAGS" -- LIB_MAGICK="$LIBS `Magick-config --ldflags` `Magick-config --libs`" -+ CPPFLAGS="`MagickCore-config --cppflags` $CPPFLAGS" -+ LIB_MAGICK="$LIBS `MagickCore-config --ldflags` `MagickCore-config --libs`" - dnl UNIQUIFY will remove duplicate library tokens leaving the last instance. - AC_UTILS_UNIQUIFY($LIB_MAGICK, LIBS) - FMT_LIBS="$FMT_LIBS libMagick.a" -@@ -1011,7 +1015,7 @@ DX_CHECK_HEADERS( \ - Xm/ScrolledWP.h Xm/SelectioB.h Xm/SeparatoG.h Xm/SeparatoGP.h Xm/Separator.h \ - Xm/Text.h Xm/TextF.h Xm/ToggleB.h Xm/ToggleBG.h Xm/Xm.h Xm/XmP.h Xm/XmStrDefs.h \ - gl.h gl/device.h gl/gl.h invent.h iop/afb.h iop/mov.h iop/pfs.h license.h \ -- linux/kernel.h linux/sys.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \ -+ linux/kernel.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \ - os2.h setjmp.h starbase.c.h stddef.h stdio.h synch.h sys/access.h \ - sys/ipc.h sys/m88kbcs.h sys/mman.h sys/mode.h sys/pstat.h sys/resource.h \ - sys/svs.h sys/sysconfig.h sys/syslimits.h sys/sysmacros.h ulocks.h x11/xlibxtra.h \ -diff -up dx-4.4.4/doc/Makefile.am.r dx-4.4.4/doc/Makefile.am ---- dx-4.4.4/doc/Makefile.am.r 1999-04-05 13:57:03.000000000 +0200 -+++ dx-4.4.4/doc/Makefile.am 2009-11-06 11:47:32.203697175 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --docdir = $(prefix)/dx/doc -+docdir = $(datadir)/dx/doc - - doc_DATA = \ - README README_SMP README_alphax README_aviion README_hp700 \ -diff -up dx-4.4.4/fonts/Makefile.am.r dx-4.4.4/fonts/Makefile.am ---- dx-4.4.4/fonts/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200 -+++ dx-4.4.4/fonts/Makefile.am 2009-11-06 11:47:32.204697430 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --fontdir = $(prefix)/dx/fonts -+fontdir = $(datadir)/dx/fonts - - font_DATA = \ - README area.dx cyril_d.dx \ -diff -up dx-4.4.4/help/Makefile.am.r dx-4.4.4/help/Makefile.am ---- dx-4.4.4/help/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200 -+++ dx-4.4.4/help/Makefile.am 2009-11-06 11:47:32.206696961 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --helpdir = $(prefix)/dx/help -+helpdir = $(datadir)/dx/help - - EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5) \ - $(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10) \ -@@ -257,7 +257,7 @@ install-data-hook: - $(LN_S) hlpalhtl svsmstrh ; \ - $(LN_S) hlpalhtl ugidx ; \ - $(LN_S) hlpalhtl usrefidx ; \ -- $(LN_S) HelpDir GarHelpDir ; \ -+ $(LN_S) HelpDir GARHelpDir ; \ - $(LN_S) HelpDir MBHelpDir ; \ - echo "cd $(DESTDIR)$(helpdir)" ; \ - echo "$(LN_S) hlpalhtl mbidx" ; \ -@@ -265,6 +265,6 @@ install-data-hook: - echo "$(LN_S) hlpalhtl svsmstrh" ; \ - echo "$(LN_S) hlpalhtl ugidx" ; \ - echo "$(LN_S) hlpalhtl usrefidx" ; \ -- echo "$(LN_S) HelpDir GarHelpDir" ; \ -+ echo "$(LN_S) HelpDir GARHelpDir" ; \ - echo "$(LN_S) HelpDir MBHelpDir" ) \ - ' -diff -up dx-4.4.4/html/images/Makefile.am.r dx-4.4.4/html/images/Makefile.am ---- dx-4.4.4/html/images/Makefile.am.r 2002-04-01 10:51:13.000000000 +0200 -+++ dx-4.4.4/html/images/Makefile.am 2009-11-06 11:47:32.214944415 +0100 -@@ -1,5 +1,5 @@ - --imagesdir = $(prefix)/dx/html/images -+imagesdir = $(datadir)/dx/html/images - - images1 = \ - 3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif \ -diff -up dx-4.4.4/html/Makefile.am.r dx-4.4.4/html/Makefile.am ---- dx-4.4.4/html/Makefile.am.r 2003-07-12 02:11:39.000000000 +0200 -+++ dx-4.4.4/html/Makefile.am 2009-11-06 11:47:32.216944434 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --htmldir = $(prefix)/dx/html -+htmldir = $(datadir)/dx/html - - SUBDIRS = pages images - -diff -up dx-4.4.4/html/pages/Makefile.am.r dx-4.4.4/html/pages/Makefile.am ---- dx-4.4.4/html/pages/Makefile.am.r 2002-06-20 06:38:03.000000000 +0200 -+++ dx-4.4.4/html/pages/Makefile.am 2009-11-06 11:47:32.217945666 +0100 -@@ -1,4 +1,4 @@ --pagesdir = $(prefix)/dx/html/pages -+pagesdir = $(datadir)/dx/html/pages - - pages1 = \ - insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \ -diff -up dx-4.4.4/include/dx/Makefile.am.r dx-4.4.4/include/dx/Makefile.am ---- dx-4.4.4/include/dx/Makefile.am.r 1999-05-26 01:35:16.000000000 +0200 -+++ dx-4.4.4/include/dx/Makefile.am 2009-11-06 11:47:32.222944494 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --dxincdir = $(prefix)/dx/include/dx -+dxincdir = $(prefix)/include/dx - - dxinc_HEADERS = \ - UserInteractors.h advanced.h arch.h array.h arrayhandles.h \ -diff -up dx-4.4.4/include/Makefile.am.r dx-4.4.4/include/Makefile.am ---- dx-4.4.4/include/Makefile.am.r 2006-04-09 05:44:49.000000000 +0200 -+++ dx-4.4.4/include/Makefile.am 2009-11-06 11:47:32.224942558 +0100 -@@ -1,4 +1,4 @@ --dxincdir = $(prefix)/dx/include -+dxincdir = $(prefix)/include - SUBDIRS = dx - dxinc_HEADERS = dxl.h dxstereo.h - nodist_dxinc_HEADERS = dxconfig.h -diff -up dx-4.4.4/lib/Makefile.am.r dx-4.4.4/lib/Makefile.am ---- dx-4.4.4/lib/Makefile.am.r 2003-08-22 01:22:13.000000000 +0200 -+++ dx-4.4.4/lib/Makefile.am 2009-11-06 11:47:32.225944279 +0100 -@@ -1,4 +1,4 @@ --libsdir = $(prefix)/dx/lib -+libsdir = $(datadir)/dx/lib - - libs_DATA = colors.txt dxexec.def dxexec.exp dxexec.imp dxexec.ifs \ - dxfSaveCurrentImage.net dxrc mdf2c.awk messages outboard.c -diff -up dx-4.4.4/man/Makefile.am.r dx-4.4.4/man/Makefile.am ---- dx-4.4.4/man/Makefile.am.r 1999-04-03 18:31:28.000000000 +0200 -+++ dx-4.4.4/man/Makefile.am 2009-11-06 11:47:32.227944298 +0100 -@@ -1,4 +1,4 @@ - ## Process this file with automake to produce Makefile.in - --SUBDIRS = manl catl -+SUBDIRS = manl - -diff -up dx-4.4.4/man/manl/Makefile.am.r dx-4.4.4/man/manl/Makefile.am ---- dx-4.4.4/man/manl/Makefile.am.r 2002-05-20 06:47:06.000000000 +0200 -+++ dx-4.4.4/man/manl/Makefile.am 2009-11-06 11:47:32.228944553 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --mandir = $(prefix)/dx/man -+mandir = $(datadir)/man - - man_MANS = dx.l - EXTRA_DIST = $(man_MANS) -diff -up dx-4.4.4/src/exec/dxexec/Makefile.am.r dx-4.4.4/src/exec/dxexec/Makefile.am ---- dx-4.4.4/src/exec/dxexec/Makefile.am.r 2006-01-11 17:24:39.000000000 +0100 -+++ dx-4.4.4/src/exec/dxexec/Makefile.am 2009-11-06 11:47:32.229944807 +0100 -@@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libDXEXEC.la - libDXEXEC_la_SOURCES = main.c - libDXEXEC_la_CFLAGS = $(AM_CFLAGS) - --bindir = $(prefix)/dx/bin_@ARCH@ -+bindir = $(libdir)/dx/bin_@ARCH@ - bin_PROGRAMS = dxexec - - dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \ -diff -up dx-4.4.4/src/exec/dxmods/local.mk.in.r dx-4.4.4/src/exec/dxmods/local.mk.in ---- dx-4.4.4/src/exec/dxmods/local.mk.in.r 2003-07-12 02:12:06.000000000 +0200 -+++ dx-4.4.4/src/exec/dxmods/local.mk.in 2009-11-06 11:47:32.231945316 +0100 -@@ -14,23 +14,23 @@ user.c: dx.mdf - - dxcm.mdf: ${srcdir}/dxmdf.src - -rm -f dxcm.mdf -- cp ${srcdir}/dxmdf.src tmp.c -- $(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp.c > dxcm.mdf -- -rm -f tmp.c -+ cp ${srcdir}/dxmdf.src dxcm.tmp.c -+ $(CPP) $(INCLUDES) $(MDF) $(DEFS) dxcm.tmp.c > dxcm.mdf -+ -rm -f dxcm.tmp.c - - dx.mdf: ${srcdir}/dxmdf.src - echo MYINC: $(MYINC) - -rm -f dx.mdf -- cp ${srcdir}/dxmdf.src tmp.c -- $(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp.c > dx.mdf -+ cp ${srcdir}/dxmdf.src dx.tmp.c -+ $(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS dx.tmp.c > dx.mdf - @echo '/^ *$$/{' > stripl.sed - @echo 'N' >> stripl.sed - @echo '/^ *\\n *$$/D' >> stripl.sed - @echo '}' >> stripl.sed -- cat dx.mdf |sed '/^#/d' > tmp.mdf -- cat tmp.mdf |sed -f stripl.sed > dx.mdf -- @rm -f stripl.sed tmp.mdf -- -rm -f tmp.c -+ cat dx.mdf |sed '/^#/d' > dx.tmp.mdf -+ cat dx.tmp.mdf |sed -f stripl.sed > dx.mdf -+ @rm -f stripl.sed dx.tmp.mdf -+ -rm -f dx.tmp.c - - .y.h: - $(YACC) $(YFLAGS) -d ${srcdir}/$*.y -diff -up dx-4.4.4/src/exec/dxmods/Makefile.am.r dx-4.4.4/src/exec/dxmods/Makefile.am ---- dx-4.4.4/src/exec/dxmods/Makefile.am.r 2003-08-19 00:51:10.000000000 +0200 -+++ dx-4.4.4/src/exec/dxmods/Makefile.am 2009-11-06 11:47:32.233940447 +0100 -@@ -1,8 +1,9 @@ - ## Process this file with automake to produce Makefile.in - - INCLUDES = -I${top_srcdir}/include -I${srcdir}/../dpexec -I$(BUILDBASE)/include -D@ARCH@ -+INCLUDES+= -I/usr/include/netcdf - --dxmdfdir = $(prefix)/dx/lib -+dxmdfdir = $(datadir)/dx/lib - noinst_LTLIBRARIES = libDXMODS.la libusercm.la libuser.la libDXMODSN.la - SUFFIXES = .c .y .c .s .h .o - -@@ -13,6 +14,8 @@ DISTCLEANFILES = dx.mdf dxcm.mdf user.c - - dxmdf_DATA = dx.mdf - -+user.c: dx.mdf -+ - _complex.o: _compparse.h - - HEADERS1 = \ -diff -up dx-4.4.4/src/exec/libdx/Makefile.am.r dx-4.4.4/src/exec/libdx/Makefile.am ---- dx-4.4.4/src/exec/libdx/Makefile.am.r 2006-03-27 20:56:53.000000000 +0200 -+++ dx-4.4.4/src/exec/libdx/Makefile.am 2009-11-06 11:47:32.234939235 +0100 -@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@ - #INCLUDES = -I../../../include -D@ARCH@ - INCLUDES = -I${top_srcdir}/include -D@ARCH@ - --dxlibdir = $(prefix)/dx/lib_@ARCH@ -+dxlibdir = $(libdir) - - noinst_LTLIBRARIES = libLIBDX.la libcallm.la libmem.la - #dxlib_LIBRARIES = libDXlite.a -diff -up dx-4.4.4/src/exec/libdx/memory.c.r dx-4.4.4/src/exec/libdx/memory.c ---- dx-4.4.4/src/exec/libdx/memory.c.r 2006-08-21 18:42:42.000000000 +0200 -+++ dx-4.4.4/src/exec/libdx/memory.c 2009-11-06 11:47:32.235941444 +0100 -@@ -66,7 +66,6 @@ - - #if linux - #include --#include - #include - #endif - -diff -up dx-4.4.4/src/exec/Makefile.am.r dx-4.4.4/src/exec/Makefile.am ---- dx-4.4.4/src/exec/Makefile.am.r 2003-09-17 00:40:40.000000000 +0200 -+++ dx-4.4.4/src/exec/Makefile.am 2009-11-06 11:47:32.236940232 +0100 -@@ -1,6 +1,6 @@ - SUBDIRS = libdx dxmods hwrender dpexec dxexec - --dxlibdir = $(prefix)/dx/lib_@ARCH@ -+dxlibdir = $(libdir) - - MAJOR_VERSION=@MAJOR_VERSION@ - MINOR_VERSION=@MINOR_VERSION@ -diff -up dx-4.4.4/src/misc/Makefile.am.r dx-4.4.4/src/misc/Makefile.am ---- dx-4.4.4/src/misc/Makefile.am.r 2003-07-12 02:12:13.000000000 +0200 -+++ dx-4.4.4/src/misc/Makefile.am 2009-11-06 11:47:32.236940232 +0100 -@@ -4,7 +4,7 @@ INCLUDES = -I${top_srcdir}/include -D@AR - - dxbindir = $(prefix)/bin - noinst_PROGRAMS = dxlocal --archmakdir = $(prefix)/dx/lib_$(ARCH) -+archmakdir = $(libdir) - archmak_DATA = arch.mak - - dxlocal_SOURCES = dx.c utils.c -@@ -15,5 +15,5 @@ install-exec-local: - if test ! -z "@INSTALL_BIN_PROGRAM@" ; then \ - $(mkinstalldirs) $(prefix)/bin ; \ - $(INSTALL) dxlocal@EXEEXT@ \ -- $(prefix)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \ -+ $(libdir)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \ - fi -diff -up dx-4.4.4/src/uipp/dxl/Makefile.am.r dx-4.4.4/src/uipp/dxl/Makefile.am ---- dx-4.4.4/src/uipp/dxl/Makefile.am.r 2003-07-12 02:12:16.000000000 +0200 -+++ dx-4.4.4/src/uipp/dxl/Makefile.am 2009-11-06 11:47:32.236940232 +0100 -@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@ - - INCLUDES = -I${top_srcdir}/include -D@ARCH@ - --dxlibdir = $(prefix)/dx/lib_@ARCH@ -+dxlibdir = $(libdir) - - noinst_HEADERS = \ - dxlP.h \ -diff -up dx-4.4.4/src/uipp/dxui/Makefile.am.r dx-4.4.4/src/uipp/dxui/Makefile.am ---- dx-4.4.4/src/uipp/dxui/Makefile.am.r 2003-07-12 02:12:17.000000000 +0200 -+++ dx-4.4.4/src/uipp/dxui/Makefile.am 2009-11-06 11:47:32.237940486 +0100 -@@ -2,7 +2,7 @@ - - INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D@ARCH@ - --dxbindir = $(prefix)/dx/bin_@ARCH@ -+dxbindir = $(libdir)/dx/bin_@ARCH@ - dxbin_PROGRAMS = dxui - - -diff -up dx-4.4.4/src/uipp/java/Makefile.am.r dx-4.4.4/src/uipp/java/Makefile.am ---- dx-4.4.4/src/uipp/java/Makefile.am.r 2006-03-27 20:06:09.000000000 +0200 -+++ dx-4.4.4/src/uipp/java/Makefile.am 2009-11-06 11:47:32.238939763 +0100 -@@ -27,12 +27,12 @@ - ## libtool and the -shrext flag to make this much more - ## portable. - --javadxdir = $(prefix)/dx/java/htmlpages -+javadxdir = $(libdir)/dx/java/htmlpages - javadx_DATA = dx.jar --javasrvdir = $(prefix)/dx/java/server/class -+javasrvdir = $(libdir)/dx/java/server/class - javasrv_DATA = server.jar - EXTRA_DIST = $(DX_SRCS) DXServer.java makeall.java makewrl.java exports.awk README --javalibdir = $(prefix)/dx/java/server/lib_@ARCH@ -+javalibdir = $(libdir)/dx/java/server/lib_@ARCH@ - - javalib_DATA = @ANYDX@ - SUBDIRS = server dx layout -diff -up dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r dx-4.4.4/src/uipp/java/server/macros/Makefile.am ---- dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r 1999-07-09 21:25:13.000000000 +0200 -+++ dx-4.4.4/src/uipp/java/server/macros/Makefile.am 2009-11-06 11:47:32.238939763 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --serverdatadir = $(prefix)/dx/java/server/dxmacros -+serverdatadir = $(libdir)/dx/java/server/dxmacros - - serverdata_DATA = $(MACRO_FILES) - -diff -up dx-4.4.4/src/uipp/java/server/Makefile.am.r dx-4.4.4/src/uipp/java/server/Makefile.am ---- dx-4.4.4/src/uipp/java/server/Makefile.am.r 2001-05-21 16:47:39.000000000 +0200 -+++ dx-4.4.4/src/uipp/java/server/Makefile.am 2009-11-06 11:47:32.238939763 +0100 -@@ -1,6 +1,6 @@ --srvbindir = $(prefix)/dx/java/server/bin --srvoutputdir = $(prefix)/dx/java/output --userhtmldir = $(prefix)/dx/java/user -+srvbindir = $(libdir)/dx/java/server/bin -+srvoutputdir = $(libdir)/dx/java/output -+userhtmldir = $(libdir)/dx/java/user - # the server script (in srvbindir) will actually cd and run from the class subdir so that java will find the classes - # the server will expect to find a file dxserver.paths there to tell the exec where to find .net files - srvrundir = $(srvbindir)/../class -diff -up dx-4.4.4/src/uipp/mb/Makefile.am.r dx-4.4.4/src/uipp/mb/Makefile.am ---- dx-4.4.4/src/uipp/mb/Makefile.am.r 2003-08-20 16:21:33.000000000 +0200 -+++ dx-4.4.4/src/uipp/mb/Makefile.am 2009-11-06 11:47:32.239939528 +0100 -@@ -2,7 +2,7 @@ - - INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D@ARCH@ - --dxbindir = $(prefix)/dx/bin_@ARCH@ -+dxbindir = $(libdir)/dx/bin_@ARCH@ - - dxbin_PROGRAMS = builder - -diff -up dx-4.4.4/src/uipp/prompter/Makefile.am.r dx-4.4.4/src/uipp/prompter/Makefile.am ---- dx-4.4.4/src/uipp/prompter/Makefile.am.r 2003-11-04 05:20:14.000000000 +0100 -+++ dx-4.4.4/src/uipp/prompter/Makefile.am 2009-11-06 11:47:32.239939528 +0100 -@@ -2,7 +2,7 @@ - - INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -D@ARCH@ - --dxbindir = $(prefix)/dx/bin_@ARCH@ -+dxbindir = $(libdir)/dx/bin_@ARCH@ - - dxbin_PROGRAMS = prompter - -diff -up dx-4.4.4/src/uipp/startup/Makefile.am.r dx-4.4.4/src/uipp/startup/Makefile.am ---- dx-4.4.4/src/uipp/startup/Makefile.am.r 2003-07-12 02:12:29.000000000 +0200 -+++ dx-4.4.4/src/uipp/startup/Makefile.am 2009-11-06 11:47:32.240940272 +0100 -@@ -2,7 +2,7 @@ - - INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@ - --dxbindir = $(prefix)/dx/bin_@ARCH@ -+dxbindir = $(libdir)/dx/bin_@ARCH@ - - dxbin_PROGRAMS = startupui - -diff -up dx-4.4.4/src/uipp/tutor/Makefile.am.r dx-4.4.4/src/uipp/tutor/Makefile.am ---- dx-4.4.4/src/uipp/tutor/Makefile.am.r 2003-07-12 02:12:29.000000000 +0200 -+++ dx-4.4.4/src/uipp/tutor/Makefile.am 2009-11-06 11:47:32.240940272 +0100 -@@ -2,7 +2,7 @@ - - INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@ - --dxbindir = $(prefix)/dx/bin_@ARCH@ -+dxbindir = $(libdir)/dx/bin_@ARCH@ - - dxbin_PROGRAMS = tutor - -diff -up dx-4.4.4/src/uipp/ui/Makefile.am.r dx-4.4.4/src/uipp/ui/Makefile.am ---- dx-4.4.4/src/uipp/ui/Makefile.am.r 2001-04-12 16:29:02.000000000 +0200 -+++ dx-4.4.4/src/uipp/ui/Makefile.am 2009-11-06 11:47:32.240940272 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --uidatadir = $(prefix)/dx/ui -+uidatadir = $(datadir)/dx/ui - - DATA1 = \ - icon50.dat icon50.xpm logo.dat logo.xpm ui.mdf Basic2D.cfg Basic2D.net \ diff --git a/dx.spec b/dx.spec index 59db104..119ffca 100644 --- a/dx.spec +++ b/dx.spec @@ -1,25 +1,27 @@ Summary: Open source version of IBM's Visualization Data Explorer Name: dx Version: 4.4.4 -Release: 40%{?dist} +Release: 41%{?dist} URL: http://www.opendx.org/ Group: Applications/Engineering Source0: http://opendx.informatics.jax.org/source/dx-%{version}.tar.gz Source1: %{name}.desktop -Patch0: %{name}-rpm.patch -Patch1: %{name}-open.patch -Patch2: %{name}-gcc43.patch +Patch1: 0001-dx-rpm.patch +Patch2: 0002-dx-open.patch +Patch3: 0003-dx-gcc43.patch # fixes http://www.opendx.org/bugs/view.php?id=236 -Patch3: %{name}-errno.patch +Patch4: 0004-dx-errno.patch # fix NULL pointer dereference when running dxexec over ssh # without X forwarding -Patch4: %{name}-null.patch +Patch5: 0005-dx-null.patch # remove calls to non-public ImageMagick function to fix linking -Patch5: %{name}-magick.patch +Patch6: 0006-dx-magick.patch # fix -Werror=format-security errors -Patch6: %{name}-format-security.patch +Patch7: 0007-dx-format-security.patch # fix gcc-6.0 -Warrowing errors -Patch7: %{name}-narrowing.patch +Patch8: 0008-dx-narrowing.patch +# fix gcc-7.0 incompatibilites +Patch9: 0009-gcc7.0-compatibility.patch License: IBM BuildRequires: bison @@ -64,14 +66,15 @@ Editor, or in the scripting language, you will need this package. %prep %setup -q -%patch0 -p1 -b .r -%patch1 -p1 -b .open -%patch2 -p1 -b .gcc43 -%patch3 -p1 -b .errno -%patch4 -p1 -b .null -%patch5 -p1 -b .magick -%patch6 -p1 -b .format-security +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 # fix debuginfo rpmlint warnings chmod a-x src/exec/{dxmods,dpexec,hwrender}/*.{c,h} @@ -88,10 +91,10 @@ autoreconf --force --install --enable-new-keylayout \ --with-rsh=%{_bindir}/ssh -make %{?_smp_mflags} +%{make_build} %install -%make_install +%{make_install} ln -s ../../%{_lib}/dx/bin_linux $RPM_BUILD_ROOT%{_datadir}/dx/ @@ -129,6 +132,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/lib*.so %changelog +* Wed Feb 15 2017 Fedora Release Engineering - 4.4.4-41 +- Add 0009-gcc7.0-compatibility.patch (Fix F26FTBFS). +- Rebase patches. +- Modernize spec. + * Fri Feb 10 2017 Fedora Release Engineering - 4.4.4-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild