[eso-midas] 01/01: Remove remaining compilation errors

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository eso-midas.

commit b27ea4d6147d247bf906809637f451ed63bc3a5b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Apr 21 17:52:13 2014 +0200

    Remove remaining compilation errors
---
 debian/patches/fix_formaterrors.patch     | 42 +++++++++++++++++++++++++++++++
 debian/patches/ftoc.patch                 | 30 ++++++++++++++++++++++
 debian/patches/propagate_buildflags.patch | 23 ++++++++++++++++-
 debian/patches/series                     |  2 ++
 4 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/debian/patches/fix_formaterrors.patch b/debian/patches/fix_formaterrors.patch
new file mode 100644
index 0000000..4c3ccac
--- /dev/null
+++ b/debian/patches/fix_formaterrors.patch
@@ -0,0 +1,42 @@
+--- a/gui/GraphLib/libsrc/uimxR5/src/ux_error.c
++++ b/gui/GraphLib/libsrc/uimxR5/src/ux_error.c
+@@ -77,7 +77,7 @@
+ 
+ 	format_str = UxCopyString(va_arg (args, char*));
+ 	
+-	(void) fprintf (stderr, msg_prefix);
++	(void) fprintf (stderr, "%s", msg_prefix);
+ 	(void) fprintf (stderr, CGETS(MS_MISC_INTERNALERRORFORMAT,
+ 			DS_MS_MISC_INTERNALERRORFORMAT), file_name, line_num);
+ 
+@@ -104,7 +104,7 @@
+ 
+ 	va_start (args,format_str);
+ 
+-	(void) fprintf (stderr, msg_prefix);
++	(void) fprintf (stderr, "%s", msg_prefix);
+ 	(void) vfprintf (stderr, format_str, args);
+ 
+ 	va_end (args);
+--- a/gui/XIrspec/src/help.c
++++ b/gui/XIrspec/src/help.c
+@@ -278,7 +278,7 @@
+     FILE *fp;
+ 
+     fp = fopen(PRINT_FILE, "w");
+-    fprintf(fp, print_text);
++    fprintf(fp, "%s", print_text);
+     fclose(fp);
+ 
+     sprintf(s, "%s %s", PRINT_COMMAND, PRINT_FILE);
+--- a/prim/plot/src/plothbdf.c
++++ b/prim/plot/src/plothbdf.c
+@@ -310,7 +310,7 @@
+ 
+      if ( plmode == 1 )
+         { (void) strcat ( label[2], name );
+-          (void) sprintf( label[3], ident );
++	    (void) sprintf( label[3], "%s", ident );
+           PLIDEN( plmode, label[2], label[3] );
+         }
+      else if ( plmode == 2 )
diff --git a/debian/patches/ftoc.patch b/debian/patches/ftoc.patch
new file mode 100644
index 0000000..f01903f
--- /dev/null
+++ b/debian/patches/ftoc.patch
@@ -0,0 +1,30 @@
+--- a/libsrc/ftoc-new/stf.fc
++++ b/libsrc/ftoc-new/stf.fc
+@@ -44,6 +44,7 @@
+ -----------------------------------------------------------------------------*/
+ 
+ #include <ftoc_comm.h>
++#include <ftoc_commc.h>
+ #include <midas_def.h>
+ 
+ #include <stdlib.h>
+--- a/libsrc/ftoc-new/sti.fc
++++ b/libsrc/ftoc-new/sti.fc
+@@ -46,6 +46,7 @@
+ -----------------------------------------------------------------------------*/
+ 
+ #include <ftoc_comm.h>
++#include <ftoc_commc.h>
+ #include <midas_def.h>
+ 	
+ 
+--- a/libsrc/ftoc-new/tbc.fc
++++ b/libsrc/ftoc-new/tbc.fc
+@@ -44,6 +44,7 @@
+ -----------------------------------------------------------------------------*/
+ 
+ #include <ftoc_comm.h>
++#include <ftoc_commc.h>
+ 
+ #include <tbldef.h>
+ #include <midas_def.h>
diff --git a/debian/patches/propagate_buildflags.patch b/debian/patches/propagate_buildflags.patch
index d0b37cc..bd5fa3d 100644
--- a/debian/patches/propagate_buildflags.patch
+++ b/debian/patches/propagate_buildflags.patch
@@ -238,6 +238,15 @@
  
  LLIB  = libprep.a -L$(LIBDIR) -lmidas 
  LLIB1 =	libprep.a -L$(LIBDIR) -lgen  -lxcon -lgmidas -lmidas 
+@@ -124,7 +124,7 @@
+ 
+ newcom.out: newcom.in newcom.exe
+ 	$(RM) newcom.bin newcom.out
+-	./newcom.exe
++	LD_LIBRARY_PATH=../lib ./newcom.exe
+ 
+ syskeys.unix: syskeys.datorg 
+ 	$(RM) $@
 --- a/prim/dio/libsrc/makefile
 +++ b/prim/dio/libsrc/makefile
 @@ -14,7 +14,7 @@
@@ -574,6 +583,18 @@
  	$(LD77_CMD) $(OBJ3) $(SLIB) -o $@ $(DEV_NULL)  
  
  $(M)/ftoc_generic.exe:: $(OBJ5)
+@@ -57,9 +57,8 @@
+ $(INC)/ftoc.h: $(M)/ftoc_noop
+ 	cp $(INC)/ftoc_pc3.h $(INC)/ftoc.h
+ 
+-$(INC)/ftoc_comm.h: $(M)/ftoc_comm.exe
+-	rm -f $@
+-	cp $(INC)/`$(M)/ftoc_comm.exe` $@
++$(INC)/ftoc_comm.h:
++	cp $(INC)/ftoc_amd64.h $@
+ 
+ $(INC)/ftoc_log.h: $(M)/ftoc_log.exe
+ 	rm -f $(INC)/ftoc_log.h
 --- a/system/machine/makefile
 +++ b/system/machine/makefile
 @@ -31,8 +31,8 @@
@@ -583,7 +604,7 @@
 -	$(CC) $(CFLAGS) -c computer.c $(DEV_NULL) ||  \
 -	$(CC) $(CFLAGS) -DNO_FLOAT_H  -c computer.c $(DEV_NULL)
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c computer.c $(DEV_NULL) ||  \
-+	$(CC) (CPPFLAGS) $(CFLAGS) -DNO_FLOAT_H  -c computer.c $(DEV_NULL)
++	$(CC) $(CPPFLAGS) $(CFLAGS) -DNO_FLOAT_H  -c computer.c $(DEV_NULL)
  
  $(INC)/computer.h: $(M)/computer.exe
  	$(M)/computer.exe $@
diff --git a/debian/patches/series b/debian/patches/series
index 6c08fb4..764b344 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ setup-debian.patch
 writting.patch
 fix_shellscripts.patch
 propagate_buildflags.patch
+ftoc.patch
+fix_formaterrors.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git