]> git.pld-linux.org Git - packages/OpenCASCADE.git/commitdiff
- added some notes and one more Debian patch:
authorTomasz Pala <gotar@pld-linux.org>
Sun, 4 Jul 2010 19:14:05 +0000 (19:14 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
http://git.debian.org/?p=debian-science/packages/opencascade.git;a=blob;f=debian/patches/wokstep_extract.patch

Changed files:
    OpenCASCADE.spec -> 1.19
    wokstep_extract.patch -> 1.1

OpenCASCADE.spec
wokstep_extract.patch [new file with mode: 0644]

index 034a36d7f11221c313252deb9bd4d0b63d616f4c..1c4f2668dac26cc0bdeb6399c02d59dc959d51b0 100644 (file)
@@ -8,6 +8,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
@@ -23,6 +27,7 @@ Patch0:               %{name}6.3.0-obs-check.patch
 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
@@ -94,6 +99,7 @@ OpenCASCADE samples.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
diff --git a/wokstep_extract.patch b/wokstep_extract.patch
new file mode 100644 (file)
index 0000000..61c1d88
--- /dev/null
@@ -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
This page took 0.237114 seconds and 4 git commands to generate.