tags 441490 + patch thanks Hi ivtools people (and hi, AM!)--
Attached please find a patch which gets ivtools to not FTBFS any more.
Interestingly, i couldn't replicate the specific errors reported in
#441490, and the FTBFS that i ran into building ivtools on an up-to-date
sid system looked a lot more like #461680 (which was ostensibly already
resolved by 1.1.3-5.4).
hth,
--dkg
PS according to #303956, a newer upstream version has been available for
4 years. And the latest release according to upstream appears to be
1.2.6, released in July 2008. There are a number of other outstanding
bugs against the version of ivtools in debian, which appears to be a
dead end in terms of upstream support (last release on the 1.1 line was
in 2004). I can't help but think it would be a good idea to pick up the
latest version from upstream to avoid maintaining such an old version
just for debian.
diff -u ivtools-1.1.3/src/IV-common/string.c ivtools-1.1.3/src/IV-common/string.c
--- ivtools-1.1.3/src/IV-common/string.c
+++ ivtools-1.1.3/src/IV-common/string.c
@@ -22,6 +22,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <cstdio>
#include <OS/string.h>
#include <ctype.h>
#include <string.h>
diff -u ivtools-1.1.3/src/include/ivstd/iostream.h ivtools-1.1.3/src/include/ivstd/iostream.h
--- ivtools-1.1.3/src/include/ivstd/iostream.h
+++ ivtools-1.1.3/src/include/ivstd/iostream.h
@@ -1,3 +1,4 @@
+#include <cstdio>
#ifndef _iv_iostream_h_
#define _iv_iostream_h_
#include <iosfwd>
diff -u ivtools-1.1.3/src/include/ivstd/fstream.h ivtools-1.1.3/src/include/ivstd/fstream.h
--- ivtools-1.1.3/src/include/ivstd/fstream.h
+++ ivtools-1.1.3/src/include/ivstd/fstream.h
@@ -1,3 +1,4 @@
+#include <cstdio>
#ifndef _iv_fstream_
#define _iv_fstream_
#include_next <fstream>
diff -u ivtools-1.1.3/src/OS/file.c ivtools-1.1.3/src/OS/file.c
--- ivtools-1.1.3/src/OS/file.c
+++ ivtools-1.1.3/src/OS/file.c
@@ -22,12 +22,12 @@
* OF THIS SOFTWARE.
*/
+#include <cstdio>
#include <OS/file.h>
#include <OS/string.h>
#include <OS/types.h>
#include <assert.h>
#include <fcntl.h>
-#include <cstdio>
#include <sys/stat.h>
#ifdef sgi
diff -u ivtools-1.1.3/src/Attribute/paramlist.c ivtools-1.1.3/src/Attribute/paramlist.c
--- ivtools-1.1.3/src/Attribute/paramlist.c
+++ ivtools-1.1.3/src/Attribute/paramlist.c
@@ -25,6 +25,7 @@
* Implementation of ParamList class.
*/
+#include <cstdio>
#include <Attribute/alist.h>
#include <Attribute/aliterator.h>
#include <Attribute/paramlist.h>
diff -u ivtools-1.1.3/src/InterViews/fchooser.c ivtools-1.1.3/src/InterViews/fchooser.c
--- ivtools-1.1.3/src/InterViews/fchooser.c
+++ ivtools-1.1.3/src/InterViews/fchooser.c
@@ -26,6 +26,7 @@
* FileChooser -- select a file
*/
+#include <cstdio>
#include <IV-look/choice.h>
#include <IV-look/dialogs.h>
#include <IV-look/fbrowser.h>
diff -u ivtools-1.1.3/src/InterViews/ol_kit.c ivtools-1.1.3/src/InterViews/ol_kit.c
--- ivtools-1.1.3/src/InterViews/ol_kit.c
+++ ivtools-1.1.3/src/InterViews/ol_kit.c
@@ -22,6 +22,7 @@
* OF THIS SOFTWARE.
*/
+#include <cstdio>
#include <Dispatch/dispatcher.h>
#include <Dispatch/iocallback.h>
#include <IV-look/bevel.h>
diff -u ivtools-1.1.3/src/InterViews/field.c ivtools-1.1.3/src/InterViews/field.c
--- ivtools-1.1.3/src/InterViews/field.c
+++ ivtools-1.1.3/src/InterViews/field.c
@@ -26,6 +26,7 @@
* FieldEditor -- simple editor for text fields
*/
+#include <cstdio>
#include <Dispatch/dispatcher.h>
#include <Dispatch/iocallback.h>
#include <IV-look/field.h>
diff -u ivtools-1.1.3/src/InterViews/session.c ivtools-1.1.3/src/InterViews/session.c
--- ivtools-1.1.3/src/InterViews/session.c
+++ ivtools-1.1.3/src/InterViews/session.c
@@ -26,6 +26,7 @@
* Session - coordinate control flow and display management
*/
+#include <cstdio>
#include <Dispatch/dispatcher.h>
#include <Dispatch/iohandler.h>
#include <InterViews/cursor.h>
diff -u ivtools-1.1.3/src/InterViews/kit.c ivtools-1.1.3/src/InterViews/kit.c
--- ivtools-1.1.3/src/InterViews/kit.c
+++ ivtools-1.1.3/src/InterViews/kit.c
@@ -25,7 +25,7 @@
/*
* WidgetKit -- object for creating common UI objects
*/
-
+#include <cstdio>
#ifdef motif_kit
#include <IV-look/mf_kit.h>
#endif
diff -u ivtools-1.1.3/src/Time/Time.h ivtools-1.1.3/src/Time/Time.h
--- ivtools-1.1.3/src/Time/Time.h
+++ ivtools-1.1.3/src/Time/Time.h
@@ -31,6 +31,7 @@
#ifndef TIME_H
#define TIME_H
+#include <cstdio>
#include <iostream>
#include <fstream>
diff -u ivtools-1.1.3/src/ComTerp/debugfunc.c ivtools-1.1.3/src/ComTerp/debugfunc.c
--- ivtools-1.1.3/src/ComTerp/debugfunc.c
+++ ivtools-1.1.3/src/ComTerp/debugfunc.c
@@ -27,6 +27,7 @@
#include <vector>
#endif
#if __GNUC__>=3
+#include <cstdio>
#include <fstream.h>
#endif
diff -u ivtools-1.1.3/src/ComTerp/ctrlfunc.c ivtools-1.1.3/src/ComTerp/ctrlfunc.c
--- ivtools-1.1.3/src/ComTerp/ctrlfunc.c
+++ ivtools-1.1.3/src/ComTerp/ctrlfunc.c
@@ -21,6 +21,7 @@
*
*/
+#include <cstdio>
#include <fstream.h>
#include <iostream>
#include <ComTerp/comhandler.h>
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/TopoFace/fgeomobjs.c
+++ ivtools-1.1.3/src/TopoFace/fgeomobjs.c
@@ -25,6 +25,7 @@
* Implementation of geometrical objects with floating point coordinates.
*/
+#include <cstdio>
#include <TopoFace/fgeomobjs.h>
#include <Unidraw/Graphic/util.h>
#include <Unidraw/ulist.h>
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/include/OS/string.h
+++ ivtools-1.1.3/src/include/OS/string.h
@@ -28,7 +28,7 @@
/*
* String - simple (non-copying) string class
*/
-
+#include <cstdio>
#include <OS/enter-scope.h>
#include <iosfwd>
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/include/Unidraw/catalog.h
+++ ivtools-1.1.3/src/include/Unidraw/catalog.h
@@ -27,6 +27,7 @@
#ifndef unidraw_catalog_h
#define unidraw_catalog_h
+#include <cstdio>
#include <Unidraw/classes.h>
#include <Unidraw/uformat.h>
#include <Unidraw/uhash.h>
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/include/Unidraw/globals.h
+++ ivtools-1.1.3/src/include/Unidraw/globals.h
@@ -27,6 +27,8 @@
#ifndef unidraw_globals_h
#define unidraw_globals_h
+#include <cstdio>
+
#include <IV-2_6/InterViews/defs.h>
#include <Unidraw/enter-scope.h>
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/include/Unidraw/Graphic/geomobjs.h
+++ ivtools-1.1.3/src/include/Unidraw/Graphic/geomobjs.h
@@ -28,6 +28,7 @@
#ifndef unidraw_graphic_geomobjs_h
#define unidraw_graphic_geomobjs_h
+#include <cstdio>
#include <IV-2_6/InterViews/defs.h>
#include <Unidraw/enter-scope.h>
#include <InterViews/resource.h>
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/include/IV-X11/Xlib.h
+++ ivtools-1.1.3/src/include/IV-X11/Xlib.h
@@ -25,7 +25,7 @@
/*
* C++ interface to standard Xlib.h.
*/
-
+#include <cstdio>
#ifndef InterViews_Xlib_h
#define InterViews_Xlib_h
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/GraphUnidraw/graphcatalog.c
+++ ivtools-1.1.3/src/GraphUnidraw/graphcatalog.c
@@ -25,6 +25,7 @@
* GraphCatalog implementation.
*/
+#include <cstdio>
#include <OverlayUnidraw/paramlist.h>
#include <GraphUnidraw/graphcatalog.h>
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/Unidraw-common/geomobjs.c
+++ ivtools-1.1.3/src/Unidraw-common/geomobjs.c
@@ -25,6 +25,8 @@
* Implementation of geometrical objects used by Graphic.
*/
+#include <cstdio>
+
#include <Unidraw/Graphic/geomobjs.h>
#include <Unidraw/Graphic/util.h>
#include <Unidraw/ulist.h>
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/IV-X11/xdrag.c
+++ ivtools-1.1.3/src/IV-X11/xdrag.c
@@ -21,6 +21,7 @@
* SOFTWARE.
*/
+#include <cstdio>
#include <InterViews/cursor.h>
#include <InterViews/event.h>
#include <InterViews/handler.h>
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/tests/y2k/y2ktest.cc
+++ ivtools-1.1.3/src/tests/y2k/y2ktest.cc
@@ -22,6 +22,7 @@
#include <Time/Date.h>
#include <iostream.h>
+using std::cout;
main() {
Date date(1, "Jan", 1999);
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/glyphs/strchooser/main.c
+++ ivtools-1.1.3/src/glyphs/strchooser/main.c
@@ -33,6 +33,9 @@
#include <IVGlyph/strchooser.h>
#include <iostream.h>
+using std::cout;
+using std::endl;
+
static OptionDesc options[] = {
{ nil }
};
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/glyphs/examples3.1/print/main.c
+++ ivtools-1.1.3/src/glyphs/examples3.1/print/main.c
@@ -1,3 +1,4 @@
+#include <cstdio>
#include <IV-look/dialogs.h>
#include <IV-look/kit.h>
#include <InterViews/background.h>
@@ -8,6 +9,8 @@
#include <InterViews/window.h>
#include <fstream.h>
+using std::ofstream;
+
class Printable : public Patch {
public:
Printable(Glyph*);
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/glyphs/examples3.1/drag/main.c
+++ ivtools-1.1.3/src/glyphs/examples3.1/drag/main.c
@@ -32,6 +32,9 @@
#include <InterViews/window.h>
#include <IV-look/kit.h>
+using std::cout;
+using std::endl;
+
///////////////////////////////////////////////
// Glyph that can be dragged to a drag zone. //
///////////////////////////////////////////////
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/InterViews/printer.c
+++ ivtools-1.1.3/src/InterViews/printer.c
@@ -26,6 +26,7 @@
* Printer - draw for PostScript printer
*/
+#include <cstdio>
#include <InterViews/bitmap.h>
#include <InterViews/brush.h>
#include <InterViews/color.h>
signature.asc
Description: OpenPGP digital signature
