patches leading up to ivtools-1.2.1

--Apple-Mail-2--131715489
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="ivtools-040713-johnston-001"
Content-Disposition: attachment;
	filename=ivtools-040713-johnston-001

Patch:    ivtools-040713-johnston-001
For:      ivtools-1.2.0
Author:   [email protected]
Subject:  two fixes from Michal Palczew for ivtools-1.2.1
Requires: 

This is an intermediate patch to ivtools-1.2.0.  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:

Index: config_ivtools/params.def
diff -c config_ivtools/params.def:1.1 config_ivtools/params.def:1.2
*** config_ivtools/params.def:1.1	Tue Jun 15 08:58:30 2004
--- config/params.def	Tue Jul 13 11:19:21 2004
***************
*** 27,33 ****
   * Name of the software release
   */
  #ifndef Release
! #define	Release ivtools-1.2.0
  #endif
  
     RELEASE = Release
--- 27,33 ----
   * Name of the software release
   */
  #ifndef Release
! #define	Release ivtools-1.2.1
  #endif
  
     RELEASE = Release
***************
*** 36,42 ****
   * VersionNumber
   */
  #ifndef Version
! #define	Version 1.2.0
  #endif
  
     VERSION = Version
--- 36,42 ----
   * VersionNumber
   */
  #ifndef Version
! #define	Version 1.2.1
  #endif
  
     VERSION = Version
***************
*** 50,56 ****
  README INSTALL VERSION MANIFEST COPYRIGHT ANNOUNCE README.ivmkcm *.patch *.bugfix.? *.script \
  *.sed comutil.arg comterp.err comutil.ci comterp.arg comterp.ci \
  site.def.SUN4 site.def.LINUX site.def.SGI site.def.HP800 site.def.ALPHA site.def.CYGWIN site.def.NETBSD site.def.FREEBSD \
! WishList *.defaults *.cf HOWTO Copyright *.sh CHANGES CHANGES-0.? *.cpp ivmkmf *.bash *.1  *.3 \
  config.guess config.sub configure configure.in MANIFEST.perceps MANIFEST.comterp *.mk config.mk.in *.tmpl *.flt *.m4 config.defs.in
  #endif
  
--- 50,56 ----
  README INSTALL VERSION MANIFEST COPYRIGHT ANNOUNCE README.ivmkcm *.patch *.bugfix.? *.script \
  *.sed comutil.arg comterp.err comutil.ci comterp.arg comterp.ci \
  site.def.SUN4 site.def.LINUX site.def.SGI site.def.HP800 site.def.ALPHA site.def.CYGWIN site.def.NETBSD site.def.FREEBSD \
! WishList *.defaults *.cf HOWTO Copyright *.sh CHANGES CHANGES-0.? CHANGES-1.? *.cpp ivmkmf *.bash *.1  *.3 \
  config.guess config.sub configure configure.in MANIFEST.perceps MANIFEST.comterp *.mk config.mk.in *.tmpl *.flt *.m4 config.defs.in
  #endif
  
Index: GraphUnidraw/graphcmds.c
diff -c GraphUnidraw/graphcmds.c:1.1 GraphUnidraw/graphcmds.c:1.2
*** GraphUnidraw/graphcmds.c:1.1	Tue Jun 15 08:56:42 2004
--- src/GraphUnidraw/graphcmds.c	Tue Jul 13 11:19:11 2004
***************
*** 294,299 ****
--- 294,307 ----
      Iterator i, j, k;
      Clipboard* globalcb = unidraw->GetCatalog()->GetClipboard();
      Clipboard* cmdcb = GetClipboard();
+ 
+     if (cmdcb == nil) {
+       cb->DeleteComps();
+       delete cb;
+       _executed = false;
+       return;
+     }
+ 
      globalcb->First(j);
      cmdcb->First(k);
      for (cb->First(i); !cb->Done(i); cb->Next(i)) {
***************
*** 467,472 ****
--- 475,488 ----
  
      Iterator i, k;
      Clipboard* cmdcb = GetClipboard();
+ 
+     if (cmdcb == nil) {
+       cb->DeleteComps();
+       delete cb;
+       _executed = false;
+       return;
+     }
+ 
      cmdcb->First(k);
      for (cb->First(i); !cb->Done(i); cb->Next(i)) {
          GraphicComp* gcomp = cb->GetComp(i);
Index: include_std/version.h
diff -c include_std/version.h:1.1 include_std/version.h:1.2
*** include_std/version.h:1.1	Tue Jun 15 08:57:54 2004
--- src/include/ivstd/version.h	Tue Jul 13 11:19:17 2004
***************
*** 1,3 ****
! #define IvtoolsVersion 1.2.0
! #define VersionString "1.2.0"
! #define ReleaseString "ivtools-1.2.0"
--- 1,3 ----
! #define IvtoolsVersion 1.2.1
! #define VersionString "1.2.1"
! #define ReleaseString "ivtools-1.2.1"
Index: top_ivtools/CHANGES
diff -c top_ivtools/CHANGES:1.1 top_ivtools/CHANGES:1.2
*** top_ivtools/CHANGES:1.1	Tue Jun 15 08:53:19 2004
--- ./CHANGES	Tue Jul 13 11:18:55 2004
***************
*** 1,3 ****
--- 1,14 ----
+ July 13th, 2004  ivtools-1.2.1
+ 
+ Two crashes discovered and fixed by Michal Palczewski (mpalczew at
+ users.sourceforge.net).  One was a crash on exit after a delete with
+ idraw/drawtool, the other was a crash upon delete with graphdraw.
+ They turned out to be long-standing bugs in the order of object
+ deletion, problems that hadn't appeared with other versions of gcc.
+ RedHat must have adopted a more aggressive recycling of freed space in
+ a recent release.  Thanks Michal.
+ 
+ 
  June 3rd, 2004  ivtools-1.2
  
  ivtools-1.2 sets a new direction for the package, toward peer-to-peer
Index: top_ivtools/INSTALL
diff -c top_ivtools/INSTALL:1.1 top_ivtools/INSTALL:1.2
*** top_ivtools/INSTALL:1.1	Tue Jun 15 08:53:19 2004
--- ./INSTALL	Tue Jul 13 11:18:55 2004
***************
*** 1,7 ****
  
  			INSTALL for ivtools-1.2
  
! Instructions for building ivtools-1.2.0 from source, the short version:
  
  	./configure
  	make
--- 1,7 ----
  
  			INSTALL for ivtools-1.2
  
! Instructions for building ivtools-1.2.1 from source, the short version:
  
  	./configure
  	make
***************
*** 10,16 ****
  
  And if that doesn't work...
  
! Instructions for building ivtools-1.2.0 from source, the long version:
  
  0. Compilation Environment
  
--- 10,16 ----
  
  And if that doesn't work...
  
! Instructions for building ivtools-1.2.1 from source, the long version:
  
  0. Compilation Environment
  
Index: top_ivtools/README
diff -c top_ivtools/README:1.1 top_ivtools/README:1.2
*** top_ivtools/README:1.1	Tue Jun 15 08:53:20 2004
--- ./README	Tue Jul 13 11:18:55 2004
***************
*** 2,8 ****
  			README for ivtools 1.2
  
  
! This directory contains a release of ivtools 1.2.0.  You should read
  the rest of this file for information on what ivtools is and the
  INSTALL file for instructions on how to build it.
  
--- 2,8 ----
  			README for ivtools 1.2
  
  
! This directory contains a release of ivtools 1.2.1.  You should read
  the rest of this file for information on what ivtools is and the
  INSTALL file for instructions on how to build it.
  
Index: top_ivtools/VERSION
diff -c top_ivtools/VERSION:1.1 top_ivtools/VERSION:1.2
*** top_ivtools/VERSION:1.1	Tue Jun 15 08:53:20 2004
--- ./VERSION	Tue Jul 13 11:18:56 2004
***************
*** 1 ****
! Release 1.2.0
--- 1 ----
! Release 1.2.1
Index: Unidraw/catalog.c
diff -c Unidraw/catalog.c:1.1 Unidraw/catalog.c:1.2
*** Unidraw/catalog.c:1.1	Tue Jun 15 08:55:59 2004
--- src/Unidraw/catalog.c	Tue Jul 13 11:19:08 2004
***************
*** 358,371 ****
      delete _fonts;
      delete _pats;
  
      delete _substMap;
      delete _edInfoMap;
      delete _compMap;
      delete _cmdMap;
      delete _toolMap;
- 
-     _clipboard->DeleteComps();
-     delete _clipboard;
  
  #ifdef __GNUC__
      if (_tmpfile != nil) {
--- 358,371 ----
      delete _fonts;
      delete _pats;
  
+     _clipboard->DeleteComps();
+     delete _clipboard;
+ 
      delete _substMap;
      delete _edInfoMap;
      delete _compMap;
      delete _cmdMap;
      delete _toolMap;
  
  #ifdef __GNUC__
      if (_tmpfile != nil) {
*** /dev/null	 Tue Jul 13 11:19:23 PDT 2004
--- patches/ivtools-040713-johnston-001
*************** patches/ivtools-040713-johnston-001
*** 0 ****
--- 1 ----
+ ivtools-040713-johnston-001

--Apple-Mail-2--131715489
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="ivtools-040714-johnston-002"
Content-Disposition: attachment;
	filename=ivtools-040714-johnston-002

Patch:    ivtools-040714-johnston-002
For:      ivtools-1.2.0
Author:   [email protected]
Subject:  fix up MANIFEST for 1.2.1
Requires: 

This is an intermediate patch to ivtools-1.2.0.  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:

Index: top_ivtools/MANIFEST
diff -c top_ivtools/MANIFEST:1.1 top_ivtools/MANIFEST:1.2
*** top_ivtools/MANIFEST:1.1	Tue Jun 15 08:53:19 2004
--- ./MANIFEST	Wed Jul 14 15:31:52 2004
***************
*** 308,313 ****
--- 308,317 ----
  ivtools-1.2/src/DrawServ/gridlist.h
  ivtools-1.2/src/DrawServ/linkselection.c
  ivtools-1.2/src/DrawServ/linkselection.h
+ ivtools-1.2/src/DrawServ/rcdialog.c
+ ivtools-1.2/src/DrawServ/rcdialog.h
+ ivtools-1.2/src/DrawServ/sid.c
+ ivtools-1.2/src/DrawServ/sid.h
  ivtools-1.2/src/FrameUnidraw/Imakefile
  ivtools-1.2/src/FrameUnidraw/Makefile
  ivtools-1.2/src/FrameUnidraw/framecatalog.c
*** /dev/null	 Wed Jul 14 15:32:18 PDT 2004
--- patches/ivtools-040714-johnston-002
*************** patches/ivtools-040714-johnston-002
*** 0 ****
--- 1 ----
+ ivtools-040714-johnston-002

--Apple-Mail-2--131715489--



-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click