packages: OpenCASCADE/OpenCASCADE.spec, OpenCASCADE/wokstep_extract.patch (...

[gotar]

Author: gotar                        Date: Sun Jul  4 19:14:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added some notes and one more Debian patch:
http://git.debian.org/?p=debian-science/packages/opencascade.git;a=blob;f=debian/patches/wokstep_extract.patch

---- Files affected:
packages/OpenCASCADE:
   OpenCASCADE.spec (1.18 -> 1.19) , wokstep_extract.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/OpenCASCADE/OpenCASCADE.spec
diff -u packages/OpenCASCADE/OpenCASCADE.spec:1.18 packages/OpenCASCADE/OpenCASCADE.spec:1.19
--- packages/OpenCASCADE/OpenCASCADE.spec:1.18	Tue Jun  8 11:57:58 2010
+++ packages/OpenCASCADE/OpenCASCADE.spec	Sun Jul  4 21:14:05 2010
@@ -9,6 +9,10 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
+# NOTE: there are some not PLD-relevant patches available:
+#	- MIPS: http://git.debian.org/?p=debian-science/packages/opencascade.git;a=blob;f=debian/patches/fix-asm.patch
+#	- kFreeBSD/Hurd: http://git.debian.org/?p=debian-science/packages/opencascade.git;a=blob;f=debian/patches/fix-osd_path.patch
+
 # TODO: separate libs-x (80% of libraries)
 
 Summary:	OpenCASCADE CAE platform
@@ -24,6 +28,7 @@
 Patch1:		%{name}6.3.0-strcmp.patch
 Patch2:		%{name}6.3.0-occ6.3.0.patch
 Patch3:		%{name}6.3.0-casroot.patch
+Patch4:		wokstep_extract.patch
 Patch5:          OpenCASCADE6.3.0-tkernel-ld.patch
 Patch6:		%{name}6.3.0-mft-disable-mmap.patch
 Patch7:		%{name}6.3.0-no-bitmaps-icon.patch
@@ -95,6 +100,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -210,6 +216,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2010/07/04 19:14:05  gotar
+- added some notes and one more Debian patch:
+http://git.debian.org/?p=debian-science/packages/opencascade.git;a=blob;f=debian/patches/wokstep_extract.patch
+
 Revision 1.18  2010/06/08 09:57:58  gotar
 - verified more patches, added fix-tklcaf.patch from Michael Wild on Opencascade forum
 http://git.debian.org/?p=debian-science/packages/opencascade.git;a=blob;f=debian/patches/fix-tklcaf.patch

================================================================
Index: packages/OpenCASCADE/wokstep_extract.patch
diff -u /dev/null packages/OpenCASCADE/wokstep_extract.patch:1.1
--- /dev/null	Sun Jul  4 21:14:10 2010
+++ packages/OpenCASCADE/wokstep_extract.patch	Sun Jul  4 21:14:05 2010
@@ -0,0 +1,32 @@
+Fix WOKStep_Extract::Execute
+
+This step did put garbage into generated file, because a pointer was used
+after it has been freed.
+Closes: #501352
+
+diff --git a/ros/src/CPPExt/CPPExt.cxx b/ros/src/CPPExt/CPPExt.cxx
+index 4d96c47..a651607 100644
+--- a/ros/src/CPPExt/CPPExt.cxx
++++ b/ros/src/CPPExt/CPPExt.cxx
+@@ -397,7 +397,8 @@ void CPP_BuildMethod(const Handle(MS_MetaSchema)& aMeta,
+     const Handle(TCollection_HAsciiString)& aTypeName=retType->TypeName();
+     pTypeName=(char *)aTypeName->ToCString();
+     //
+-    pTypeRet=(char *)CPP_BuildType(aMeta,aTypeName)->ToCString();
++    const Handle(TCollection_HAsciiString)& aTypeRet=CPP_BuildType(aMeta,aTypeName);
++    pTypeRet=(char *)aTypeRet->ToCString();
+     //
+     //modified by NIZNHY-PKV Mon May  5 15:10:12 2008f
+     if (m->IsPtrReturn()) {
+diff --git a/ros/src/WOKUnix/WOKUnix_Process.cxx b/ros/src/WOKUnix/WOKUnix_Process.cxx
+index dd6caf6..fa649c7 100644
+--- a/ros/src/WOKUnix/WOKUnix_Process.cxx
++++ b/ros/src/WOKUnix/WOKUnix_Process.cxx
+@@ -373,6 +373,6 @@ void WOKUnix_Process::Kill()
+ void WOKUnix_Process::Destroy()
+ {
+  Kill();
+- delete myargv;
++ delete [] myargv;
+ }
+ #endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/OpenCASCADE/OpenCASCADE.spec?r1=1.18&r2=1.19&f=u