ivtools-patch Mailing List for ivtools (Page 4)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Patch:    ivtools-020114-johnston-021
For:      ivtools-1.0.1
Author:   joh...@us...
Subject:  fixes for compiling with Cygwin
Requires: 

This is an intermediate patch to ivtools-1.0.1.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

	patch -p0 <ThisFile

Summary of Changes:

- changes required to get things compiling with Cygwin under Windows 2K

Index: src_iv/Imakefile
diff -c src_iv/Imakefile:1.1 src_iv/Imakefile:1.2
*** src_iv/Imakefile:1.1	Fri Nov  2 13:04:54 2001
--- src/IV/Imakefile	Mon Jan 14 16:28:11 2002
***************
*** 65,71 ****
  InterViewsObjFlags(dialogs,$(KIT_CCFLAGS))
  InterViewsObj(fbrowser)
  InterViewsObj(fchooser)
! InterViewsObj(field)
  InterViewsObj(geometry)
  InterViewsObj(glyph)
  InterViewsObj(group)
--- 65,71 ----
  InterViewsObjFlags(dialogs,$(KIT_CCFLAGS))
  InterViewsObj(fbrowser)
  InterViewsObj(fchooser)
! InterViewsObjFlags(field,-O2)
  InterViewsObj(geometry)
  InterViewsObj(glyph)
  InterViewsObj(group)
Index: src_interviews/psfont.c
diff -c src_interviews/psfont.c:1.1 src_interviews/psfont.c:1.2
*** src_interviews/psfont.c:1.1	Fri Nov  2 13:05:00 2001
--- src/InterViews/psfont.c	Mon Jan 14 16:28:13 2002
***************
*** 23,29 ****
   */

  /*
!  * PSFont - use PostScript font metrics
   */

  #include <InterViews/psfont.h>
--- 23,29 ----
   */

  /*
!  * iv_PSFont - use PostScript font metrics
   */

  #include <InterViews/psfont.h>
***************
*** 40,46 ****

  class PSFontImpl {
  private:
!     friend class PSFont;

      char* name;
      char* encoding;
--- 40,46 ----

  class PSFontImpl {
  private:
!     friend class PSFont_31;

      char* name;
      char* encoding;
***************
*** 50,56 ****
      static char* psfile(const char* name);
  };

! PSFont::PSFont(
      const char* psname, Coord size, const char* name, float scale
  ) : Font(name, scale) {
      PSFontImpl* p = new PSFontImpl;
--- 50,56 ----
      static char* psfile(const char* name);
  };

! PSFont_31::PSFont_31(
      const char* psname, Coord size, const char* name, float scale
  ) : Font(name, scale) {
      PSFontImpl* p = new PSFontImpl;
***************
*** 83,101 ****
      delete metrics_file;
  }

! PSFont::~PSFont() {
      delete impl_->name;
      delete impl_->encoding;
      delete impl_;
  }

! const char* PSFont::name() const { return impl_->name; }
! const char* PSFont::encoding() const { return impl_->encoding; }
! Coord PSFont::size() const { return impl_->size; }
! Coord PSFont::width(long c) const { return impl_->widths[c]; }
! Coord PSFont::width(const char* s, int n) const { return Font::width(s, n); }

! boolean PSFont::exists(const char* psname) {
      char* metrics_file = PSFontImpl::psfile(psname);
      FILE* f = fopen(metrics_file, "r");
      delete metrics_file;
--- 83,101 ----
      delete metrics_file;
  }

! PSFont_31::~PSFont_31() {
      delete impl_->name;
      delete impl_->encoding;
      delete impl_;
  }

! const char* PSFont_31::name() const { return impl_->name; }
! const char* PSFont_31::encoding() const { return impl_->encoding; }
! Coord PSFont_31::size() const { return impl_->size; }
! Coord PSFont_31::width(long c) const { return impl_->widths[c]; }
! Coord PSFont_31::width(const char* s, int n) const { return Font::width(s, n); }

! boolean PSFont_31::exists(const char* psname) {
      char* metrics_file = PSFontImpl::psfile(psname);
      FILE* f = fopen(metrics_file, "r");
      delete metrics_file;
Index: src_iv-2_6/rubrect.c
diff -c src_iv-2_6/rubrect.c:1.1 src_iv-2_6/rubrect.c:1.2
*** src_iv-2_6/rubrect.c:1.1	Fri Nov  2 13:05:04 2001
--- src/IV-2_6/rubrect.c	Mon Jan 14 16:28:15 2002
***************
*** 33,39 ****
  #include <stdlib.h>
  #ifndef apollo
  #if defined(__CYGWIN__)
! #include <mingw32/float.h>
  #else
  #include <math.h>
  #define MAXFLOAT HUGE_VAL
--- 33,39 ----
  #include <stdlib.h>
  #ifndef apollo
  #if defined(__CYGWIN__)
! #include <float.h>
  #else
  #include <math.h>
  #define MAXFLOAT HUGE_VAL
Index: IVGlyph/idraw.c
diff -c IVGlyph/idraw.c:1.1 IVGlyph/idraw.c:1.2
*** IVGlyph/idraw.c:1.1	Fri Nov  2 13:05:31 2001
--- src/IVGlyph/idraw.c	Mon Jan 14 16:28:19 2002
***************
*** 478,486 ****
      NullTerminatedString psname_nt(psname);
      float pointsize;
      read(pointsize);
!     if (PSFont::exists(psname_nt.string())) {
          NullTerminatedString s_nt(s);
!         return new PSFont(psname_nt.string(), pointsize, s_nt.string(), 1.0)
  ;
      }
      return WidgetKit::instance()->font();
--- 478,486 ----
      NullTerminatedString psname_nt(psname);
      float pointsize;
      read(pointsize);
!     if (PSFont_31::exists(psname_nt.string())) {
          NullTerminatedString s_nt(s);
!         return new PSFont_31(psname_nt.string(), pointsize, s_nt.string(), 1.0)
  ;
      }
      return WidgetKit::instance()->font();
Index: examples3.1_ips/idraw.c
diff -c examples3.1_ips/idraw.c:1.1 examples3.1_ips/idraw.c:1.2
*** examples3.1_ips/idraw.c:1.1	Fri Nov  2 13:06:25 2001
--- src/glyphs/examples3.1/ips/idraw.c	Mon Jan 14 16:28:29 2002
***************
*** 444,452 ****
      NullTerminatedString psname_nt(psname);
      float pointsize;
      read(pointsize);
!     if (PSFont::exists(psname_nt.string())) {
  	NullTerminatedString s_nt(s);
! 	return new PSFont(psname_nt.string(), pointsize, s_nt.string(), 1.0);
      }
      String default_font("fixed");
      Session::instance()->style()->find_attribute("font", default_font);
--- 444,452 ----
      NullTerminatedString psname_nt(psname);
      float pointsize;
      read(pointsize);
!     if (PSFont_31::exists(psname_nt.string())) {
  	NullTerminatedString s_nt(s);
! 	return new PSFont_31(psname_nt.string(), pointsize, s_nt.string(), 1.0);
      }
      String default_font("fixed");
      Session::instance()->style()->find_attribute("font", default_font);
Index: include_interviews/psfont.h
diff -c include_interviews/psfont.h:1.1 include_interviews/psfont.h:1.2
*** include_interviews/psfont.h:1.1	Fri Nov  2 13:07:34 2001
--- src/include/InterViews/psfont.h	Mon Jan 14 16:28:39 2002
***************
*** 23,29 ****
   */

  /*
!  * PSFont - use PostScript font metrics
   */

  #ifndef iv_psfont_h
--- 23,29 ----
   */

  /*
!  * iv_PSFont - use PostScript font metrics
   */

  #ifndef iv_psfont_h
***************
*** 35,44 ****

  class PSFontImpl;

! class PSFont : public Font {
  public:
!     PSFont(const char* psname, Coord size, const char* name, float scale);
!     virtual ~PSFont();

      static boolean exists(const char* psname);

--- 35,44 ----

  class PSFontImpl;

! class PSFont_31 : public Font {
  public:
!     PSFont_31(const char* psname, Coord size, const char* name, float scale);
!     virtual ~PSFont_31();

      static boolean exists(const char* psname);

Index: config_ivtools/site.def.CYGWIN
diff -c config_ivtools/site.def.CYGWIN:1.1 config_ivtools/site.def.CYGWIN:1.2
*** config_ivtools/site.def.CYGWIN:1.1	Fri Nov  2 13:08:11 2001
--- config/site.def.CYGWIN	Mon Jan 14 16:28:47 2002
***************
*** 5,10 ****
--- 5,14 ----
  #undef ExtraCCLdLibs
  #define ExtraCCLdLibs -lstdc++ -lm

+ /* permissive for X11R6.4 include files */
+ #undef ExtraCCFlags
+ #define ExtraCCFlags -fpermissive 
+ 
  /* file output by configure script */
  #include "config-default-gcc.defs"

*** /dev/null	 Mon Jan 14 16:28:50 PST 2002
--- patches/ivtools-020114-johnston-021
*************** patches/ivtools-020114-johnston-021
*** 0 ****
--- 1 ----
+ ivtools-020114-johnston-021

1999	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2000	Jan (17)	Feb (14)	Mar (7)	Apr (7)	May (20)	Jun (18)	Jul (5)	Aug (9)	Sep (4)	Oct (2)	Nov (2)	Dec (1)
2001	Jan (3)	Feb (2)	Mar (5)	Apr (7)	May (9)	Jun (15)	Jul (10)	Aug (2)	Sep (10)	Oct (15)	Nov (14)	Dec (2)
2002	Jan (8)	Feb (13)	Mar (10)	Apr (3)	May (2)	Jun (7)	Jul (5)	Aug (3)	Sep (1)	Oct (1)	Nov (10)	Dec
2003	Jan	Feb	Mar	Apr	May	Jun	Jul (3)	Aug	Sep	Oct (4)	Nov (1)	Dec (3)
2004	Jan (2)	Feb (6)	Mar (1)	Apr (1)	May	Jun (1)	Jul (1)	Aug	Sep	Oct	Nov	Dec
2005	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (2)	Oct (4)	Nov (1)	Dec
2006	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec
2008	Jan	Feb	Mar (1)	Apr	May (1)	Jun	Jul (2)	Aug	Sep (1)	Oct	Nov	Dec
2009	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (2)	Dec
2010	Jan	Feb (2)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec